diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-05-08 00:45:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 00:45:16 +0000 |
| commit | 2a834fc09e1b22e7f70250c55ae2f462f5f60987 (patch) | |
| tree | 4b1627f8c579b42a4aa2396f3f094764d2faf5b8 /include | |
| parent | 6ff06612638a13faa85c6219d42a9c4b645003d9 (diff) | |
| parent | 65c8fbcf91f0f0b5f60a45d2777c36d396c4ba16 (diff) | |
| download | frameworks_av-2a834fc09e1b22e7f70250c55ae2f462f5f60987.zip frameworks_av-2a834fc09e1b22e7f70250c55ae2f462f5f60987.tar.gz frameworks_av-2a834fc09e1b22e7f70250c55ae2f462f5f60987.tar.bz2 | |
Merge "libstagefright: export profiling results directly to xml." into mnc-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodecList.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/media/stagefright/MediaCodecList.h b/include/media/stagefright/MediaCodecList.h index 9d1d675..ce34338 100644 --- a/include/media/stagefright/MediaCodecList.h +++ b/include/media/stagefright/MediaCodecList.h @@ -54,7 +54,7 @@ struct MediaCodecList : public BnMediaCodecList { static sp<IMediaCodecList> getLocalInstance(); // only to be used in getLocalInstance - void updateDetailsForMultipleCodecs(const KeyedVector<AString, CodecSettings>& updates); + void parseTopLevelXMLFile(const char *path, bool ignore_errors = false); private: class BinderDeathObserver : public IBinder::DeathRecipient { @@ -97,7 +97,6 @@ private: status_t initCheck() const; void parseXMLFile(const char *path); - void parseTopLevelXMLFile(const char *path, bool ignore_errors = false); static void StartElementHandlerWrapper( void *me, const char *name, const char **attrs); |