diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:21:30 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:21:30 -0800 |
| commit | 74d7d046aeb29bfd82a568eb5d6f1cb5b1672b53 (patch) | |
| tree | 789c31db42bb2c4e072d2d99a775f5b982e5c5b2 | |
| parent | 058375e591218cbec2bd3d44e6b84e8a3aca0b8d (diff) | |
| parent | 61f5b8c8352611acbe13c449687cf1c40c0d76a3 (diff) | |
| download | android_hardware_qcom_media-74d7d046aeb29bfd82a568eb5d6f1cb5b1672b53.tar.gz android_hardware_qcom_media-74d7d046aeb29bfd82a568eb5d6f1cb5b1672b53.tar.bz2 android_hardware_qcom_media-74d7d046aeb29bfd82a568eb5d6f1cb5b1672b53.zip | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/hardware/qcom/media into HEAD
Android 6.0.1 release 3
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp index e44ae594..0a6ccc3a 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -9301,8 +9301,10 @@ void omx_vdec::handle_extradata(OMX_BUFFERHEADERTYPE *p_buf_hdr) DEBUG_PRINT_ERROR("VUI display info not propagated to client"); } - if (m_enable_android_native_buffers) { - ColorSpace_t color_space = ITU_R_601_FR; + if (m_enable_android_native_buffers + && display_info_payload->video_signal_present_flag + && display_info_payload->color_description_present_flag) { + ColorSpace_t color_space = ITU_R_601; switch (display_info_payload->color_primaries) { case 1: |