Original change: https://android-review.googlesource.com/c/platform/external/libultrahdr/+/3445606



Change-Id: I9cb360281b94b20e0a07beaed3159e0da491fd55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

This project was upgraded with external_updater.
Usage: tools/external_updater/updater.sh update external/libultrahdr
For more info, check https://cs.android.com/android/platform/superproject/main/+/main:tools/external_updater/README.md

Bug: 388593868
Test: TreeHugger
Change-Id: Ifd65c85abf02b78b88f760a27f98ad08753f6dda

1.3.1 is not api compatible with 1.3.0, hence changed the version
to 1.4.0.

Original change: https://android-review.googlesource.com/c/platform/external/libultrahdr/+/3403401



Change-Id: I923f7546fbcaa52ac3cfe2fc8f8c0f7a04dac06d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Test: Build

update checksum for benchmark resources zip

Test: Build

This project was upgraded with external_updater.
Usage: tools/external_updater/updater.sh update external/libultrahdr
For more info, check https://cs.android.com/android/platform/superproject/main/+/main:tools/external_updater/README.md

Bug: 388593868
Test: TreeHugger
Change-Id: I911e3de02f606fbc86a64cd826be7821cf690dee

when iso and xmp are enabled together, the size of secondary image does
not include the jpeg app2 marker size.

fixes #342

Test: ./ultrahdr_app

Android.bp enables xmp support by default, cmakelists.txt enables iso
support by default. Based on the build system the encoded bitstream
may vary. This change has no effect on decoder. The decoder by default
supports both iso and xmp. If both exists iso packet is preferred.

Test: ./ultrahdr_unit_test

Test: ./ultrahdr_unit_test

This change introduces support for encoding and decoding content with
gainmap metadata signalled independently for all channels in a
multi-channel gainmap image.

Test: ./ultrahdr_unit_test

Co-authored-by: Vivek R Jadhav <vivek.jadhav@ittiam.com>
Change-Id: I9306fe13c4651c7d55a830d0597924a8d25d2743

encoder api-4 allows writing uhdr image from encoded hdr intent, sdr
intent and gainmap metadata. gainmap metadata does not have a field for
gainmap application color space. this is introduced. this change effects
only api-4.

Test: ./ultrahdr_app options

during generateGainMap, the color spaces of hdr intent and sdr intent
are unified. if a wider gamut space is converted to narrower-gamut this
may result in pixel values less than zero and/or greater than 1.
choosing offsets to keep the domain of log during gainmap computation is
tricky. This can be mitigated by converting narrower gamut space data to
wider gamut space. This yields lesser overrange values. current change
implements this.

for this to work as intended writing xmp metadata in the bitstream needs
to be disabled.

Test: ./ultrahdr_app options

Co-authored-by: Vivek R Jadhav <vivek.jadhav@ittiam.com>
Change-Id: I0155a1dc043f3c3e0493e04e5a6eabe160659476

If sdr intent and hdr intent gamut space are not identical, it is
required to send hdr intent color profile as part of gainmap image. This
is addressed.

Test: ./ultrahdr_app <options>

Co-authored-by: Vivek R Jadhav <vivek.jadhav@ittiam.com>
Change-Id: I0155a1dc043f3c3e0493e04e5a6eabe160756476

- luminance function of p3 gamut is using weights of dci p3 instead of
  display p3. this is corrected. accordingly the gamut conversions
  involving display p3 are updated.
- increased precision of some constants used in csc

Test: ./ultrahdr_unit_test
Change-Id: Iec77b3d24adb7ad887a8f53d805eecc0c0160f28

while computing gain for near blacks or pixels with channel values zero,
sdr_offset is used. This value is extremely small and can result large
gainmap coefficient. During encode-decode process, if this sdr pixel
flips to zero, after applying gainmap the hdr pixel will blow out. It is
best if the gainmap computation logic is desensitized for dark pixels.

also, conversion from wider to narrower gamut space can cause overrange
values. clip only negative excursions so that domain of computeGain
remains positive.

