Upgrade libultrahdr to 14849e395741d01326bd68deb785da912b88cbd1 am: 40d2583161

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

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

29 files changed, 66 insertions, 62 deletions

diff --git a/Android.bp b/Android.bp
index d3cb33e..ce5f3a0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,15 +36,15 @@ cc_library {
     enabled: false,
     host_supported: true,
     vendor_available: true,
-    export_include_dirs: ["lib"],
-    local_include_dirs: ["lib"],
+    export_include_dirs: ["lib/include"],
+    local_include_dirs: ["lib/include"],
 
     srcs: [
-        "lib/icc.cpp",
-        "lib/jpegr.cpp",
-        "lib/gainmapmath.cpp",
-        "lib/jpegrutils.cpp",
-        "lib/multipictureformat.cpp",
+        "lib/src/icc.cpp",
+        "lib/src/jpegr.cpp",
+        "lib/src/gainmapmath.cpp",
+        "lib/src/jpegrutils.cpp",
+        "lib/src/multipictureformat.cpp",
     ],
 
     shared_libs: [
@@ -67,10 +67,10 @@ cc_library {
         "liblog",
     ],
 
-    export_include_dirs: ["lib"],
+    export_include_dirs: ["lib/include"],
 
     srcs: [
-        "lib/jpegencoderhelper.cpp",
+        "lib/src/jpegencoderhelper.cpp",
     ],
 }
 
@@ -85,9 +85,9 @@ cc_library {
         "liblog",
     ],
 
-    export_include_dirs: ["lib"],
+    export_include_dirs: ["lib/include"],
 
     srcs: [
-        "lib/jpegdecoderhelper.cpp",
+        "lib/src/jpegdecoderhelper.cpp",
     ],
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84091f4..857972a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -295,12 +295,12 @@ set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
 ###########################################################
 # File Lists
 ###########################################################
-file(GLOB UHDR_LIB_LIST "${SOURCE_DIR}/*.cpp")
+file(GLOB UHDR_LIB_LIST "${SOURCE_DIR}/src/*.cpp")
 file(GLOB UHDR_TEST_LIST "${TESTS_DIR}/*.cpp")
 file(GLOB UHDR_BM_LIST "${BENCHMARK_DIR}/*.cpp")
 file(GLOB IMAGE_IO_LIST "${THIRD_PARTY_DIR}/image_io/src/**/*.cc")
 
-set(COMMON_INCLUDE_LIST ${SOURCE_DIR} ${JPEG_INCLUDE_DIRS})
+set(COMMON_INCLUDE_LIST ${SOURCE_DIR}/include/ ${JPEG_INCLUDE_DIRS})
 set(COMMON_LIBS_LIST ${JPEG_LIBRARIES} Threads::Threads)
 
 ###########################################################
diff --git a/METADATA b/METADATA
index b87bb8c..53ba696 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,7 @@
+# This project was upgraded with external_updater.
+# Usage: tools/external_updater/updater.sh update libultrahdr
+# For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md
+
 name: "libultrahdr"
 description: "Android fork of the libultrahdr library."
 third_party {
@@ -5,11 +9,11 @@ third_party {
     type: GIT
     value: "https://github.com/google/libultrahdr.git"
   }
-  version: "06a67f6a532b6b6326675e431f914fab21c51528"
+  version: "14849e395741d01326bd68deb785da912b88cbd1"
   license_type: NOTICE
   last_upgrade_date {
     year: 2023
     month: 11
-    day: 28
+    day: 29
   }
 }
diff --git a/README.md b/README.md
index 27e5361..5c341b3 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ This will generate the following files under *{build_directory/Release}*:
     mkdir {build_directory}
     cd {build_directory}
     cmake -G "NMake Makefiles" -DUHDR_BUILD_TESTS=1 ../
-    cmake --build ./ --config=Release
+    cmake --build ./
     ctest
 
 This will generate the following files under *{build_directory}*:
@@ -132,5 +132,5 @@ Using libultrahdr
 libultrahdr includes two classes of APIs, one to compress and the other to
 decompress HDR images:
 
-- Refer to [jpegr.h](lib/jpegr.h) for detailed description of various encode and decode api.
+- Refer to [jpegr.h](lib/include/ultrahdr/jpegr.h) for detailed description of various encode and decode api.
 - Refer to [ultrahdr_app.cpp](examples/ultrahdr_app.cpp) for examples of its usage.
diff --git a/benchmark/benchmark_test.cpp b/benchmark/benchmark_test.cpp
index e9f9533..d013838 100644
--- a/benchmark/benchmark_test.cpp
+++ b/benchmark/benchmark_test.cpp
@@ -19,7 +19,7 @@
 
 #include <benchmark/benchmark.h>
 
-#include "jpegr.h"
+#include "ultrahdr/jpegr.h"
 
 using namespace ultrahdr;
 
diff --git a/examples/ultrahdr_app.cpp b/examples/ultrahdr_app.cpp
index f3fd372..43b4b50 100644
--- a/examples/ultrahdr_app.cpp
+++ b/examples/ultrahdr_app.cpp
@@ -27,9 +27,9 @@
 #include <fstream>
 #include <iostream>
 
-#include "ultrahdrcommon.h"
-#include "gainmapmath.h"
-#include "jpegr.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/gainmapmath.h"
+#include "ultrahdr/jpegr.h"
 
 using namespace ultrahdr;
 
diff --git a/fuzzer/ultrahdr_dec_fuzzer.cpp b/fuzzer/ultrahdr_dec_fuzzer.cpp
index 0e9c5d3..49dc913 100644
--- a/fuzzer/ultrahdr_dec_fuzzer.cpp
+++ b/fuzzer/ultrahdr_dec_fuzzer.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <memory>
 
-#include "jpegr.h"
+#include "ultrahdr/jpegr.h"
 
 using namespace ultrahdr;
 
diff --git a/fuzzer/ultrahdr_enc_fuzzer.cpp b/fuzzer/ultrahdr_enc_fuzzer.cpp
index db6021e..23cc845 100644
--- a/fuzzer/ultrahdr_enc_fuzzer.cpp
+++ b/fuzzer/ultrahdr_enc_fuzzer.cpp
@@ -20,9 +20,9 @@
 #include <memory>
 #include <random>
 
-#include "ultrahdrcommon.h"
-#include "gainmapmath.h"
-#include "jpegr.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/gainmapmath.h"
+#include "ultrahdr/jpegr.h"
 
 using namespace ultrahdr;
 
diff --git a/lib/gainmapmath.h b/lib/include/ultrahdr/gainmapmath.h
index bdbaf02..bdbaf02 100644
--- a/lib/gainmapmath.h
+++ b/lib/include/ultrahdr/gainmapmath.h
diff --git a/lib/icc.h b/lib/include/ultrahdr/icc.h
index a0b4680..a0b4680 100644
--- a/lib/icc.h
+++ b/lib/include/ultrahdr/icc.h
diff --git a/lib/jpegdecoderhelper.h b/lib/include/ultrahdr/jpegdecoderhelper.h
index 01a05e4..01a05e4 100644
--- a/lib/jpegdecoderhelper.h
+++ b/lib/include/ultrahdr/jpegdecoderhelper.h
diff --git a/lib/jpegencoderhelper.h b/lib/include/ultrahdr/jpegencoderhelper.h
index e988578..e988578 100644
--- a/lib/jpegencoderhelper.h
+++ b/lib/include/ultrahdr/jpegencoderhelper.h
diff --git a/lib/jpegr.h b/lib/include/ultrahdr/jpegr.h
index 5c8f9c3..8ac227d 100644
--- a/lib/jpegr.h
+++ b/lib/include/ultrahdr/jpegr.h
@@ -19,9 +19,9 @@
 
 #include <cfloat>
 
-#include "ultrahdr.h"
-#include "jpegdecoderhelper.h"
-#include "jpegencoderhelper.h"
+#include "ultrahdr/ultrahdr.h"
+#include "ultrahdr/jpegdecoderhelper.h"
+#include "ultrahdr/jpegencoderhelper.h"
 
 namespace ultrahdr {
 
diff --git a/lib/jpegrutils.h b/lib/include/ultrahdr/jpegrutils.h
index c3fa8ab..d5bfa0b 100644
--- a/lib/jpegrutils.h
+++ b/lib/include/ultrahdr/jpegrutils.h
@@ -17,8 +17,8 @@
 #ifndef ULTRAHDR_JPEGRUTILS_H
 #define ULTRAHDR_JPEGRUTILS_H
 
-#include "ultrahdr.h"
-#include "jpegr.h"
+#include "ultrahdr/ultrahdr.h"
+#include "ultrahdr/jpegr.h"
 
 namespace ultrahdr {
 
diff --git a/lib/multipictureformat.h b/lib/include/ultrahdr/multipictureformat.h
index 888f233..9a9141b 100644
--- a/lib/multipictureformat.h
+++ b/lib/include/ultrahdr/multipictureformat.h
@@ -33,10 +33,10 @@
 #define Endian_SwapBE16(n) (n)
 #endif
 
-#include "ultrahdr.h"
-#include "jpegr.h"
-#include "gainmapmath.h"
-#include "jpegrutils.h"
+#include "ultrahdr/ultrahdr.h"
+#include "ultrahdr/jpegr.h"
+#include "ultrahdr/gainmapmath.h"
+#include "ultrahdr/jpegrutils.h"
 
 namespace ultrahdr {
 
diff --git a/lib/ultrahdr.h b/lib/include/ultrahdr/ultrahdr.h
index fa69d57..fa69d57 100644
--- a/lib/ultrahdr.h
+++ b/lib/include/ultrahdr/ultrahdr.h
diff --git a/lib/ultrahdrcommon.h b/lib/include/ultrahdr/ultrahdrcommon.h
index ba3a3b8..ba3a3b8 100644
--- a/lib/ultrahdrcommon.h
+++ b/lib/include/ultrahdr/ultrahdrcommon.h
diff --git a/lib/gainmapmath.cpp b/lib/src/gainmapmath.cpp
index 23791c2..8ace1e7 100644
--- a/lib/gainmapmath.cpp
+++ b/lib/src/gainmapmath.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "gainmapmath.h"
+#include "ultrahdr/gainmapmath.h"
 
 namespace ultrahdr {
 
diff --git a/lib/icc.cpp b/lib/src/icc.cpp
index 851dd9d..b838660 100644
--- a/lib/icc.cpp
+++ b/lib/src/icc.cpp
@@ -16,8 +16,8 @@
 
 #include <cstring>
 
-#include "ultrahdrcommon.h"
-#include "icc.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/icc.h"
 
 namespace ultrahdr {
 
diff --git a/lib/jpegdecoderhelper.cpp b/lib/src/jpegdecoderhelper.cpp
index eb55a2e..8a8278d 100644
--- a/lib/jpegdecoderhelper.cpp
+++ b/lib/src/jpegdecoderhelper.cpp
@@ -19,9 +19,9 @@
 
 #include <cstring>
 
-#include "ultrahdrcommon.h"
-#include "ultrahdr.h"
-#include "jpegdecoderhelper.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/ultrahdr.h"
+#include "ultrahdr/jpegdecoderhelper.h"
 
 using namespace std;
 
diff --git a/lib/jpegencoderhelper.cpp b/lib/src/jpegencoderhelper.cpp
index c6f0b77..7bab01f 100644
--- a/lib/jpegencoderhelper.cpp
+++ b/lib/src/jpegencoderhelper.cpp
@@ -18,9 +18,9 @@
 #include <memory>
 #include <string>
 
-#include "ultrahdrcommon.h"
-#include "ultrahdr.h"
-#include "jpegencoderhelper.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/ultrahdr.h"
+#include "ultrahdr/jpegencoderhelper.h"
 
 namespace ultrahdr {
 
diff --git a/lib/jpegr.cpp b/lib/src/jpegr.cpp
index 015ffce..ed4fef1 100644
--- a/lib/jpegr.cpp
+++ b/lib/src/jpegr.cpp
@@ -27,10 +27,10 @@
 #include <mutex>
 #include <thread>
 
-#include "ultrahdrcommon.h"
-#include "jpegr.h"
-#include "icc.h"
-#include "multipictureformat.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/jpegr.h"
+#include "ultrahdr/icc.h"
+#include "ultrahdr/multipictureformat.h"
 
 #include "image_io/base/data_segment_data_source.h"
 #include "image_io/jpeg/jpeg_info.h"
diff --git a/lib/jpegrutils.cpp b/lib/src/jpegrutils.cpp
index 2fdc347..77cb26b 100644
--- a/lib/jpegrutils.cpp
+++ b/lib/src/jpegrutils.cpp
@@ -17,9 +17,9 @@
 #include <algorithm>
 #include <cmath>
 
-#include "ultrahdrcommon.h"
-#include "jpegr.h"
-#include "jpegrutils.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/jpegr.h"
+#include "ultrahdr/jpegrutils.h"
 
 #include "image_io/xml/xml_reader.h"
 #include "image_io/xml/xml_writer.h"
diff --git a/lib/multipictureformat.cpp b/lib/src/multipictureformat.cpp
index dc31fbb..59efc66 100644
--- a/lib/multipictureformat.cpp
+++ b/lib/src/multipictureformat.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "multipictureformat.h"
+#include "ultrahdr/multipictureformat.h"
 
 namespace ultrahdr {
 size_t calculateMpfSize() {
diff --git a/tests/gainmapmath_test.cpp b/tests/gainmapmath_test.cpp
index b474bd6..95fd159 100644
--- a/tests/gainmapmath_test.cpp
+++ b/tests/gainmapmath_test.cpp
@@ -17,7 +17,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "gainmapmath.h"
+#include "ultrahdr/gainmapmath.h"
 
 namespace ultrahdr {
 
diff --git a/tests/icchelper_test.cpp b/tests/icchelper_test.cpp
index 02ad27b..26f78a6 100644
--- a/tests/icchelper_test.cpp
+++ b/tests/icchelper_test.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "icc.h"
+#include "ultrahdr/icc.h"
 
 namespace ultrahdr {
 
diff --git a/tests/jpegdecoderhelper_test.cpp b/tests/jpegdecoderhelper_test.cpp
index 3b8e88e..4e72be1 100644
--- a/tests/jpegdecoderhelper_test.cpp
+++ b/tests/jpegdecoderhelper_test.cpp
@@ -19,9 +19,9 @@
 #include <fstream>
 #include <iostream>
 
-#include "ultrahdrcommon.h"
-#include "jpegdecoderhelper.h"
-#include "icc.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/jpegdecoderhelper.h"
+#include "ultrahdr/icc.h"
 
 namespace ultrahdr {
 
diff --git a/tests/jpegencoderhelper_test.cpp b/tests/jpegencoderhelper_test.cpp
index 3463c26..23ab3f3 100644
--- a/tests/jpegencoderhelper_test.cpp
+++ b/tests/jpegencoderhelper_test.cpp
@@ -19,9 +19,9 @@
 #include <fstream>
 #include <iostream>
 
-#include "ultrahdrcommon.h"
-#include "ultrahdr.h"
-#include "jpegencoderhelper.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/ultrahdr.h"
+#include "ultrahdr/jpegencoderhelper.h"
 
 namespace ultrahdr {
 
diff --git a/tests/jpegr_test.cpp b/tests/jpegr_test.cpp
index bfbfcde..39c7af0 100644
--- a/tests/jpegr_test.cpp
+++ b/tests/jpegr_test.cpp
@@ -24,9 +24,9 @@
 #include <fstream>
 #include <iostream>
 
-#include "ultrahdrcommon.h"
-#include "jpegr.h"
-#include "jpegrutils.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/jpegr.h"
+#include "ultrahdr/jpegrutils.h"
 
 //#define DUMP_OUTPUT