Merge "JpegR refactor: rename recoverymap to jpegr" (5e5454fb) · Commits · e / os / platform_frameworks_native

libs/jpegrecoverymap/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -29,9 +29,9 @@ cc_library {
		local_include_dirs: ["include"],

		srcs: [
		"recoverymap.cpp",
		"jpegr.cpp",
		"recoverymapmath.cpp",
		"recoverymaputils.cpp",
		"jpegrutils.cpp",
		],

		shared_libs: [

libs/jpegrecoverymap/include/jpegrecoverymap/recoverymap.h→libs/jpegrecoverymap/include/jpegrecoverymap/jpegr.h

+5 −8

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@
		* limitations under the License.
		*/

		#ifndef ANDROID_JPEGRECOVERYMAP_RECOVERYMAP_H
		#define ANDROID_JPEGRECOVERYMAP_RECOVERYMAP_H
		#ifndef ANDROID_JPEGRECOVERYMAP_JPEGR_H
		#define ANDROID_JPEGRECOVERYMAP_JPEGR_H

		#include "jpegrerrorcode.h"

		@@ -98,7 +98,7 @@ typedef struct jpegr_exif_struct* jr_exif_ptr;
		typedef struct jpegr_metadata* jr_metadata_ptr;
		typedef struct jpegr_info_struct* jr_info_ptr;

		class RecoveryMap {
		class JpegR {
		public:
		/*
		* Encode API-0
		@@ -221,10 +221,7 @@ public:
		*/
		status_t getJPEGRInfo(jr_compressed_ptr compressed_jpegr_image,
		jr_info_ptr jpegr_info);

		protected:
		// Following functions protected instead of private for testing.

		/*
		* This method is called in the encoding pipeline. It will take the uncompressed 8-bit and
		* 10-bit yuv images as input, and calculate the uncompressed recovery map. The input images
		@@ -234,7 +231,7 @@ protected:
		* @param uncompressed_p010_image uncompressed HDR image in P010 color format
		* @param hdr_tf transfer function of the HDR image
		* @param dest recovery map; caller responsible for memory of data
		* @param metadata minContentBoost and maxContentBoost are filled in
		* @param metadata max_content_boost is filled in
		* @return NO_ERROR if calculation succeeds, error code if error occurs.
		*/
		status_t generateRecoveryMap(jr_uncompressed_ptr uncompressed_yuv_420_image,
		@@ -328,4 +325,4 @@ private:

		} // namespace android::recoverymap

		#endif // ANDROID_JPEGRECOVERYMAP_RECOVERYMAP_H
		#endif // ANDROID_JPEGRECOVERYMAP_JPEGR_H

libs/jpegrecoverymap/include/jpegrecoverymap/recoverymaputils.h→libs/jpegrecoverymap/include/jpegrecoverymap/jpegrutils.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -14,10 +14,10 @@
		* limitations under the License.
		*/

		#ifndef ANDROID_JPEGRECOVERYMAP_RECOVERYMAPUTILS_H
		#define ANDROID_JPEGRECOVERYMAP_RECOVERYMAPUTILS_H
		#ifndef ANDROID_JPEGRECOVERYMAP_JPEGRUTILS_H
		#define ANDROID_JPEGRECOVERYMAP_JPEGRUTILS_H

		#include <jpegrecoverymap/recoverymap.h>
		#include <jpegrecoverymap/jpegr.h>

		#include <sstream>
		#include <stdint.h>
		@@ -94,4 +94,4 @@ bool getMetadataFromXMP(uint8_t* xmp_data, size_t xmp_size, jpegr_metadata* meta
		std::string generateXmp(int secondary_image_length, jpegr_metadata& metadata);
		}

		#endif //ANDROID_JPEGRECOVERYMAP_RECOVERYMAPUTILS_H
		#endif //ANDROID_JPEGRECOVERYMAP_JPEGRUTILS_H

libs/jpegrecoverymap/include/jpegrecoverymap/recoverymapmath.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		#include <cmath>
		#include <stdint.h>

		#include <jpegrecoverymap/recoverymap.h>
		#include <jpegrecoverymap/jpegr.h>

		namespace android::recoverymap {

libs/jpegrecoverymap/recoverymap.cpp→libs/jpegrecoverymap/jpegr.cpp

+15 −15

Original line number	Diff line number	Diff line
		@@ -14,11 +14,11 @@
		* limitations under the License.
		*/

		#include <jpegrecoverymap/recoverymap.h>
		#include <jpegrecoverymap/jpegr.h>
		#include <jpegrecoverymap/jpegencoderhelper.h>
		#include <jpegrecoverymap/jpegdecoderhelper.h>
		#include <jpegrecoverymap/recoverymapmath.h>
		#include <jpegrecoverymap/recoverymaputils.h>
		#include <jpegrecoverymap/jpegrutils.h>

		#include <image_io/jpeg/jpeg_marker.h>
		#include <image_io/jpeg/jpeg_info.h>
		@@ -101,7 +101,7 @@ static const map<
		};

		/* Encode API-0 */
		status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
		status_t JpegR::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
		jpegr_transfer_function hdr_tf,
		jr_compressed_ptr dest,
		int quality,
		@@ -163,7 +163,7 @@ status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
		}

		/* Encode API-1 */
		status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
		status_t JpegR::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
		jr_uncompressed_ptr uncompressed_yuv_420_image,
		jpegr_transfer_function hdr_tf,
		jr_compressed_ptr dest,
		@@ -227,7 +227,7 @@ status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
		}

		/* Encode API-2 */
		status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
		status_t JpegR::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
		jr_uncompressed_ptr uncompressed_yuv_420_image,
		jr_compressed_ptr compressed_jpeg_image,
		jpegr_transfer_function hdr_tf,
		@@ -272,7 +272,7 @@ status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
		}

		/* Encode API-3 */
		status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
		status_t JpegR::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
		jr_compressed_ptr compressed_jpeg_image,
		jpegr_transfer_function hdr_tf,
		jr_compressed_ptr dest) {
		@@ -324,7 +324,7 @@ status_t RecoveryMap::encodeJPEGR(jr_uncompressed_ptr uncompressed_p010_image,
		return NO_ERROR;
		}

		status_t RecoveryMap::getJPEGRInfo(jr_compressed_ptr compressed_jpegr_image,
		status_t JpegR::getJPEGRInfo(jr_compressed_ptr compressed_jpegr_image,
		jr_info_ptr jpegr_info) {
		if (compressed_jpegr_image == nullptr \|\| jpegr_info == nullptr) {
		return ERROR_JPEGR_INVALID_NULL_PTR;
		@@ -345,7 +345,7 @@ status_t RecoveryMap::getJPEGRInfo(jr_compressed_ptr compressed_jpegr_image,
		}

		/* Decode API */
		status_t RecoveryMap::decodeJPEGR(jr_compressed_ptr compressed_jpegr_image,
		status_t JpegR::decodeJPEGR(jr_compressed_ptr compressed_jpegr_image,
		jr_uncompressed_ptr dest,
		jr_exif_ptr exif,
		bool request_sdr) {
		@@ -405,7 +405,7 @@ status_t RecoveryMap::decodeJPEGR(jr_compressed_ptr compressed_jpegr_image,
		return NO_ERROR;
		}

		status_t RecoveryMap::compressRecoveryMap(jr_uncompressed_ptr uncompressed_recovery_map,
		status_t JpegR::compressRecoveryMap(jr_uncompressed_ptr uncompressed_recovery_map,
		jr_compressed_ptr dest) {
		if (uncompressed_recovery_map == nullptr \|\| dest == nullptr) {
		return ERROR_JPEGR_INVALID_NULL_PTR;
		@@ -489,7 +489,7 @@ void JobQueue::reset() {
		mQueuedAllJobs = false;
		}

		status_t RecoveryMap::generateRecoveryMap(jr_uncompressed_ptr uncompressed_yuv_420_image,
		status_t JpegR::generateRecoveryMap(jr_uncompressed_ptr uncompressed_yuv_420_image,
		jr_uncompressed_ptr uncompressed_p010_image,
		jpegr_transfer_function hdr_tf,
		jr_metadata_ptr metadata,
		@@ -689,7 +689,7 @@ status_t RecoveryMap::generateRecoveryMap(jr_uncompressed_ptr uncompressed_yuv_4
		return NO_ERROR;
		}

		status_t RecoveryMap::applyRecoveryMap(jr_uncompressed_ptr uncompressed_yuv_420_image,
		status_t JpegR::applyRecoveryMap(jr_uncompressed_ptr uncompressed_yuv_420_image,
		jr_uncompressed_ptr uncompressed_recovery_map,
		jr_metadata_ptr metadata,
		jr_uncompressed_ptr dest) {
		@@ -773,7 +773,7 @@ status_t RecoveryMap::applyRecoveryMap(jr_uncompressed_ptr uncompressed_yuv_420_
		return NO_ERROR;
		}

		status_t RecoveryMap::extractPrimaryImageAndRecoveryMap(jr_compressed_ptr compressed_jpegr_image,
		status_t JpegR::extractPrimaryImageAndRecoveryMap(jr_compressed_ptr compressed_jpegr_image,
		jr_compressed_ptr primary_image,
		jr_compressed_ptr recovery_map) {
		if (compressed_jpegr_image == nullptr) {
		@@ -823,7 +823,7 @@ status_t RecoveryMap::extractPrimaryImageAndRecoveryMap(jr_compressed_ptr compre
		}


		status_t RecoveryMap::extractRecoveryMap(jr_compressed_ptr compressed_jpegr_image,
		status_t JpegR::extractRecoveryMap(jr_compressed_ptr compressed_jpegr_image,
		jr_compressed_ptr dest) {
		if (compressed_jpegr_image == nullptr \|\| dest == nullptr) {
		return ERROR_JPEGR_INVALID_NULL_PTR;
		@@ -854,7 +854,7 @@ status_t RecoveryMap::extractRecoveryMap(jr_compressed_ptr compressed_jpegr_imag
		// Exif 2.2 spec for EXIF marker
		// Adobe XMP spec part 3 for XMP marker
		// ICC v4.3 spec for ICC
		status_t RecoveryMap::appendRecoveryMap(jr_compressed_ptr compressed_jpeg_image,
		status_t JpegR::appendRecoveryMap(jr_compressed_ptr compressed_jpeg_image,
		jr_compressed_ptr compressed_recovery_map,
		jr_exif_ptr exif,
		jr_metadata_ptr metadata,
		@@ -917,7 +917,7 @@ status_t RecoveryMap::appendRecoveryMap(jr_compressed_ptr compressed_jpeg_image,
		return NO_ERROR;
		}

		status_t RecoveryMap::toneMap(jr_uncompressed_ptr src,
		status_t JpegR::toneMap(jr_uncompressed_ptr src,
		jr_uncompressed_ptr dest) {
		if (src == nullptr \|\| dest == nullptr) {
		return ERROR_JPEGR_INVALID_NULL_PTR;