Test: ./ultrahdr_app
Change-Id: Id98d95d020a01db6e85e08115a4405eac07d42c1

color space of the image can be signalled via cicp tag in icc. While
parsing for gamut space of the image, use the information present in
this tag as well (if available).

Test: ./ultrahdr_app <options>

Original change: undetermined

Change-Id: I9efdb8ad2d1b35aeb9ded6c73056a5c28746fefd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/external/libultrahdr/+/3363310



Change-Id: If6cbc4dfa16903dfc5047f84a0f8b0227ddeccc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

This project was upgraded with external_updater.
Usage: tools/external_updater/updater.sh update external/libultrahdr
For more info, check https://cs.android.com/android/platform/superproject/main/+/main:tools/external_updater/README.md

Bug: 379761763
Test: TreeHugger
Change-Id: Icb881de028416a20ff3107c8a0e5eebf50d0e4fa

Original change: undetermined

Change-Id: I4b2b89ae5c9f154e25234e660295e3e146655d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/external/libultrahdr/+/3369965



Change-Id: I7084b474e5777743f36094f00108a54e146e68d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

This establishes history between aosp/main and aosp/upstream-main
branch and makes no code change. This was necessary to resolve a
build issue in an internal branch.

Bug: 379761763
Test: TreeHugger
Change-Id: I63b11cb999a3bfdcd486d5b616d05e5a154053f6

[automerger skipped] fix overflows while encoding large images am: 4cba06e6 am: ebe887ed -s ours

am skip reason: Merged-In I52cc2d96216c914d051c7ec5869113a6313cb5c6 with SHA-1 1c2fdcea is already in history

Original change: https://android-review.googlesource.com/c/platform/external/libultrahdr/+/3367699



Change-Id: I9ec076dd5265cd55f0c2f0aafe2bd7493bf1684f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/external/libultrahdr/+/3367699



Change-Id: Iba3eb48cce34178e802b59df3b37a0f1bdd6ed80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

The data type that was used to store the memory required for input raw
buffers was int. This works for normal dimensions. For images where
width and height are very large, say greater than 32768, then rgb input
buffer size is 32768 * 32768 * 4. This computation exceeds integer max
causing issues. This change addresses this by assigning the type for
widths/heights/strides/ as unsigned int and buffer sizes as size_t

Bug: 379761763
Test: ./ultrahdr_unit_test
(cherry picked from commit a265b540)
Change-Id: I52cc2d96216c914d051c7ec5869113a6313cb5c6
Merged-In: I52cc2d96216c914d051c7ec5869113a6313cb5c6

The data type that was used to store the memory required for input raw
buffers was int. This works for normal dimensions. For images where
width and height are very large, say greater than 32768, then rgb input
buffer size is 32768 * 32768 * 4. This computation exceeds integer max
causing issues. This change addresses this by assigning the type for
widths/heights/strides/ as unsigned int and buffer sizes as size_t

Bug: 379761763
Test: ./ultrahdr_unit_test
(cherry picked from commit a265b540)
Change-Id: I52cc2d96216c914d051c7ec5869113a6313cb5c6

Original change: undetermined

Change-Id: I7bfec32304879a66488a1fe9fec281f0106131d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/external/libultrahdr/+/3367017



Change-Id: I32f23911235584c34ed75c86a3fdf374a891d874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: undetermined

Change-Id: If20690c366e3384a62a89a4bc3ff7c5bc5186041
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/external/libultrahdr/+/3367017



Change-Id: I6061ce6cc12fc4c4c6ea4290e90f6d23f31a9c04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Change-Id: Iba6869289464f68e74b886a6d4b0dd3624c7e904

Bug: 379761763
Test: TreeHugger
Change-Id: I04d4c0876a92f90a3b12977f55053884f423a3e6

Test: Build

Test: ./ultrahdr_app

Test: ./ultrahdr_unit_test

communicate unsupported features to the app cleanly.

Test: ./ultrahdr_unit_test

Test: ./ultrahdr_unit_test