diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-22 06:51:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-22 06:51:57 +0000 |
| commit | 274c36004c29779728dc649a4a35c98c6d63c54b (patch) | |
| tree | 7a86a7e03287b3e9c0ffe60ed22f7fe6051295d1 | |
| parent | bb8c19e48d4479492b88d656d42e8b3cfa624944 (diff) | |
| parent | d1b69d58404b08dfadb4e4f9e8c1a03fe8d37cb3 (diff) | |
| download | gchips-274c36004c29779728dc649a4a35c98c6d63c54b.tar.gz | |
Merge "videoapi: fix bugs at Exynos_dynamic_meta_to_itu_t_t35" into sc-dev am: d1b69d5840
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/15301199
Change-Id: Idd6b84f0bb2b633d5d41497668518261ffe11b5a
| -rw-r--r-- | videoapi/VendorVideoAPI.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/videoapi/VendorVideoAPI.cpp b/videoapi/VendorVideoAPI.cpp index e4d1850..34af549 100644 --- a/videoapi/VendorVideoAPI.cpp +++ b/videoapi/VendorVideoAPI.cpp @@ -910,7 +910,7 @@ int Exynos_dynamic_meta_to_itu_t_t35 ( for (i = 0; i < 2; i++) { for (j = 0; j < 8; j++) { *((char *)pBlob + (bit_offset / 8)) |= - (*((char *)&pHDRDynamicInfo->data.provider_code + i) & (1 << (7 - j))); + (*((char *)&pHDRDynamicInfo->data.provider_code + 1 - i) & (1 << (7 - j))); bit_offset++; if (bit_offset == offset_limit) @@ -924,7 +924,7 @@ int Exynos_dynamic_meta_to_itu_t_t35 ( for (i = 0; i < 2; i++) { for (j = 0; j < 8; j++) { *((char *)pBlob + (bit_offset / 8)) |= - (*((char *)&pHDRDynamicInfo->data.provider_oriented_code + i) & (1 << (7 - j))); + (*((char *)&pHDRDynamicInfo->data.provider_oriented_code + 1 - i) & (1 << (7 - j))); bit_offset++; if (bit_offset == offset_limit) @@ -1155,7 +1155,7 @@ int Exynos_dynamic_meta_to_itu_t_t35 ( /* tone_mapping_flag: 1bit */ if (pHDRDynamicInfo->data.tone_mapping.tone_mapping_flag) { - *((char *)pBlob + (bit_offset / 8)) |= (0x20 & (1 << (7 - extraBit))); + *((char *)pBlob + (bit_offset / 8)) |= (1 << (7 - extraBit)); } bit_offset += 1; extraBit = (bit_offset % 8); |