summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-01-03 03:27:56 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-01-03 03:27:56 (GMT)
commit198ba4e329efa68269282cd6d2db81fc14658122 (patch)
treef43ae9fefbf79816f3524b724caa521fad99b5e6
parent35f774fa37f56d9a8bbd3d7ac1ff24b0d20e7aeb (diff)
downloaddarwin-198ba4e329efa68269282cd6d2db81fc14658122.zip
darwin-198ba4e329efa68269282cd6d2db81fc14658122.tar.gz
darwin-198ba4e329efa68269282cd6d2db81fc14658122.tar.bz2
darwin: sync to 8.1 trunk cddbd6a04 [2/2]
PD# 157686 media_codecs: fix vts VtsHalMediaOmxStoreV1_0Host Change-Id: Id67ebc855346d73458af3f09abdc3be3b7ee514e
Diffstat
-rw-r--r--files/media_codecs.xml25
1 files changed, 10 insertions, 15 deletions
diff --git a/files/media_codecs.xml b/files/media_codecs.xml
index 7de3eb0..daaa711 100644
--- a/files/media_codecs.xml
+++ b/files/media_codecs.xml
@@ -207,6 +207,16 @@ Only the three quirks included above are recognized at this point:
<Feature name="tunneled-playback" />
<Limit name="concurrent-instances" max="1" />
</MediaCodec>
+ <MediaCodec name="OMX.amlogic.vp6.decoder.sw" type="video/x-vnd.on2.vp6" />
+ <MediaCodec name="OMX.amlogic.vp6a.decoder.sw" type="video/x-vnd.on2.vp6a" />
+ <MediaCodec name="OMX.amlogic.vp6f.decoder.sw" type="video/x-vnd.on2.vp6f" />
+ <MediaCodec name="OMX.amlogic.rm10.decoder.sw" type="video/rm10" />
+ <MediaCodec name="OMX.amlogic.rm20.decoder.sw" type="video/rm20" />
+ <MediaCodec name="OMX.amlogic.rm30.decoder.sw" type="video/rm30" />
+ <MediaCodec name="OMX.amlogic.rm40.decoder.sw" type="video/rm40" />
+ <MediaCodec name="OMX.amlogic.wmv2.decoder.sw" type="video/wmv2" />
+ <MediaCodec name="OMX.amlogic.wmv1.decoder.sw" type="video/wmv1" />
+ <MediaCodec name="OMX.google.ffmpeg.decoder.sw" type="audio/ffmpeg" />
<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" />
@@ -223,12 +233,8 @@ Only the three quirks included above are recognized at this point:
<MediaCodec name="OMX.google.wmapro.decoder" type="audio/wmapro" />
<MediaCodec name="OMX.google.ape.decoder" type="audio/ape" />
<MediaCodec name="OMX.google.truehd.decoder" type="audio/truehd" />
- <MediaCodec name="OMX.google.ffmpeg.decoder" type="audio/ffmpeg" />
<MediaCodec name="OMX.google.raw.decoder" type="audio/raw" />
- <MediaCodec name="OMX.google.ac3.decoder" type="audio/ac3" />
- <MediaCodec name="OMX.google.eac3.decoder" type="audio/eac3" />
<MediaCodec name="OMX.google.dtshd.decoder" type="audio/dtshd" />
- <MediaCodec name="OMX.google.mp2.decoder" type="audio/mpeg-L2" />
<MediaCodec name="OMX.google.opus.decoder" type="audio/opus">
<Limit name="channel-count" max="8" />
<Limit name="sample-rate" ranges="48000" />
@@ -265,17 +271,6 @@ Only the three quirks included above are recognized at this point:
<Limit name="bitrate" range="1-5000000" />
<Feature name="adaptive-playback" />
</MediaCodec>
-
- <MediaCodec name="OMX.google.vp6.decoder" type="video/x-vnd.on2.vp6" />
- <MediaCodec name="OMX.google.vp6a.decoder" type="video/x-vnd.on2.vp6a" />
- <MediaCodec name="OMX.google.vp6f.decoder" type="video/x-vnd.on2.vp6f" />
- <MediaCodec name="OMX.google.rm10.decoder" type="video/rm10" />
- <MediaCodec name="OMX.google.rm20.decoder" type="video/rm20" />
- <MediaCodec name="OMX.google.rm40.decoder" type="video/rm40" />
- <MediaCodec name="OMX.google.wmv2.decoder" type="video/wmv2" />
- <MediaCodec name="OMX.google.wmv1.decoder" type="video/wmv1" />
-
-
<MediaCodec name="OMX.google.mp3.decoder" >
<Type name="audio/mpeg" />
<Quirk name="needs-flush-before-disable" />