diff options
| author | Praveen Chavan <pchavan@codeaurora.org> | 2016-07-28 18:07:09 -0700 |
|---|---|---|
| committer | Hangyu Kuang <hkuang@google.com> | 2016-07-29 17:13:32 -0700 |
| commit | 187779f25a339c00d37ff09a478113f0b2047120 (patch) | |
| tree | bf1835327d9ce483e270450b6c590f07167fb08e /msm8996 | |
| parent | c8dc4a1e8fb2cc3509afecfbb64c2500174e0248 (diff) | |
| download | media-187779f25a339c00d37ff09a478113f0b2047120.tar.gz | |
mm-video-v4l2: vdec: Use client defaults if bitstream aspects are unspecified
Return client-supplied-default values for color aspects if the
bitstream has unspecified values rather than enumerating "Unspecified".
Also, default to 601 (instead of 601-FR) in case colorspace is
unknown.
Bug: 29189938
Change-Id: Icbfd95a81152275a16f7f00b47973e76e7853569
Diffstat (limited to 'msm8996')
| -rw-r--r-- | msm8996/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/msm8996/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/msm8996/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp index bbe6a1e..3b4a00b 100644 --- a/msm8996/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/msm8996/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -10023,9 +10023,6 @@ void omx_vdec::convert_color_space_info(OMX_U32 primaries, OMX_U32 range, *color_space = ITU_R_709; aspects->mPrimaries = ColorAspects::PrimariesBT709_5; break; - case MSM_VIDC_UNSPECIFIED: - aspects->mPrimaries = ColorAspects::PrimariesUnspecified; - break; case MSM_VIDC_BT470_6_M: aspects->mPrimaries = ColorAspects::PrimariesBT470_6M; break; @@ -10042,6 +10039,8 @@ void omx_vdec::convert_color_space_info(OMX_U32 primaries, OMX_U32 range, case MSM_VIDC_BT2020: aspects->mPrimaries = ColorAspects::PrimariesBT2020; break; + case MSM_VIDC_UNSPECIFIED: + //Client does not expect ColorAspects::PrimariesUnspecified, but rather the supplied default default: //aspects->mPrimaries = ColorAspects::PrimariesOther; aspects->mPrimaries = m_client_color_space.sAspects.mPrimaries; @@ -10116,7 +10115,7 @@ void omx_vdec::print_debug_color_aspects(ColorAspects *aspects, const char *pref void omx_vdec::handle_color_space_info(void *data, unsigned int buf_index) { - ColorSpace_t color_space = ITU_R_601_FR; + ColorSpace_t color_space = ITU_R_601; ColorAspects tempAspects; memset(&tempAspects, 0x0, sizeof(ColorAspects)); ColorAspects *aspects = &tempAspects; |