diff options
| -rw-r--r-- | common.mk | 3 | ||||
| -rwxr-xr-x | configs/media_codecs.xml | 24 |
2 files changed, 3 insertions, 24 deletions
@@ -105,7 +105,8 @@ PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/media_codecs.xml:system/etc/media_codecs.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ + frameworks/av/media/libstagefright/data/media_codecs_ffmpeg.xml:system/etc/media_codecs_ffmpeg.xml # Filesystem management tools PRODUCT_PACKAGES += \ diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml index 1bc7d63..b628b68 100755 --- a/configs/media_codecs.xml +++ b/configs/media_codecs.xml @@ -83,29 +83,6 @@ Only the three quirks included above are recognized at this point: <MediaCodec name="OMX.SEC.MPEG4.Decoder" type="video/mp4v-es" /> <MediaCodec name="OMX.SEC.H263.Decoder" type="video/3gpp" /> <MediaCodec name="OMX.SEC.AVC.Decoder" type="video/avc" /> - - <!-- 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> @@ -114,4 +91,5 @@ Only the three quirks included above are recognized at this point: <MediaCodec name="OMX.SEC.AVC.Encoder" type="video/avc" /> </Encoders> <Include href="media_codecs_google_video.xml" /> + <Include href="media_codecs_ffmpeg.xml" /> </MediaCodecs> |