diff options
| author | Dave Burke <daveburke@google.com> | 2011-12-15 19:27:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-15 19:27:17 -0800 |
| commit | 255adceb85bc23de61fb138ddb474852514b3b33 (patch) | |
| tree | 792f55bb343fc5f989e7f5d110194da4a57dd651 /media/libstagefright/SurfaceMediaSource.cpp | |
| parent | 079123ee3d2e20bbc17a7ddbd96ca46bed27898f (diff) | |
| parent | 7e2f99569ae7d22307957abecc2e1818b4e7ab5e (diff) | |
| download | frameworks_av-255adceb85bc23de61fb138ddb474852514b3b33.zip frameworks_av-255adceb85bc23de61fb138ddb474852514b3b33.tar.gz frameworks_av-255adceb85bc23de61fb138ddb474852514b3b33.tar.bz2 | |
am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
* commit '0cc1e42d74e09c259a6da0abc9009d1abf7537b1':
SurfaceMediaSource: use the HW_TEXTURE usage bit
Diffstat (limited to 'media/libstagefright/SurfaceMediaSource.cpp')
| -rw-r--r-- | media/libstagefright/SurfaceMediaSource.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp index 51a7541..2f807d0 100644 --- a/media/libstagefright/SurfaceMediaSource.cpp +++ b/media/libstagefright/SurfaceMediaSource.cpp @@ -338,7 +338,9 @@ status_t SurfaceMediaSource::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h, (uint32_t(buffer->height) != h) || (uint32_t(buffer->format) != format) || ((uint32_t(buffer->usage) & usage) != usage)) { - usage |= GraphicBuffer::USAGE_HW_VIDEO_ENCODER; + // XXX: This will be changed to USAGE_HW_VIDEO_ENCODER once driver + // issues with that flag get fixed. + usage |= GraphicBuffer::USAGE_HW_TEXTURE; status_t error; sp<GraphicBuffer> graphicBuffer( mGraphicBufferAlloc->createGraphicBuffer( |