diff options
| author | Lajos Molnar <lajos@google.com> | 2019-05-07 16:30:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-07 16:30:42 +0000 |
| commit | 5903f3939d93a1be58ccb690626e52651c137296 (patch) | |
| tree | 58f2c1bd8557f5fa51036b76770dd850bccbac94 | |
| parent | 9c4de66caf0b87745bc83860c22174412d5af1b7 (diff) | |
| parent | 963caf98d16236b213dde1c36e4565d9502aa08e (diff) | |
| download | av-5903f3939d93a1be58ccb690626e52651c137296.tar.gz | |
Merge "codec2: update to new XmlParser API" into qt-dev
| -rw-r--r-- | media/sfplugin/Codec2InfoBuilder.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/media/sfplugin/Codec2InfoBuilder.cpp b/media/sfplugin/Codec2InfoBuilder.cpp index 301ef19..4a6d672 100644 --- a/media/sfplugin/Codec2InfoBuilder.cpp +++ b/media/sfplugin/Codec2InfoBuilder.cpp @@ -352,12 +352,13 @@ status_t Codec2InfoBuilder::buildMediaCodecList(MediaCodecListWriter* writer) { // Obtain Codec2Client std::vector<Traits> traits = Codec2Client::ListComponents(); - MediaCodecsXmlParser parser( - MediaCodecsXmlParser::defaultSearchDirs, - option == 0 ? "media_codecs.xml" : - "media_codecs_c2.xml", - option == 0 ? "media_codecs_performance.xml" : - "media_codecs_performance_c2.xml"); + MediaCodecsXmlParser parser; + if (option == 0) { + parser.parseXmlFilesInSearchDirs(); + } else { + parser.parseXmlFilesInSearchDirs( + { "media_codecs_c2.xml", "media_codecs_performance_c2.xml" }); + } if (parser.getParsingStatus() != OK) { ALOGD("XML parser no good"); return OK; |