diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-11-30 10:50:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 10:50:49 -0800 |
| commit | df96385b9acf9ec74c62edc34ffa9c8d9dae1c03 (patch) | |
| tree | 156e5102fa53ad3debbe864bc1780925d693fa71 | |
| parent | 267a4b0627f98b020725e860b0a3c128067131b1 (diff) | |
| parent | c040e1e77923d81050f2d3dbdac5d07e01be72f6 (diff) | |
| download | frameworks_base-df96385b9acf9ec74c62edc34ffa9c8d9dae1c03.zip frameworks_base-df96385b9acf9ec74c62edc34ffa9c8d9dae1c03.tar.gz frameworks_base-df96385b9acf9ec74c62edc34ffa9c8d9dae1c03.tar.bz2 | |
am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit 'c040e1e77923d81050f2d3dbdac5d07e01be72f6':
SurfaceMediaSource: use the vid enc usage bit
| -rw-r--r-- | include/ui/GraphicBuffer.h | 1 | ||||
| -rw-r--r-- | media/libstagefright/SurfaceMediaSource.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h index b9deafc..6ab01f4 100644 --- a/include/ui/GraphicBuffer.h +++ b/include/ui/GraphicBuffer.h @@ -63,6 +63,7 @@ public: USAGE_HW_RENDER = GRALLOC_USAGE_HW_RENDER, USAGE_HW_2D = GRALLOC_USAGE_HW_2D, USAGE_HW_COMPOSER = GRALLOC_USAGE_HW_COMPOSER, + USAGE_HW_VIDEO_ENCODER = GRALLOC_USAGE_HW_VIDEO_ENCODER, USAGE_HW_MASK = GRALLOC_USAGE_HW_MASK }; diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp index 24e0d8c..51a7541 100644 --- a/media/libstagefright/SurfaceMediaSource.cpp +++ b/media/libstagefright/SurfaceMediaSource.cpp @@ -338,7 +338,7 @@ 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_TEXTURE; + usage |= GraphicBuffer::USAGE_HW_VIDEO_ENCODER; status_t error; sp<GraphicBuffer> graphicBuffer( mGraphicBufferAlloc->createGraphicBuffer( |