summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Mok <kmok@cyngn.com>2015-12-09 15:06:20 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-12-09 22:52:49 -0800
commit6904c9ac0058e81d2ea063e2b09f3f1754d7e8f4 (patch)
treed8baaa42ac016a04030549655fc469245b1a8023
parent7450c3dafe7413576e30b249834f31785e92cc25 (diff)
downloadframeworks_av-6904c9ac0058e81d2ea063e2b09f3f1754d7e8f4.zip
frameworks_av-6904c9ac0058e81d2ea063e2b09f3f1754d7e8f4.tar.gz
frameworks_av-6904c9ac0058e81d2ea063e2b09f3f1754d7e8f4.tar.bz2
stagefright: Override to use ffmpeg for decoding wmv1
Qcom hardware vc1 decoder cannot decode wmv1 (version7) correctly. Currently it only skip wmv2 (version8) and force to use ffmpeg sw decoder. Change to use default decoder only if wmv version is equals to 9 (vc1) Change-Id: Iadb0ecca252ee8a1dfb635ee44d1a88daa9c7a54
-rw-r--r--media/libstagefright/FFMPEGSoftCodec.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/FFMPEGSoftCodec.cpp b/media/libstagefright/FFMPEGSoftCodec.cpp
index d899351..0a42fc7 100644
--- a/media/libstagefright/FFMPEGSoftCodec.cpp
+++ b/media/libstagefright/FFMPEGSoftCodec.cpp
@@ -199,7 +199,7 @@ void FFMPEGSoftCodec::overrideComponentName(
if (!strncasecmp(mime->c_str(), MEDIA_MIMETYPE_VIDEO_WMV, strlen(MEDIA_MIMETYPE_VIDEO_WMV)) &&
msg->findInt32(getMsgKey(kKeyWMVVersion), &wmvVersion)) {
ALOGD("Found WMV version key %d", wmvVersion);
- if (wmvVersion == 1) {
+ if (wmvVersion != 2) {
ALOGD("Use FFMPEG for unsupported WMV track");
componentName->setTo("OMX.ffmpeg.wmv.decoder");
}