Merge "JPEG/R refactor: rename jpegrecoverymap library to ultrahdr" into udc-dev (237a1061) · Commits · e / os / android_frameworks_base

core/jni/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -334,7 +334,7 @@ cc_library_shared {
		"libtimeinstate",
		"server_configurable_flags",
		"libimage_io",
		"libjpegrecoverymap",
		"libultrahdr",
		],
		export_shared_lib_headers: [
		// our headers include libnativewindow's public headers
		@@ -393,7 +393,7 @@ cc_library_shared {
		"libimage_io",
		"libjpegdecoder",
		"libjpegencoder",
		"libjpegrecoverymap",
		"libultrahdr",
		],
		},
		host_linux: {

libs/hwui/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -399,7 +399,7 @@ cc_defaults {
		"libharfbuzz_ng",
		"libimage_io",
		"libjpeg",
		"libjpegrecoverymap",
		"libultrahdr",
		"liblog",
		"libminikin",
		"libz",

libs/hwui/jni/YuvToJpegEncoder.cpp

+16 −16

Original line number	Diff line number	Diff line
		@@ -298,39 +298,39 @@ void Yuv422IToJpegEncoder::configSamplingFactors(jpeg_compress_struct* cinfo) {
		}
		///////////////////////////////////////////////////////////////////////////////

		using namespace android::jpegrecoverymap;
		using namespace android::ultrahdr;

		jpegr_color_gamut P010Yuv420ToJpegREncoder::findColorGamut(JNIEnv* env, int aDataSpace) {
		ultrahdr_color_gamut P010Yuv420ToJpegREncoder::findColorGamut(JNIEnv* env, int aDataSpace) {
		switch (aDataSpace & ADataSpace::STANDARD_MASK) {
		case ADataSpace::STANDARD_BT709:
		return jpegr_color_gamut::JPEGR_COLORGAMUT_BT709;
		return ultrahdr_color_gamut::ULTRAHDR_COLORGAMUT_BT709;
		case ADataSpace::STANDARD_DCI_P3:
		return jpegr_color_gamut::JPEGR_COLORGAMUT_P3;
		return ultrahdr_color_gamut::ULTRAHDR_COLORGAMUT_P3;
		case ADataSpace::STANDARD_BT2020:
		return jpegr_color_gamut::JPEGR_COLORGAMUT_BT2100;
		return ultrahdr_color_gamut::ULTRAHDR_COLORGAMUT_BT2100;
		default:
		jclass IllegalArgumentException = env->FindClass("java/lang/IllegalArgumentException");
		env->ThrowNew(IllegalArgumentException,
		"The requested color gamut is not supported by JPEG/R.");
		}

		return jpegr_color_gamut::JPEGR_COLORGAMUT_UNSPECIFIED;
		return ultrahdr_color_gamut::ULTRAHDR_COLORGAMUT_UNSPECIFIED;
		}

		jpegr_transfer_function P010Yuv420ToJpegREncoder::findHdrTransferFunction(JNIEnv* env,
		ultrahdr_transfer_function P010Yuv420ToJpegREncoder::findHdrTransferFunction(JNIEnv* env,
		int aDataSpace) {
		switch (aDataSpace & ADataSpace::TRANSFER_MASK) {
		case ADataSpace::TRANSFER_ST2084:
		return jpegr_transfer_function::JPEGR_TF_PQ;
		return ultrahdr_transfer_function::ULTRAHDR_TF_PQ;
		case ADataSpace::TRANSFER_HLG:
		return jpegr_transfer_function::JPEGR_TF_HLG;
		return ultrahdr_transfer_function::ULTRAHDR_TF_HLG;
		default:
		jclass IllegalArgumentException = env->FindClass("java/lang/IllegalArgumentException");
		env->ThrowNew(IllegalArgumentException,
		"The requested HDR transfer function is not supported by JPEG/R.");
		}

		return jpegr_transfer_function::JPEGR_TF_UNSPECIFIED;
		return ultrahdr_transfer_function::ULTRAHDR_TF_UNSPECIFIED;
		}

		bool P010Yuv420ToJpegREncoder::encode(JNIEnv* env,
		@@ -344,13 +344,13 @@ bool P010Yuv420ToJpegREncoder::encode(JNIEnv* env,
		return false;
		}

		jpegr_color_gamut hdrColorGamut = findColorGamut(env, hdrColorSpace);
		jpegr_color_gamut sdrColorGamut = findColorGamut(env, sdrColorSpace);
		jpegr_transfer_function hdrTransferFunction = findHdrTransferFunction(env, hdrColorSpace);
		ultrahdr_color_gamut hdrColorGamut = findColorGamut(env, hdrColorSpace);
		ultrahdr_color_gamut sdrColorGamut = findColorGamut(env, sdrColorSpace);
		ultrahdr_transfer_function hdrTransferFunction = findHdrTransferFunction(env, hdrColorSpace);

		if (hdrColorGamut == jpegr_color_gamut::JPEGR_COLORGAMUT_UNSPECIFIED
		\|\| sdrColorGamut == jpegr_color_gamut::JPEGR_COLORGAMUT_UNSPECIFIED
		\|\| hdrTransferFunction == jpegr_transfer_function::JPEGR_TF_UNSPECIFIED) {
		if (hdrColorGamut == ultrahdr_color_gamut::ULTRAHDR_COLORGAMUT_UNSPECIFIED
		\|\| sdrColorGamut == ultrahdr_color_gamut::ULTRAHDR_COLORGAMUT_UNSPECIFIED
		\|\| hdrTransferFunction == ultrahdr_transfer_function::ULTRAHDR_TF_UNSPECIFIED) {
		return false;
		}

libs/hwui/jni/YuvToJpegEncoder.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		#define _ANDROID_GRAPHICS_YUV_TO_JPEG_ENCODER_H_

		#include <android/data_space.h>
		#include <jpegrecoverymap/jpegr.h>
		#include <ultrahdr/jpegr.h>

		extern "C" {
		#include "jpeglib.h"
		@@ -103,7 +103,7 @@ public:
		* @param aDataSpace data space defined in data_space.h.
		* @return color gamut for JPEG/R.
		*/
		static android::jpegrecoverymap::jpegr_color_gamut findColorGamut(JNIEnv* env, int aDataSpace);
		static android::ultrahdr::ultrahdr_color_gamut findColorGamut(JNIEnv* env, int aDataSpace);

		/** Map data space (defined in DataSpace.java and data_space.h) to the transfer function
		* used in JPEG/R
		@@ -112,7 +112,7 @@ public:
		* @param aDataSpace data space defined in data_space.h.
		* @return color gamut for JPEG/R.
		*/
		static android::jpegrecoverymap::jpegr_transfer_function findHdrTransferFunction(
		static android::ultrahdr::ultrahdr_transfer_function findHdrTransferFunction(
		JNIEnv* env, int aDataSpace);
		};