Merge "Implement AndroidBitmap_getDataSpace" (392b4e0f) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/apex/android_bitmap.cpp

+93 −0

Original line number	Original line	Diff line number	Diff line
	@@ -122,6 +122,99 @@ AndroidBitmapInfo ABitmap_getInfo(ABitmap* bitmapHandle) {
	return getInfo(bitmap->info(), bitmap->rowBytes());		return getInfo(bitmap->info(), bitmap->rowBytes());
	}		}

			static bool nearlyEqual(float a, float b) {
			// By trial and error, this is close enough to match for the ADataSpaces we
			// compare for.
			return ::fabs(a-b) < .002f;
			}

			static bool nearlyEqual(const skcms_TransferFunction& x, const skcms_TransferFunction& y) {
			return nearlyEqual(x.g, y.g)
			&& nearlyEqual(x.a, y.a)
			&& nearlyEqual(x.b, y.b)
			&& nearlyEqual(x.c, y.c)
			&& nearlyEqual(x.d, y.d)
			&& nearlyEqual(x.e, y.e)
			&& nearlyEqual(x.f, y.f);
			}

			static bool nearlyEqual(const skcms_Matrix3x3& x, const skcms_Matrix3x3& y) {
			for (int i = 0; i < 3; i++) {
			for (int j = 0; j < 3; j++) {
			if (!nearlyEqual(x.vals[i][j], y.vals[i][j])) return false;
			}
			}
			return true;
			}

			static constexpr skcms_TransferFunction k2Dot6 =
			{ 2.6f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f };

			// Skia's SkNamedGamut::kDCIP3 is based on a white point of D65. This gamut
			// matches the white point used by ColorSpace.Named.DCIP3.
			static constexpr skcms_Matrix3x3 kDCIP3 = {{
			{ 0.486143, 0.323835, 0.154234 },
			{ 0.226676, 0.710327, 0.0629966 },
			{ 0.000800549, 0.0432385, 0.78275 },
			}};

			ADataSpace ABitmap_getDataSpace(ABitmap* bitmapHandle) {
			Bitmap* bitmap = TypeCast::toBitmap(bitmapHandle);
			const SkImageInfo& info = bitmap->info();
			SkColorSpace* colorSpace = info.colorSpace();
			if (!colorSpace) {
			return ADATASPACE_UNKNOWN;
			}

			if (colorSpace->isSRGB()) {
			if (info.colorType() == kRGBA_F16_SkColorType) {
			return ADATASPACE_SCRGB;
			}
			return ADATASPACE_SRGB;
			}

			skcms_TransferFunction fn;
			LOG_ALWAYS_FATAL_IF(!colorSpace->isNumericalTransferFn(&fn));

			skcms_Matrix3x3 gamut;
			LOG_ALWAYS_FATAL_IF(!colorSpace->toXYZD50(&gamut));

			if (nearlyEqual(gamut, SkNamedGamut::kSRGB)) {
			if (nearlyEqual(fn, SkNamedTransferFn::kLinear)) {
			// Skia doesn't differentiate amongst the RANGES. In Java, we associate
			// LINEAR_EXTENDED_SRGB with F16, and LINEAR_SRGB with other Configs.
			// Make the same association here.
			if (info.colorType() == kRGBA_F16_SkColorType) {
			return ADATASPACE_SCRGB_LINEAR;
			}
			return ADATASPACE_SRGB_LINEAR;
			}

			if (nearlyEqual(fn, SkNamedTransferFn::kRec2020)) {
			return ADATASPACE_BT709;
			}
			}

			if (nearlyEqual(fn, SkNamedTransferFn::kSRGB) && nearlyEqual(gamut, SkNamedGamut::kDCIP3)) {
			return ADATASPACE_DISPLAY_P3;
			}

			if (nearlyEqual(fn, SkNamedTransferFn::k2Dot2) && nearlyEqual(gamut, SkNamedGamut::kAdobeRGB)) {
			return ADATASPACE_ADOBE_RGB;
			}

			if (nearlyEqual(fn, SkNamedTransferFn::kRec2020)
			&& nearlyEqual(gamut, SkNamedGamut::kRec2020)) {
			return ADATASPACE_BT2020;
			}

			if (nearlyEqual(fn, k2Dot6) && nearlyEqual(gamut, kDCIP3)) {
			return ADATASPACE_DCI_P3;
			}

			return ADATASPACE_UNKNOWN;
			}

	AndroidBitmapInfo ABitmap_getInfoFromJava(JNIEnv* env, jobject bitmapObj) {		AndroidBitmapInfo ABitmap_getInfoFromJava(JNIEnv* env, jobject bitmapObj) {
	uint32_t rowBytes = 0;		uint32_t rowBytes = 0;
	SkImageInfo imageInfo = GraphicsJNI::getBitmapInfo(env, bitmapObj, &rowBytes);		SkImageInfo imageInfo = GraphicsJNI::getBitmapInfo(env, bitmapObj, &rowBytes);

core/jni/android/graphics/apex/include/android/graphics/bitmap.h

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	#define ANDROID_GRAPHICS_BITMAP_H		#define ANDROID_GRAPHICS_BITMAP_H

	#include <android/bitmap.h>		#include <android/bitmap.h>
			#include <android/data_space.h>
	#include <jni.h>		#include <jni.h>
	#include <sys/cdefs.h>		#include <sys/cdefs.h>

	@@ -49,6 +50,7 @@ void ABitmap_acquireRef(ABitmap* bitmap);
	void ABitmap_releaseRef(ABitmap* bitmap);		void ABitmap_releaseRef(ABitmap* bitmap);

	AndroidBitmapInfo ABitmap_getInfo(ABitmap* bitmap);		AndroidBitmapInfo ABitmap_getInfo(ABitmap* bitmap);
			ADataSpace ABitmap_getDataSpace(ABitmap* bitmap);

	void* ABitmap_getPixels(ABitmap* bitmap);		void* ABitmap_getPixels(ABitmap* bitmap);
	void ABitmap_notifyPixelsChanged(ABitmap* bitmap);		void ABitmap_notifyPixelsChanged(ABitmap* bitmap);
	@@ -106,6 +108,7 @@ namespace graphics {
	ABitmap* get() const { return mBitmap; }		ABitmap* get() const { return mBitmap; }

	AndroidBitmapInfo getInfo() const { return ABitmap_getInfo(mBitmap); }		AndroidBitmapInfo getInfo() const { return ABitmap_getInfo(mBitmap); }
			ADataSpace getDataSpace() const { return ABitmap_getDataSpace(mBitmap); }
	void* getPixels() const { return ABitmap_getPixels(mBitmap); }		void* getPixels() const { return ABitmap_getPixels(mBitmap); }
	void notifyPixelsChanged() const { ABitmap_notifyPixelsChanged(mBitmap); }		void notifyPixelsChanged() const { ABitmap_notifyPixelsChanged(mBitmap); }

native/graphics/jni/bitmap.cpp

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	#include <android/bitmap.h>		#include <android/bitmap.h>
	#include <android/graphics/bitmap.h>		#include <android/graphics/bitmap.h>
			#include <android/data_space.h>

	int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap,		int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap,
	AndroidBitmapInfo* info) {		AndroidBitmapInfo* info) {
	@@ -29,6 +30,15 @@ int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap,
	return ANDROID_BITMAP_RESULT_SUCCESS;		return ANDROID_BITMAP_RESULT_SUCCESS;
	}		}

			int32_t AndroidBitmap_getDataSpace(JNIEnv* env, jobject jbitmap) {
			if (NULL == env \|\| NULL == jbitmap) {
			return ADATASPACE_UNKNOWN; // Or return a real error?
			}

			android::graphics::Bitmap bitmap(env, jbitmap);
			return bitmap.getDataSpace();
			}

	int AndroidBitmap_lockPixels(JNIEnv* env, jobject jbitmap, void** addrPtr) {		int AndroidBitmap_lockPixels(JNIEnv* env, jobject jbitmap, void** addrPtr) {
	if (NULL == env \|\| NULL == jbitmap) {		if (NULL == env \|\| NULL == jbitmap) {
	return ANDROID_BITMAP_RESULT_BAD_PARAMETER;		return ANDROID_BITMAP_RESULT_BAD_PARAMETER;

native/graphics/jni/libjnigraphics.map.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	LIBJNIGRAPHICS {		LIBJNIGRAPHICS {
	global:		global:
	AndroidBitmap_getInfo;		AndroidBitmap_getInfo;
			AndroidBitmap_getDataSpace;
	AndroidBitmap_lockPixels;		AndroidBitmap_lockPixels;
	AndroidBitmap_unlockPixels;		AndroidBitmap_unlockPixels;
	local:		local: