summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2015-03-25 16:19:58 -0700
committerRonghua Wu <ronghuawu@google.com>2015-04-13 17:51:14 -0700
commitc1f5cb4b11d0c9f52f69aec4fe2d36da2f8139c9 (patch)
tree7e5049d6725c4a6c1947a743659598c391cf0665 /include/media
parent52e88b2986536e83a7a6da63461556b8734a85f3 (diff)
downloadframeworks_av-c1f5cb4b11d0c9f52f69aec4fe2d36da2f8139c9.zip
frameworks_av-c1f5cb4b11d0c9f52f69aec4fe2d36da2f8139c9.tar.gz
frameworks_av-c1f5cb4b11d0c9f52f69aec4fe2d36da2f8139c9.tar.bz2
libstagefright: parse global settings from codec xml file.
Also parse a new codec limit "max-supported-instances". Bug: 19620911 Change-Id: I6574c168b0c2b1aa649883958d3073edc01a4a03
Diffstat (limited to 'include/media')
-rw-r--r--include/media/stagefright/MediaCodecList.h3
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);