diff options
| author | Praveen Chavan <pchavan@codeaurora.org> | 2015-10-12 12:16:27 -0700 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2015-10-12 22:53:29 +0000 |
| commit | 61f5b8c8352611acbe13c449687cf1c40c0d76a3 (patch) | |
| tree | 9e127ec10f01ae999bf68429799843d116ae0ecd | |
| parent | ad021328f4768134c8794e90690638ba24ac7faf (diff) | |
| download | media-marshmallow-mr1-dev.tar.gz | |
mm-video-v4l2: vdec: notify colorspace info only if presentandroid-n-preview-1android-6.0.1_r9android-6.0.1_r8android-6.0.1_r7android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr1-dev
Check if the content has valid colorspace info in the VUI
before overriding the default colorspace to display
Bug: 24841600
Change-Id: I0ccc888c601c4a6ef0c61f5a68062e9cf931eab8
| -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 9c6646a..19c1596 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -9300,8 +9300,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: |