commit 4389f09bdb0f29ca836e7c65a62770456c8d64b5
author Lajos Molnar <lajos@google.com> Wed Mar 19 14:45:02 2014 -0700
committer Lajos Molnar <lajos@google.com> Fri Mar 21 14:09:53 2014 -0700
tree 6bbb5ba54d05b76e6ff8c1be25f2362917436a8c
parent f4ec21003b4a027d86c3126522cc65eda2da58ce

stagefright: use media_codecs_google*.xml files

Bug: 13549114
Change-Id: Ia9d8bdd06f0ab745c04b32fecc7a981679347c4a

media_codecs.xml

diff --git a/media_codecs.xml b/media_codecs.xml
index 063296e..804ba62 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -16,10 +16,12 @@
 
 <!--
 <!DOCTYPE MediaCodecs [
-<!ELEMENT MediaCodecs (Decoders,Encoders)>
-<!ELEMENT Decoders (MediaCodec*)>
-<!ELEMENT Encoders (MediaCodec*)>
-<!ELEMENT MediaCodec (Type*,Quirk*)>
+<!ELEMENT Include EMPTY>
+<!ATTLIST Include href CDATA #REQUIRED>
+<!ELEMENT MediaCodecs (Decoders|Encoders|Include)*>
+<!ELEMENT Decoders (MediaCodec|Include)*>
+<!ELEMENT Encoders (MediaCodec|Include)*>
+<!ELEMENT MediaCodec (Type|Quirk|Include)*>
 <!ATTLIST MediaCodec name CDATA #REQUIRED>
 <!ATTLIST MediaCodec type CDATA>
 <!ELEMENT Type EMPTY>
@@ -76,6 +78,7 @@
 -->
 
 <MediaCodecs>
+    <Include href="media_codecs_google_audio.xml" />
     <Decoders>
         <MediaCodec name="OMX.Nvidia.mp4.decode" type="video/mp4v-es" />
         <MediaCodec name="OMX.Nvidia.h263.decode" type="video/3gpp" />
@@ -83,30 +86,12 @@
         <MediaCodec name="OMX.Nvidia.mpeg2v.decode" type="video/mpeg2" />
         <MediaCodec name="OMX.Nvidia.mp2.decoder" type="audio/mpeg-L2" />
         <MediaCodec name="OMX.Nvidia.vpx.decode" type="video/x-vnd.on2.vp8" />
-
-        <MediaCodec name="OMX.google.mp3.decoder" type="audio/mpeg" />
-        <MediaCodec name="OMX.google.amrnb.decoder" type="audio/3gpp" />
-        <MediaCodec name="OMX.google.amrwb.decoder" type="audio/amr-wb" />
-        <MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm" />
-        <MediaCodec name="OMX.google.g711.alaw.decoder" type="audio/g711-alaw" />
-        <MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw" />
-        <MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" />
-        <MediaCodec name="OMX.google.opus.decoder" type="audio/opus" />
-
-        <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
-        <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />
-        <MediaCodec name="OMX.google.h264.decoder" type="video/avc" />
-        <MediaCodec name="OMX.google.vpx.decoder" type="video/x-vnd.on2.vp8" />
     </Decoders>
 
     <Encoders>
         <MediaCodec name="OMX.Nvidia.mp4.encoder" type="video/mp4v-es" />
         <MediaCodec name="OMX.Nvidia.h263.encoder" type="video/3gpp" />
         <MediaCodec name="OMX.Nvidia.h264.encoder" type="video/avc" />
-
-        <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" />
-        <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
-        <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
-        <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" />
     </Encoders>
+    <Include href="media_codecs_google_video.xml" />
 </MediaCodecs>