aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Rozic <rooobertinhooo@gmail.com>2014-05-08 18:39:33 +0200
committerRobert Rozic <rooobertinhooo@gmail.com>2014-05-08 18:39:33 +0200
commit1b8b421be2a87c5ef20194487dc8b7aee2f9f77d (patch)
tree6d3ff2e5b4a6f16ce4be2940d4c4a69c21a53226
parent0c76fcb3bbc6a8284bfaa5032f040790be14a6b4 (diff)
Enable use of FFMPEG codecs for extended formats
-delete leftovers
-rw-r--r--configs/media_codecs.xml22
-rw-r--r--configs/p2p_supplicant_overlay.conf1
-rw-r--r--configs/wpa_supplicant_overlay.conf1
3 files changed, 22 insertions, 2 deletions
diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml
index c135946..37afed3 100644
--- a/configs/media_codecs.xml
+++ b/configs/media_codecs.xml
@@ -122,6 +122,28 @@ Only the three quirks included above are recognized at this point:
<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" />
+ <!-- ffmpeg audio codecs -->
+ <MediaCodec name="OMX.ffmpeg.ra.decoder" type="audio/vnd.rn-realaudio"/>
+ <MediaCodec name="OMX.ffmpeg.flac.decoder" type="audio/flac"/>
+ <MediaCodec name="OMX.ffmpeg.mp2.decoder" type="audio/mpeg-L2"/>
+ <MediaCodec name="OMX.ffmpeg.ac3.decoder" type="audio/ac3"/>
+ <MediaCodec name="OMX.ffmpeg.ape.decoder" type="audio/x-ape"/>
+ <MediaCodec name="OMX.ffmpeg.dts.decoder" type="audio/vnd.dts"/>
+ <MediaCodec name="OMX.ffmpeg.atrial.decoder" type="audio/ffmpeg"/>
+
+ <!-- ffmpeg video codecs -->
+ <MediaCodec name="OMX.ffmpeg.mpeg2v.decoder" type="video/mpeg2"/>
+ <MediaCodec name="OMX.ffmpeg.h263.decoder" type="video/3gpp"/>
+ <MediaCodec name="OMX.ffmpeg.mpeg4.decoder" type="video/mp4v-es"/>
+ <MediaCodec name="OMX.ffmpeg.wmv.decoder" type="video/x-ms-wmv"/>
+ <MediaCodec name="OMX.ffmpeg.rv.decoder" type="video/vnd.rn-realvideo"/>
+ <MediaCodec name="OMX.ffmpeg.h264.decoder" type="video/avc"/>
+ <MediaCodec name="OMX.ffmpeg.vc1.decoder" type="video/vc1"/>
+ <MediaCodec name="OMX.ffmpeg.flv1.decoder" type="video/x-flv"/>
+ <MediaCodec name="OMX.ffmpeg.divx.decoder" type="video/divx"/>
+ <MediaCodec name="OMX.ffmpeg.hevc.decoder" type="video/hevc"/>
+ <MediaCodec name="OMX.ffmpeg.vtrial.decoder" type="video/ffmpeg"/>
+
</Decoders>
<Encoders>
diff --git a/configs/p2p_supplicant_overlay.conf b/configs/p2p_supplicant_overlay.conf
deleted file mode 100644
index 6ab1f6d..0000000
--- a/configs/p2p_supplicant_overlay.conf
+++ /dev/null
@@ -1 +0,0 @@
-disable_scan_offload=1 \ No newline at end of file
diff --git a/configs/wpa_supplicant_overlay.conf b/configs/wpa_supplicant_overlay.conf
deleted file mode 100644
index 6ab1f6d..0000000
--- a/configs/wpa_supplicant_overlay.conf
+++ /dev/null
@@ -1 +0,0 @@
-disable_scan_offload=1 \ No newline at end of file