Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86

[android-x86/external-stagefright-plugins.git] / data / media_codecs_ffmpeg.xml

diff --git a/data/media_codecs_ffmpeg.xml b/data/media_codecs_ffmpeg.xml
index 73e564a..4d44b98 100644 (file)
--- a/data/media_codecs_ffmpeg.xml
+++ b/data/media_codecs_ffmpeg.xml
@@ -22,12 +22,10 @@
             <Limit name="channel-count" max="8" />
             <Limit name="sample-rate" ranges="8000-192000" />
         </MediaCodec>
-        <!-- Can't use this without a Dolby(TM) license for DD(TM) and DDP(TM)
         <MediaCodec name="OMX.ffmpeg.ac3.decoder"    type="audio/ac3" >
             <Limit name="channel-count" max="8" />
             <Limit name="sample-rate" ranges="8000-192000" />
         </MediaCodec>
-        -->
         <MediaCodec name="OMX.ffmpeg.alac.decoder"   type="audio/alac" >
             <Limit name="channel-count" max="8" />
             <Limit name="sample-rate" ranges="8000-192000" />
@@ -52,17 +50,15 @@
             <Limit name="channel-count" max="8" />
             <Limit name="sample-rate" ranges="8000-192000" />
         </MediaCodec>
-        <!--
-        <MediaCodec name="OMX.ffmpeg.mp3.decoder"    type="audio/mpeg">
+        <MediaCodec name="OMX.ffmpeg.mp3.decoder"    type="audio/mpeg" >
             <Limit name="channel-count" max="8" />
             <Limit name="sample-rate" ranges="8000-192000" />
         </MediaCodec>
-        <MediaCodec name="OMX.ffmpeg.vorbis.decoder"    type="audio/vorbis">
+        <MediaCodec name="OMX.ffmpeg.ra.decoder"     type="audio/vnd.rn-realaudio" >
             <Limit name="channel-count" max="8" />
             <Limit name="sample-rate" ranges="8000-192000" />
         </MediaCodec>
-        -->
-        <MediaCodec name="OMX.ffmpeg.ra.decoder"     type="audio/vnd.rn-realaudio" >
+        <MediaCodec name="OMX.ffmpeg.vorbis.decoder" type="audio/vorbis" >
             <Limit name="channel-count" max="8" />
             <Limit name="sample-rate" ranges="8000-192000" />
         </MediaCodec>
@@ -92,6 +88,21 @@
             <Limit name="alignment" value="2x2" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
+        <MediaCodec name="OMX.ffmpeg.h263.decoder"   type="video/3gpp">
+            <Limit name="size" min="2x2" max="2048x2048" />
+            <Limit name="alignment" value="2x2" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
+        <MediaCodec name="OMX.ffmpeg.h264.decoder"   type="video/avc">
+            <Limit name="size" min="2x2" max="2048x2048" />
+            <Limit name="alignment" value="2x2" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
+        <MediaCodec name="OMX.ffmpeg.hevc.decoder"   type="video/hevc">
+            <Limit name="size" min="2x2" max="2048x2048" />
+            <Limit name="alignment" value="2x2" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
         <MediaCodec name="OMX.ffmpeg.rv.decoder"     type="video/vnd.rn-realvideo">
             <Limit name="size" min="2x2" max="2048x2048" />
             <Limit name="alignment" value="2x2" />