From 5c7669385726b8aab6a554e31cc720e27dd446e8 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Wed, 11 May 2016 16:26:44 +0100 Subject: FFMPEGSoftCodec: Initialize the OMX param struct before using it Make sure all the items in the port param config are filled out, not just those we expect to use. Ref: CYNGNOS-2797 Change-Id: I9271a83fc6496cfe5ad14e45841cd8a05ffece30 --- media/libstagefright/FFMPEGSoftCodec.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'media/libstagefright/FFMPEGSoftCodec.cpp') diff --git a/media/libstagefright/FFMPEGSoftCodec.cpp b/media/libstagefright/FFMPEGSoftCodec.cpp index 26afd89..f981c71 100644 --- a/media/libstagefright/FFMPEGSoftCodec.cpp +++ b/media/libstagefright/FFMPEGSoftCodec.cpp @@ -325,6 +325,7 @@ status_t FFMPEGSoftCodec::setVideoFormat( int32_t mode = 0; OMX_QCOM_PARAM_PORTDEFINITIONTYPE portFmt; + InitOMXParams(&portFmt); portFmt.nPortIndex = kPortIndexInput; if (msg->findInt32("use-arbitrary-mode", &mode) && mode) { -- cgit v1.1 From 0eb2f24bf01894947fededbc097b47c962287dda Mon Sep 17 00:00:00 2001 From: Keith Mok Date: Wed, 18 May 2016 14:26:49 -0700 Subject: 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 --- media/libstagefright/FFMPEGSoftCodec.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'media/libstagefright/FFMPEGSoftCodec.cpp') 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; -- cgit v1.1 From 16d14e178003b193db1422c11c95bc0b1d44b690 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Fri, 19 Aug 2016 17:41:21 -0700 Subject: stagefright: Disable thumbnail mode for 8996-class devices * The hardware is freezing when used for certain media types. Disable it until the issue is understood. Change-Id: Iaec2420b4f8d3ceacf2c6f72ab14db424092c96b --- media/libstagefright/FFMPEGSoftCodec.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'media/libstagefright/FFMPEGSoftCodec.cpp') diff --git a/media/libstagefright/FFMPEGSoftCodec.cpp b/media/libstagefright/FFMPEGSoftCodec.cpp index 7233162..0d5802b 100644 --- a/media/libstagefright/FFMPEGSoftCodec.cpp +++ b/media/libstagefright/FFMPEGSoftCodec.cpp @@ -35,6 +35,8 @@ #include #include +#include + #include #include #include @@ -394,9 +396,13 @@ status_t FFMPEGSoftCodec::setVideoFormat( } // Enable Sync-frame decode mode for thumbnails + char board[PROPERTY_VALUE_MAX]; + property_get("ro.board.platform", board, NULL); int32_t thumbnailMode = 0; if (msg->findInt32("thumbnail-mode", &thumbnailMode) && - thumbnailMode > 0) { + thumbnailMode > 0 && + !(!strcmp(board, "msm8996") || !strcmp(board, "msm8937") || + !strcmp(board, "msm8953") || !strcmp(board, "msm8976"))) { ALOGV("Enabling thumbnail mode."); QOMX_ENABLETYPE enableType; OMX_INDEXTYPE indexType; -- cgit v1.1