codecs: make codec list complete again.

This reverts commit 40998aa023a37f1dc7d20c8963c294af4f09353b and
68d9c451a448a44c59e81791e11a62988ff2bf2a.

diff --git a/data/media_codecs_ffmpeg.xml b/data/media_codecs_ffmpeg.xml
index 40425ec..6b90fac 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.ape.decoder"    type="audio/x-ape" >
             <Limit name="channel-count" max="8" />
             <Limit name="sample-rate" ranges="8000-192000" />
@@ -48,10 +46,18 @@
             <Limit name="channel-count" max="8" />
             <Limit name="sample-rate" ranges="8000-192000" />
         </MediaCodec>
+        <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.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.vorbis.decoder" type="audio/vorbis" >
+            <Limit name="channel-count" max="8" />
+            <Limit name="sample-rate" ranges="8000-192000" />
+        </MediaCodec>
         <MediaCodec name="OMX.ffmpeg.wma.decoder"    type="audio/x-ms-wma" >
             <Limit name="channel-count" max="8" />
             <Limit name="sample-rate" ranges="8000-192000" />
@@ -78,6 +84,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" />