commit da666891a4bfb9988731a4520b589aaa7beb505d
author Lajos Molnar <lajos@google.com> Mon Apr 08 17:25:34 2019 -0700
committer Lajos Molnar <lajos@google.com> Mon May 06 16:02:03 2019 -0700
tree c6be06c3870ba1efbd2e697adb65e468080d6062
parent 91b8fe3126bf76e611a579fd4ee3471ef390ddd0

media: expand media_codecs.xml to support variants and domains

Added support to variant, domain and enabled attributes for <MediaCodec>.
Added support for <Variant> tag.

Bug: 129710438
Change-Id: Icf04665fdf36d8a3e9a74918978b0eb03f0e4f6c

media/codec2/sfplugin/Codec2InfoBuilder.cpp

diff --git a/media/codec2/sfplugin/Codec2InfoBuilder.cpp b/media/codec2/sfplugin/Codec2InfoBuilder.cpp
index ead0a9b..5231b63 100644
--- a/media/codec2/sfplugin/Codec2InfoBuilder.cpp
+++ b/media/codec2/sfplugin/Codec2InfoBuilder.cpp
@@ -248,10 +248,9 @@
     // Obtain Codec2Client
     std::vector<Traits> traits = Codec2Client::ListComponents();
 
-    MediaCodecsXmlParser parser(
-            MediaCodecsXmlParser::defaultSearchDirs,
-            "media_codecs_c2.xml",
-            "media_codecs_performance_c2.xml");
+    MediaCodecsXmlParser parser;
+    parser.parseXmlFilesInSearchDirs(
+            { "media_codecs_c2.xml", "media_codecs_performance_c2.xml" });
     if (parser.getParsingStatus() != OK) {
         ALOGD("XML parser no good");
         return OK;