commit 19182c38ac1c1b1c316df5bde9172fe0ee5abf22
author Lajos Molnar <lajos@google.com> Wed Mar 19 14:28:37 2014 -0700
committer Lajos Molnar <lajos@google.com> Fri Mar 21 14:14:24 2014 -0700
tree 9b8cc970a0da28f8033be79806a17ee12d6a41a0
parent b6482b60b4f79b84dddc88db3dd1c45b601e11e5

stagefright: use media_codecs_google*.xml files

Bug: 13549114
Change-Id: I247b92e4be487a2d838a8689dbd3d04bd9d43a51

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 190a2e6..4a1a2b6 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -111,6 +111,9 @@
 
 # media codec config xml file
 PRODUCT_COPY_FILES += \
+    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
     device/asus/grouper/media_codecs.xml:system/etc/media_codecs.xml
 
 # audio mixer paths

media_codecs.xml

diff --git a/media_codecs.xml b/media_codecs.xml
index b4e4938..e5c2e1e 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,39 +78,20 @@
 -->
 
 <MediaCodecs>
+    <Include href="media_codecs_google_audio.xml" />
+    <Include href="media_codecs_google_telephony.xml" />
     <Decoders>
         <MediaCodec name="OMX.Nvidia.mp4.decode" type="video/mp4v-es" />
         <MediaCodec name="OMX.Nvidia.h263.decode" type="video/3gpp" />
         <MediaCodec name="OMX.Nvidia.h264.decode" type="video/avc" />
         <MediaCodec name="OMX.Nvidia.mpeg2v.decode" type="video/mpeg2" />
         <MediaCodec name="OMX.Nvidia.mp2.decoder" type="audio/mpeg-L2" />
-
-        <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.gsm.decoder" type="audio/gsm" />
-
-        <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.vp8.decoder" type="video/x-vnd.on2.vp8" />
-        <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" />
     </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" />
-        <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" />
     </Encoders>
+    <Include href="media_codecs_google_video.xml" />
 </MediaCodecs>