diff options
| author | Andreas Huber <andih@google.com> | 2010-10-07 14:02:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 14:02:01 -0700 |
| commit | 45bd1159fa34b51ba077e0cde760d171ca092552 (patch) | |
| tree | 679c5f55c40aa310039761a7f22bb861d648b9c4 /include | |
| parent | c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166 (diff) | |
| parent | 02654f01bc6bd2e581b4a1d2409ecea217294fa2 (diff) | |
| download | frameworks_base-45bd1159fa34b51ba077e0cde760d171ca092552.zip frameworks_base-45bd1159fa34b51ba077e0cde760d171ca092552.tar.gz frameworks_base-45bd1159fa34b51ba077e0cde760d171ca092552.tar.bz2 | |
am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread
Merge commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2' into gingerbread-plus-aosp
* commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2':
On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MetaData.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index ab2f11d..d2bd9f2 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -97,6 +97,8 @@ enum { kKeyAutoLoop = 'autL', // bool (int32_t) kKeyValidSamples = 'valD', // int32_t + + kKeyIsUnreadable = 'unre', // bool (int32_t) }; enum { diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 875bc5b..9badf92 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -103,6 +103,7 @@ private: kSupportsMultipleFramesPerInputBuffer = 1024, kAvoidMemcopyInputRecordingFrames = 2048, kRequiresLargerEncoderOutputBuffer = 4096, + kOutputBuffersAreUnreadable = 8192, }; struct BufferInfo { @@ -249,7 +250,8 @@ private: status_t configureCodec(const sp<MetaData> &meta); - static uint32_t getComponentQuirks(const char *componentName); + static uint32_t getComponentQuirks( + const char *componentName, bool isEncoder); static void findMatchingCodecs( const char *mime, |