summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHo-Eun Ryu <ho-eun.ryu@windriver.com>2011-03-30 16:19:59 +0900
committerJean Johnson <jean-johnson@ti.com>2011-04-01 22:16:27 -0500
commit73bc67cb8cfee8db5dbe0b8c859cbe5e36f5b2a0 (patch)
tree95929fb588fdc146cf4381bc9a2ef88ef84fdb08
parentcbe386f2e00adcfc8f4ce5b507d95d0dc95d9db6 (diff)
downloadbase-73bc67cb8cfee8db5dbe0b8c859cbe5e36f5b2a0.tar.gz
OMAP:stagefright: add VPXDecoder to OMAP decoder list.
VPXDecoder is not available with OMAP_ENHANCEMENT flag enabled. add VPXDecoder to the decoder list of both of OMAP variants (3 and 4) This enables WebM clips to be played. Signed-off-by: Ho-Eun Ryu <ho-eun.ryu@windriver.com> Patch set 2: Simple cherry-pick on current tree. No changes made. Taking verifications, approvals and build test from patch set 1. Signed-off-by: Jean Johnson <jean-johnson@ti.com> Change-Id: I833a92cabf1745730f50a2df8c0db41854391b98
-rw-r--r--media/libstagefright/OMXCodec.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index af46bc45f304..ccb78c9acd82 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -241,7 +241,8 @@ static const CodecInfo kDecoderInfo[] = {
{ MEDIA_MIMETYPE_VIDEO_AVC, "AVCDecoder" },
{ MEDIA_MIMETYPE_AUDIO_VORBIS, "VorbisDecoder" },
{ MEDIA_MIMETYPE_VIDEO_VP6, "OMX.TI.DUCATI1.VIDEO.DECODER" },
- { MEDIA_MIMETYPE_VIDEO_VP7, "OMX.TI.DUCATI1.VIDEO.DECODER" }
+ { MEDIA_MIMETYPE_VIDEO_VP7, "OMX.TI.DUCATI1.VIDEO.DECODER" },
+ { MEDIA_MIMETYPE_VIDEO_VPX, "VPXDecoder" },
};
//Maintain only s/w encoders till ducati encoders are integrated to SF
@@ -277,6 +278,7 @@ static const CodecInfo kDecoderInfo[] = {
{ MEDIA_MIMETYPE_VIDEO_WMV, "OMX.TI.720P.Decoder" },
{ MEDIA_MIMETYPE_AUDIO_WMA, "OMX.TI.WMA.decode"},
{ MEDIA_MIMETYPE_AUDIO_WMA, "OMX.ITTIAM.WMA.decode"},
+ { MEDIA_MIMETYPE_VIDEO_VPX, "VPXDecoder" },
};
static const CodecInfo kEncoderInfo[] = {