diff options
| author | android-andi <skate4life@gmx.de> | 2014-11-12 16:20:19 +0100 |
|---|---|---|
| committer | Andreas Blaesius <skate4life@gmx.de> | 2015-01-02 20:37:37 +0100 |
| commit | f0843d01ed15ee11da4347347dba7d5916b9e94a (patch) | |
| tree | 98326bc04ae24d95f28bf2254c73d10216e65f9f | |
| parent | fd5faff5cdbfdf21c250dc0d807a4302ea8afd0a (diff) | |
| download | device_samsung_espresso3g-f0843d01ed15ee11da4347347dba7d5916b9e94a.zip device_samsung_espresso3g-f0843d01ed15ee11da4347347dba7d5916b9e94a.tar.gz device_samsung_espresso3g-f0843d01ed15ee11da4347347dba7d5916b9e94a.tar.bz2 | |
P51XX: Update media_codecs
Change-Id: I3bcf737151ab924ad2c0e89dc0daab4153d6f421
| -rw-r--r-- | configs/media_codecs.xml | 44 | ||||
| -rwxr-xr-x | p51xx-common.mk | 6 |
2 files changed, 11 insertions, 39 deletions
diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml index 3c60636..9c94f1e 100644 --- a/configs/media_codecs.xml +++ b/configs/media_codecs.xml @@ -76,6 +76,9 @@ Only the three quirks included above are recognized at this point: --> <MediaCodecs> + <Include href="media_codecs_google_audio.xml" /> + <Include href="media_codecs_google_telephony.xml" /> + <Decoders> <MediaCodec name="OMX.TI.DUCATI1.VIDEO.DECODER" > <Type name="video/mp4v-es" /> @@ -85,40 +88,6 @@ Only the three quirks included above are recognized at this point: <Quirk name="requires-allocate-on-output-ports" /> </MediaCodec> - <MediaCodec name="OMX.google.mp3.decoder" type="audio/mpeg" /> - <MediaCodec name="OMX.google.amrnb.decoder" type="audio/3gpp" /> - <MediaCodec name="OMX.google.amrwb.decoder" type="audio/amr-wb" /> - <MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm" /> - <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" /> - - <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" /> - <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" /> - <MediaCodec name="OMX.google.h264.decoder" type="video/avc" /> - <MediaCodec name="OMX.google.vpx.decoder" type="video/x-vnd.on2.vp8" /> - - <!-- 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> @@ -134,9 +103,8 @@ Only the three quirks included above are recognized at this point: <Quirk name="requires-allocate-on-output-ports" /> </MediaCodec> - <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" /> - <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" /> - <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" /> - <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" /> </Encoders> + + <Include href="media_codecs_google_video.xml" /> + <Include href="media_codecs_ffmpeg.xml" /> </MediaCodecs> diff --git a/p51xx-common.mk b/p51xx-common.mk index 56856cc..bec9fc3 100755 --- a/p51xx-common.mk +++ b/p51xx-common.mk @@ -56,7 +56,11 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Media profiles PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/media_codecs.xml:system/etc/media_codecs.xml \ - $(LOCAL_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml + $(LOCAL_PATH)/configs/media_profiles.xml:system/etc/media_profiles.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_ffmpeg.xml:system/etc/media_codecs_ffmpeg.xml # Keylayout PRODUCT_COPY_FILES += \ |