diff options
| author | Lajos Molnar <lajos@google.com> | 2013-08-14 01:27:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-14 01:27:16 +0000 |
| commit | 7f76a81b18ade3158ae27015637074ce08e837b2 (patch) | |
| tree | b2927c2cc99053ba118553a0242cf41b664fb5be /include | |
| parent | cd06d357ed4fcde991aa55dc97317d97cb287332 (diff) | |
| parent | 2ee14000a38683220fb250d9e7300e1d71ccdaa0 (diff) | |
| download | frameworks_av-7f76a81b18ade3158ae27015637074ce08e837b2.zip frameworks_av-7f76a81b18ade3158ae27015637074ce08e837b2.tar.gz frameworks_av-7f76a81b18ade3158ae27015637074ce08e837b2.tar.bz2 | |
Merge "Check adaptive playback support via CodecCapabilities" into klp-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodecList.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaCodecList.h b/include/media/stagefright/MediaCodecList.h index dfb845b..590623b 100644 --- a/include/media/stagefright/MediaCodecList.h +++ b/include/media/stagefright/MediaCodecList.h @@ -50,7 +50,8 @@ struct MediaCodecList { status_t getCodecCapabilities( size_t index, const char *type, Vector<ProfileLevel> *profileLevels, - Vector<uint32_t> *colorFormats) const; + Vector<uint32_t> *colorFormats, + uint32_t *flags) const; private: enum Section { diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 583c3b3..daaf20f 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -361,9 +361,14 @@ private: }; struct CodecCapabilities { + enum { + kFlagSupportsAdaptivePlayback = 1 << 0, + }; + String8 mComponentName; Vector<CodecProfileLevel> mProfileLevels; Vector<OMX_U32> mColorFormats; + uint32_t mFlags; }; // Return a vector of componentNames with supported profile/level pairs |