commit 3051d9ed7c9694cd21829ab44b659b25db4c8764
author Eric Laurent <elaurent@google.com> Fri Jun 10 14:37:37 2016 -0700
committer Dmitry Shmidt <dimitrysh@google.com> Fri Jun 10 15:00:02 2016 -0700
tree 0bacb201cb1988b74698efe95fd419af7b88ac90
parent 307dc6063dd2256246f3793d66e0433a2251e8d5

use default google audio codecs list

include media_codecs_google_audio.xml in media_codecs.xml
instead of listing audio codecs.

Bug: 29025520
Change-Id: Ie699a25692154dce5f2046b7394d26faf13e4d52

etc/media_codecs.xml

diff --git a/etc/media_codecs.xml b/etc/media_codecs.xml
index 8d46b98..424914d 100644
--- a/etc/media_codecs.xml
+++ b/etc/media_codecs.xml
@@ -76,16 +76,8 @@
 -->
 
 <MediaCodecs>
+    <Include href="media_codecs_google_audio.xml" />
     <Decoders>
-        <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.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" />
@@ -94,13 +86,9 @@
     </Decoders>
 
     <Encoders>
-        <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
-        <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" />
-        <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" />
         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" />
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" />
-        <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" />
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" />
     </Encoders>
 </MediaCodecs>