summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorKeith Mok <kmok@cyngn.com>2016-05-18 14:26:49 -0700
committerKeith Mok <kmok@cyngn.com>2016-05-18 14:33:07 -0700
commit0eb2f24bf01894947fededbc097b47c962287dda (patch)
tree6395ae3ae1d7b13e6c483732167d1a48605037a1 /media/libstagefright
parent8436846aeb997577415288270a2e4648f2a52ded (diff)
downloadframeworks_av-0eb2f24bf01894947fededbc097b47c962287dda.zip
frameworks_av-0eb2f24bf01894947fededbc097b47c962287dda.tar.gz
frameworks_av-0eb2f24bf01894947fededbc097b47c962287dda.tar.bz2
stagefright: Fix cts issue with divx test
8909 is using soft-ip divx decoder using component name starts with "OMX.ittiam." instead of "OMX.qcom." leading to FFMPEGSoftCodec override with wrong compression format using OMX_VIDEO_CodingDIVX (0x7F000003) defined in OMX_FFMPEG_Extn.h. But qcom omx component actually use QOMX_VIDEO_CodingDivx (0x7FA30C02) which defined in OMX_QCOMExtns.h. Add checking for OMX.ittiam in additional to OMX.qcom solved the problem. FEIJ-700 Change-Id: I4071eb3978974d1072373f0c88ea83653c0c53a9
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/FFMPEGSoftCodec.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/FFMPEGSoftCodec.cpp b/media/libstagefright/FFMPEGSoftCodec.cpp
index f981c71..7233162 100644
--- a/media/libstagefright/FFMPEGSoftCodec.cpp
+++ b/media/libstagefright/FFMPEGSoftCodec.cpp
@@ -319,7 +319,8 @@ status_t FFMPEGSoftCodec::setVideoFormat(
// from the CAF L release. It was unfortunately moved to a proprietary
// blob and an architecture which is hellish for OEMs who wish to
// customize the platform.
- if (err == OK && (!strncmp(componentName, "OMX.qcom.", 9))) {
+ if (err == OK && (!strncmp(componentName, "OMX.qcom.", 9)
+ || !strncmp(componentName, "OMX.ittiam.", 11))) {
status_t xerr = OK;