diff options
| author | fuzz <fuzzzzzzzzzzzzzzzzzz@gmail.com> | 2014-05-15 12:54:37 +0900 |
|---|---|---|
| committer | fuzz <fuzzzzzzzzzzzzzzzzzz@gmail.com> | 2014-05-15 12:54:37 +0900 |
| commit | 43c19f17bf4ab45d2aab4e7660065da87192886a (patch) | |
| tree | b3850d1a74b151dee41f0c7bbfbbd42ec92ffd37 /prebuilt | |
| parent | 24e3ffccb4858b8ebe1f2fed1679016fa265c79b (diff) | |
otter-common: Fix up use of FFMPEG codecs
Change-Id: I95a705365328f3329a741b5f4ed2ff39bdd7fbb2
Diffstat (limited to 'prebuilt')
| -rw-r--r-- | prebuilt/etc/media_codecs.xml | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/prebuilt/etc/media_codecs.xml b/prebuilt/etc/media_codecs.xml index f5a6c88..77000dd 100644 --- a/prebuilt/etc/media_codecs.xml +++ b/prebuilt/etc/media_codecs.xml @@ -100,6 +100,15 @@ Only the three quirks included above are recognized at this point: <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" /> <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" /> + <!-- ffmpeg audio codec --> + <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 codec --> <MediaCodec name="OMX.ffmpeg.mpeg2v.decoder" type="video/mpeg2" /> <MediaCodec name="OMX.ffmpeg.h263.decoder" type="video/3gpp" /> @@ -107,25 +116,11 @@ Only the three quirks included above are recognized at this point: <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.vpx.decoder" type="video/x-vnd.on2.vp8" /> <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.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" /> - - <!-- ffmpeg audio codec --> - <MediaCodec name="OMX.ffmpeg.aac.decoder" type="audio/mp4a-latm" /> - <MediaCodec name="OMX.ffmpeg.mp3.decoder" type="audio/mpeg" /> - <MediaCodec name="OMX.ffmpeg.vorbis.decoder" type="audio/vorbis" /> - <MediaCodec name="OMX.ffmpeg.wma.decoder" type="audio/x-ms-wma" /> - <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" /> </Decoders> <Encoders> |