diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-04-14 00:57:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-14 00:57:57 +0000 |
| commit | 5795cb168634680fd5c835849c8fcf48dd6f532b (patch) | |
| tree | b57d8881970ec7f29ceaf20bcbd604991f6a1444 /include | |
| parent | 4264bbd7af97aeae87f1907b96f62e4025c989d0 (diff) | |
| parent | c1f5cb4b11d0c9f52f69aec4fe2d36da2f8139c9 (diff) | |
| download | frameworks_av-5795cb168634680fd5c835849c8fcf48dd6f532b.zip frameworks_av-5795cb168634680fd5c835849c8fcf48dd6f532b.tar.gz frameworks_av-5795cb168634680fd5c835849c8fcf48dd6f532b.tar.bz2 | |
Merge "libstagefright: parse global settings from codec xml file."
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodecList.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaCodecList.h b/include/media/stagefright/MediaCodecList.h index c2bbe4d..53f3095 100644 --- a/include/media/stagefright/MediaCodecList.h +++ b/include/media/stagefright/MediaCodecList.h @@ -60,6 +60,7 @@ private: enum Section { SECTION_TOPLEVEL, + SECTION_SETTINGS, SECTION_DECODERS, SECTION_DECODER, SECTION_DECODER_TYPE, @@ -78,6 +79,7 @@ private: int32_t mDepth; AString mHrefBase; + KeyedVector<AString, AString> mSettings; Vector<sp<MediaCodecInfo> > mCodecInfos; sp<MediaCodecInfo> mCurrentInfo; sp<IOMX> mOMX; @@ -98,6 +100,7 @@ private: void endElementHandler(const char *name); status_t includeXMLFile(const char **attrs); + status_t addSettingFromAttributes(const char **attrs); status_t addMediaCodecFromAttributes(bool encoder, const char **attrs); void addMediaCodec(bool encoder, const char *name, const char *type = NULL); |