summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2016-06-10 14:37:37 -0700
committerDmitry Shmidt <dimitrysh@google.com>2016-06-10 15:02:26 -0700
commit06f9ceb0c45b0cd05e8e654bfdd5de74691861cd (patch)
tree577a4eec10565f717fccb6dd75f400a6384c8fc2 /etc
parent2f0032b0b4a9c195b7f5ebc29621a77c2900a3fa (diff)
downloadhikey-06f9ceb0c45b0cd05e8e654bfdd5de74691861cd.tar.gz
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
Diffstat (limited to 'etc')
-rw-r--r--etc/media_codecs.xml14
1 files changed, 1 insertions, 13 deletions
diff --git a/etc/media_codecs.xml b/etc/media_codecs.xml
index 8d46b987..424914d8 100644
--- a/etc/media_codecs.xml
+++ b/etc/media_codecs.xml
@@ -76,16 +76,8 @@ Only the three quirks included above are recognized at this point:
-->
<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 @@ Only the three quirks included above are recognized at this point:
</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>