remove dead code and member variables.

also fix some comments and improve debugging logs.

Change-Id: I83e55309f306332b59e1ec46104c4a7fffbf3c97
This commit is contained in:
Mathias Agopian 2011-07-25 19:56:08 -07:00
parent ab7c13f96a
commit 3fbce7c560
4 changed files with 20 additions and 30 deletions

View File

@ -135,24 +135,12 @@ private:
// a timestamp is auto-generated when queueBuffer is called. // a timestamp is auto-generated when queueBuffer is called.
int64_t mTimestamp; int64_t mTimestamp;
// mQueryWidth is the width returned by query(). It is set to width
// of the last dequeued buffer or to mReqWidth if no buffer was dequeued.
uint32_t mQueryWidth;
// mQueryHeight is the height returned by query(). It is set to height
// of the last dequeued buffer or to mReqHeight if no buffer was dequeued.
uint32_t mQueryHeight;
// mQueryFormat is the format returned by query(). It is set to the last
// dequeued format or to mReqFormat if no buffer was dequeued.
uint32_t mQueryFormat;
// mDefaultWidth is default width of the window, regardless of the // mDefaultWidth is default width of the window, regardless of the
// set_dimension call // native_window_set_buffers_dimensions call
uint32_t mDefaultWidth; uint32_t mDefaultWidth;
// mDefaultHeight is default width of the window, regardless of the // mDefaultHeight is default width of the window, regardless of the
// set_dimension call // native_window_set_buffers_dimensions call
uint32_t mDefaultHeight; uint32_t mDefaultHeight;
// mTransformHint is the transform probably applied to buffers of this // mTransformHint is the transform probably applied to buffers of this

View File

@ -197,11 +197,14 @@ status_t SurfaceTexture::setBufferCount(int bufferCount) {
status_t SurfaceTexture::setDefaultBufferSize(uint32_t w, uint32_t h) status_t SurfaceTexture::setDefaultBufferSize(uint32_t w, uint32_t h)
{ {
Mutex::Autolock lock(mMutex); if (!w || !h) {
if ((w != mDefaultWidth) || (h != mDefaultHeight)) { LOGE("setDefaultBufferSize: dimensions cannot be 0 (w=%d, h=%d)", w, h);
mDefaultWidth = w; return BAD_VALUE;
mDefaultHeight = h;
} }
Mutex::Autolock lock(mMutex);
mDefaultWidth = w;
mDefaultHeight = h;
return OK; return OK;
} }
@ -903,13 +906,9 @@ int SurfaceTexture::query(int what, int* outValue)
switch (what) { switch (what) {
case NATIVE_WINDOW_WIDTH: case NATIVE_WINDOW_WIDTH:
value = mDefaultWidth; value = mDefaultWidth;
if (!mDefaultWidth && !mDefaultHeight && mCurrentTextureBuf!=0)
value = mCurrentTextureBuf->width;
break; break;
case NATIVE_WINDOW_HEIGHT: case NATIVE_WINDOW_HEIGHT:
value = mDefaultHeight; value = mDefaultHeight;
if (!mDefaultWidth && !mDefaultHeight && mCurrentTextureBuf!=0)
value = mCurrentTextureBuf->height;
break; break;
case NATIVE_WINDOW_FORMAT: case NATIVE_WINDOW_FORMAT:
value = mPixelFormat; value = mPixelFormat;

View File

@ -52,9 +52,6 @@ void SurfaceTextureClient::init() {
mReqFormat = 0; mReqFormat = 0;
mReqUsage = 0; mReqUsage = 0;
mTimestamp = NATIVE_WINDOW_TIMESTAMP_AUTO; mTimestamp = NATIVE_WINDOW_TIMESTAMP_AUTO;
mQueryWidth = 0;
mQueryHeight = 0;
mQueryFormat = 0;
mDefaultWidth = 0; mDefaultWidth = 0;
mDefaultHeight = 0; mDefaultHeight = 0;
mTransformHint = 0; mTransformHint = 0;
@ -154,9 +151,6 @@ int SurfaceTextureClient::dequeueBuffer(android_native_buffer_t** buffer) {
result); result);
return result; return result;
} }
mQueryWidth = gbuf->width;
mQueryHeight = gbuf->height;
mQueryFormat = gbuf->format;
} }
*buffer = gbuf.get(); *buffer = gbuf.get();
return OK; return OK;

View File

@ -352,12 +352,13 @@ uint32_t Layer::doTransaction(uint32_t flags)
if (sizeChanged) { if (sizeChanged) {
// the size changed, we need to ask our client to request a new buffer // the size changed, we need to ask our client to request a new buffer
LOGD_IF(DEBUG_RESIZE, LOGD_IF(DEBUG_RESIZE,
"doTransaction: "
"resize (layer=%p), requested (%dx%d), drawing (%d,%d), " "resize (layer=%p), requested (%dx%d), drawing (%d,%d), "
"fixedSize=%d", "scalingMode=%d",
this, this,
int(temp.requested_w), int(temp.requested_h), int(temp.requested_w), int(temp.requested_h),
int(front.requested_w), int(front.requested_h), int(front.requested_w), int(front.requested_h),
isFixedSize()); mCurrentScalingMode);
if (!isFixedSize()) { if (!isFixedSize()) {
// we're being resized and there is a freeze display request, // we're being resized and there is a freeze display request,
@ -492,6 +493,14 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions)
// we now have the correct size, unfreeze the screen // we now have the correct size, unfreeze the screen
mFreezeLock.clear(); mFreezeLock.clear();
} }
LOGD_IF(DEBUG_RESIZE,
"lockPageFlip : "
" (layer=%p), buffer (%ux%u, tr=%02x), "
"requested (%dx%d)",
this,
bufWidth, bufHeight, mCurrentTransform,
front.requested_w, front.requested_h);
} }
} }
} }