diff options
| author | Danny Baumann <dannybaumann@web.de> | 2012-05-28 08:05:57 +0200 |
|---|---|---|
| committer | Danny Baumann <dannybaumann@web.de> | 2012-05-30 12:16:22 +0200 |
| commit | 26e7d83cb29bc7dde484860c525b4875f9f2f7bd (patch) | |
| tree | 7dbda63a7804d153a6a1930cc0de56d8a9f5a4b9 | |
| parent | 32b4d32539b5d8f7ac59f29f8a75c0a21807fbb0 (diff) | |
| download | frameworks_base-26e7d83cb29bc7dde484860c525b4875f9f2f7bd.zip frameworks_base-26e7d83cb29bc7dde484860c525b4875f9f2f7bd.tar.gz frameworks_base-26e7d83cb29bc7dde484860c525b4875f9f2f7bd.tar.bz2 | |
Add missing software audio codecs for OMAP devices.
Fixes http://code.google.com/p/cyanogenmod/issues/detail?id=5290.
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 2994e5c..592ca05 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -242,6 +242,8 @@ static const CodecInfo kDecoderInfo[] = { { MEDIA_MIMETYPE_AUDIO_AMR_NB, "AMRNBDecoder" }, { MEDIA_MIMETYPE_AUDIO_AMR_WB, "AMRWBDecoder" }, { MEDIA_MIMETYPE_AUDIO_AAC, "AACDecoder" }, + { MEDIA_MIMETYPE_AUDIO_G711_ALAW, "G711Decoder" }, + { MEDIA_MIMETYPE_AUDIO_G711_MLAW, "G711Decoder" }, { MEDIA_MIMETYPE_VIDEO_WMV, "OMX.TI.DUCATI1.VIDEO.DECODER" }, { MEDIA_MIMETYPE_AUDIO_WMA, "OMX.ITTIAM.WMA.decode" }, { MEDIA_MIMETYPE_AUDIO_WMALSL, "OMX.ITTIAM.WMALSL.decode" }, @@ -253,6 +255,7 @@ static const CodecInfo kDecoderInfo[] = { { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.TI.DUCATI1.VIDEO.DECODER" }, { MEDIA_MIMETYPE_VIDEO_AVC, "AVCDecoder" }, { MEDIA_MIMETYPE_AUDIO_VORBIS, "VorbisDecoder" }, + { MEDIA_MIMETYPE_VIDEO_VPX, "VPXDecoder" }, { MEDIA_MIMETYPE_VIDEO_VP6, "OMX.TI.DUCATI1.VIDEO.DECODER" }, { MEDIA_MIMETYPE_VIDEO_VP7, "OMX.TI.DUCATI1.VIDEO.DECODER" } }; @@ -279,6 +282,8 @@ static const CodecInfo kDecoderInfo[] = { { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.ITTIAM.AAC.decode" }, { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.PV.aacdec" }, { MEDIA_MIMETYPE_AUDIO_AAC, "AACDecoder" }, + { MEDIA_MIMETYPE_AUDIO_G711_ALAW, "G711Decoder" }, + { MEDIA_MIMETYPE_AUDIO_G711_MLAW, "G711Decoder" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.TI.Video.Decoder" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.TI.720P.Decoder" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "M4vH263Decoder" }, @@ -289,6 +294,7 @@ static const CodecInfo kDecoderInfo[] = { { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.TI.720P.Decoder" }, { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.TI.Video.Decoder" }, { MEDIA_MIMETYPE_AUDIO_VORBIS, "VorbisDecoder" }, + { MEDIA_MIMETYPE_VIDEO_VPX, "VPXDecoder" }, { MEDIA_MIMETYPE_VIDEO_WMV, "OMX.TI.Video.Decoder" }, { MEDIA_MIMETYPE_VIDEO_WMV, "OMX.TI.720P.Decoder" }, { MEDIA_MIMETYPE_AUDIO_WMA, "OMX.TI.WMA.decode"}, |