diff options
author | Mathias Agopian <mathias@google.com> | 2010-01-20 14:31:53 -0800 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2010-01-20 14:31:53 -0800 |
commit | d23fa27630c3756216dc64cbb8518af49c60ce34 (patch) | |
tree | 446109f0bc9c55db46a32845cfe1dec38841d3fe /libs | |
parent | d2832fb4154771e42f7a4fdb8286ac85827ebe9d (diff) | |
download | frameworks_base-d23fa27630c3756216dc64cbb8518af49c60ce34.zip frameworks_base-d23fa27630c3756216dc64cbb8518af49c60ce34.tar.gz frameworks_base-d23fa27630c3756216dc64cbb8518af49c60ce34.tar.bz2 |
fix [2363362] [Sapphire] Corrupted raw picture displayed during snapshot
handled all cases where the scale factor of a video is out of bounds of
supported scale factors in copybit.
Diffstat (limited to 'libs')
-rw-r--r-- | libs/surfaceflinger/LayerBuffer.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libs/surfaceflinger/LayerBuffer.cpp b/libs/surfaceflinger/LayerBuffer.cpp index 1dbfe34..091856f 100644 --- a/libs/surfaceflinger/LayerBuffer.cpp +++ b/libs/surfaceflinger/LayerBuffer.cpp @@ -503,6 +503,16 @@ status_t LayerBuffer::BufferSource::initTempBuffer() const int t = w; w = h; h = t; } + // we're in the copybit case, so make sure we can handle this blit + // we don't have to keep the aspect ratio here + copybit_device_t* copybit = mLayer.mBlitEngine; + const int down = copybit->get(copybit, COPYBIT_MINIFICATION_LIMIT); + const int up = copybit->get(copybit, COPYBIT_MAGNIFICATION_LIMIT); + if (buffers.w > w*down) w = buffers.w / down; + else if (w > buffers.w*up) w = buffers.w*up; + if (buffers.h > h*down) h = buffers.h / down; + else if (h > buffers.h*up) h = buffers.h*up; + if (mTexture.image != EGL_NO_IMAGE_KHR) { // we have an EGLImage, make sure the needed size didn't change if (w!=mTexture.width || h!= mTexture.height) { |