diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-11 02:48:40 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-11 02:48:40 +0000 |
commit | 3ae7d9ba54de8940f04dcf43bc751d0fa7ddaa77 (patch) | |
tree | 026b56668b07e2174853365d1afc869fc8972066 /msm8998 | |
parent | 6eb5ee5a75aea017af1bab5d38729a1eb327aee5 (diff) | |
parent | a9e43634b124bf8aa45668b537aea2ba1f0392c4 (diff) | |
download | media-3ae7d9ba54de8940f04dcf43bc751d0fa7ddaa77.tar.gz |
Merge "mm-video-v4l2: vdec: Handle color transfer enums for HDR content" into pi-devpie-dev
Diffstat (limited to 'msm8998')
-rw-r--r-- | msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp index 04cd442..8e0b014 100644 --- a/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -11038,6 +11038,12 @@ void omx_vdec::convert_color_space_info(OMX_U32 primaries, OMX_U32 range, case MSM_VIDC_TRANSFER_SRGB: aspects->mTransfer = ColorAspects::TransferSRGB; break; + case MSM_VIDC_TRANSFER_SMPTE_ST2084: + aspects->mTransfer = ColorAspects::TransferST2084; + break; + case MSM_VIDC_TRANSFER_HLG: + aspects->mTransfer = ColorAspects::TransferHLG; + break; default: //aspects->mTransfer = ColorAspects::TransferOther; aspects->mTransfer = m_client_color_space.sAspects.mTransfer; |