summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Hu <austin.hu@intel.com>2016-06-02 20:58:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-02 20:58:48 +0000
commitf53c8fce4095e616d9327d2d9492560cc8de4eea (patch)
treec30e9d25eff9abbc4f8d8ce0ed8bfe64558059ad
parente928a0cc911dc921b209aeae685356a373671a7d (diff)
parent5d9e7f95b8dbe10a6ed91dcb74a4bf417da13851 (diff)
downloadutils-f53c8fce4095e616d9327d2d9492560cc8de4eea.tar.gz
ISV: fixed the crashing issue when playing VP9 clips via ExoPlayer.
am: 5d9e7f95b8 * commit '5d9e7f95b8dbe10a6ed91dcb74a4bf417da13851': ISV: fixed the crashing issue when playing VP9 clips via ExoPlayer. Change-Id: I09353a93bd029aec5998c374831e3d8a3c641bd5
-rw-r--r--ISV/omx/isv_omxcomponent.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/ISV/omx/isv_omxcomponent.cpp b/ISV/omx/isv_omxcomponent.cpp
index 7b2c755..6d84b52 100644
--- a/ISV/omx/isv_omxcomponent.cpp
+++ b/ISV/omx/isv_omxcomponent.cpp
@@ -265,7 +265,8 @@ OMX_ERRORTYPE ISVComponent::ISV_GetParameter(
//FIXME: THIS IS A HACK!! Request NV12 buffer for YV12 format
//because VSP only support NV12 output
OMX_VIDEO_PORTDEFINITIONTYPE *video_def = &def->format.video;
- if (video_def->eColorFormat == VA_FOURCC_YV12) {
+ if ((video_def->eColorFormat == VA_FOURCC_YV12) ||
+ (video_def->eColorFormat == HAL_PIXEL_FORMAT_INTEL_YV12)) {
//FIXME workaround Disable ISV for YV12 input
mVPPEnabled = false;
ALOGI("%s: Disable ISV for YV12 input. mVPPEnabled %d", __func__, mVPPEnabled);