summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-09-10 23:03:44 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-09-10 23:03:44 +0000
commit734208504c29b42374a68f5a7e900b9e6fd6e5d0 (patch)
tree49b8cb1e3df317471f34c8a43c5368ea94bc5d4b
parentab2e9a27fed1550c95c9a8afba547e4848c9d38a (diff)
parenta9ce4757f75ad260ba6c022cd875ba21fb3f8089 (diff)
downloadmedia-pie-b4s4-release.tar.gz
Snap for 5002396 from a9ce4757f75ad260ba6c022cd875ba21fb3f8089 to pi-b4s4-releaseandroid-9.0.0_r39android-9.0.0_r38pie-b4s4-release
Change-Id: Ic66b43e71d34c47519f3fbc0a2afdc37aa039229
-rw-r--r--msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp24
1 files changed, 12 insertions, 12 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 b61f49b..419d9f5 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
@@ -11399,12 +11399,12 @@ bool omx_vdec::handle_mastering_display_color_info(void* data, MasteringDisplay*
mastering_display_mdata->maxDisplayLuminance = mastering_display_payload->nMaxDisplayMasteringLuminance;
mastering_display_mdata->minDisplayLuminance = mastering_display_payload->nMinDisplayMasteringLuminance;
- internal_disp_changed_flag |= (hdr_info->sType1.mR.x != mastering_display_payload->nDisplayPrimariesX[0]) ||
- (hdr_info->sType1.mR.y != mastering_display_payload->nDisplayPrimariesY[0]);
- internal_disp_changed_flag |= (hdr_info->sType1.mG.x != mastering_display_payload->nDisplayPrimariesX[1]) ||
- (hdr_info->sType1.mG.y != mastering_display_payload->nDisplayPrimariesY[1]);
- internal_disp_changed_flag |= (hdr_info->sType1.mB.x != mastering_display_payload->nDisplayPrimariesX[2]) ||
- (hdr_info->sType1.mB.y != mastering_display_payload->nDisplayPrimariesY[2]);
+ internal_disp_changed_flag |= (hdr_info->sType1.mG.x != mastering_display_payload->nDisplayPrimariesX[0]) ||
+ (hdr_info->sType1.mG.y != mastering_display_payload->nDisplayPrimariesY[0]);
+ internal_disp_changed_flag |= (hdr_info->sType1.mB.x != mastering_display_payload->nDisplayPrimariesX[1]) ||
+ (hdr_info->sType1.mB.y != mastering_display_payload->nDisplayPrimariesY[1]);
+ internal_disp_changed_flag |= (hdr_info->sType1.mR.x != mastering_display_payload->nDisplayPrimariesX[2]) ||
+ (hdr_info->sType1.mR.y != mastering_display_payload->nDisplayPrimariesY[2]);
internal_disp_changed_flag |= (hdr_info->sType1.mW.x != mastering_display_payload->nWhitePointX) ||
(hdr_info->sType1.mW.y != mastering_display_payload->nWhitePointY);
@@ -11418,12 +11418,12 @@ bool omx_vdec::handle_mastering_display_color_info(void* data, MasteringDisplay*
(hdr_info->sType1.mMinDisplayLuminance != mastering_display_payload->nMinDisplayMasteringLuminance);
if (internal_disp_changed_flag) {
- hdr_info->sType1.mR.x = mastering_display_payload->nDisplayPrimariesX[0];
- hdr_info->sType1.mR.y = mastering_display_payload->nDisplayPrimariesY[0];
- hdr_info->sType1.mG.x = mastering_display_payload->nDisplayPrimariesX[1];
- hdr_info->sType1.mG.y = mastering_display_payload->nDisplayPrimariesY[1];
- hdr_info->sType1.mB.x = mastering_display_payload->nDisplayPrimariesX[2];
- hdr_info->sType1.mB.y = mastering_display_payload->nDisplayPrimariesY[2];
+ hdr_info->sType1.mG.x = mastering_display_payload->nDisplayPrimariesX[0];
+ hdr_info->sType1.mG.y = mastering_display_payload->nDisplayPrimariesY[0];
+ hdr_info->sType1.mB.x = mastering_display_payload->nDisplayPrimariesX[1];
+ hdr_info->sType1.mB.y = mastering_display_payload->nDisplayPrimariesY[1];
+ hdr_info->sType1.mR.x = mastering_display_payload->nDisplayPrimariesX[2];
+ hdr_info->sType1.mR.y = mastering_display_payload->nDisplayPrimariesY[2];
hdr_info->sType1.mW.x = mastering_display_payload->nWhitePointX;
hdr_info->sType1.mW.y = mastering_display_payload->nWhitePointY;