Merge "Move PublicFormat definition to libui" (7b1a7b37) · Commits · e / os / android_frameworks_base

core/jni/android_view_Surface.cpp

+3 −123

Original line number	Diff line number	Diff line
		@@ -58,8 +58,6 @@

		namespace android {

		using ui::Dataspace;

		static const char* const OutOfResourcesException =
		"android/view/Surface$OutOfResourcesException";

		@@ -129,135 +127,17 @@ jobject android_view_Surface_createFromIGraphicBufferProducer(JNIEnv* env,
		}

		int android_view_Surface_mapPublicFormatToHalFormat(PublicFormat f) {

		switch(f) {
		case PublicFormat::JPEG:
		case PublicFormat::DEPTH_POINT_CLOUD:
		case PublicFormat::DEPTH_JPEG:
		case PublicFormat::HEIC:
		return HAL_PIXEL_FORMAT_BLOB;
		case PublicFormat::DEPTH16:
		return HAL_PIXEL_FORMAT_Y16;
		case PublicFormat::RAW_SENSOR:
		case PublicFormat::RAW_DEPTH:
		return HAL_PIXEL_FORMAT_RAW16;
		default:
		// Most formats map 1:1
		return static_cast<int>(f);
		}
		return mapPublicFormatToHalFormat(f);
		}

		android_dataspace android_view_Surface_mapPublicFormatToHalDataspace(
		PublicFormat f) {
		Dataspace dataspace;
		switch(f) {
		case PublicFormat::JPEG:
		dataspace = Dataspace::V0_JFIF;
		break;
		case PublicFormat::DEPTH_POINT_CLOUD:
		case PublicFormat::DEPTH16:
		case PublicFormat::RAW_DEPTH:
		dataspace = Dataspace::DEPTH;
		break;
		case PublicFormat::RAW_SENSOR:
		case PublicFormat::RAW_PRIVATE:
		case PublicFormat::RAW10:
		case PublicFormat::RAW12:
		dataspace = Dataspace::ARBITRARY;
		break;
		case PublicFormat::YUV_420_888:
		case PublicFormat::NV21:
		case PublicFormat::YV12:
		dataspace = Dataspace::V0_JFIF;
		break;
		case PublicFormat::DEPTH_JPEG:
		dataspace = Dataspace::DYNAMIC_DEPTH;
		break;
		case PublicFormat::HEIC:
		dataspace = Dataspace::HEIF;
		break;
		default:
		// Most formats map to UNKNOWN
		dataspace = Dataspace::UNKNOWN;
		break;
		}
		return static_cast<android_dataspace>(dataspace);
		return mapPublicFormatToHalDataspace(f);
		}

		PublicFormat android_view_Surface_mapHalFormatDataspaceToPublicFormat(
		int format, android_dataspace dataSpace) {
		Dataspace ds = static_cast<Dataspace>(dataSpace);
		switch(format) {
		case HAL_PIXEL_FORMAT_RGBA_8888:
		case HAL_PIXEL_FORMAT_RGBX_8888:
		case HAL_PIXEL_FORMAT_RGBA_FP16:
		case HAL_PIXEL_FORMAT_RGBA_1010102:
		case HAL_PIXEL_FORMAT_RGB_888:
		case HAL_PIXEL_FORMAT_RGB_565:
		case HAL_PIXEL_FORMAT_Y8:
		case HAL_PIXEL_FORMAT_RAW10:
		case HAL_PIXEL_FORMAT_RAW12:
		case HAL_PIXEL_FORMAT_YCbCr_420_888:
		case HAL_PIXEL_FORMAT_YV12:
		// Enums overlap in both name and value
		return static_cast<PublicFormat>(format);
		case HAL_PIXEL_FORMAT_RAW16:
		switch (ds) {
		case Dataspace::DEPTH:
		return PublicFormat::RAW_DEPTH;
		default:
		return PublicFormat::RAW_SENSOR;
		}
		case HAL_PIXEL_FORMAT_RAW_OPAQUE:
		// Name differs, though value is the same
		return PublicFormat::RAW_PRIVATE;
		case HAL_PIXEL_FORMAT_YCbCr_422_SP:
		// Name differs, though the value is the same
		return PublicFormat::NV16;
		case HAL_PIXEL_FORMAT_YCrCb_420_SP:
		// Name differs, though the value is the same
		return PublicFormat::NV21;
		case HAL_PIXEL_FORMAT_YCbCr_422_I:
		// Name differs, though the value is the same
		return PublicFormat::YUY2;
		case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:
		// Name differs, though the value is the same
		return PublicFormat::PRIVATE;
		case HAL_PIXEL_FORMAT_Y16:
		// Dataspace-dependent
		switch (ds) {
		case Dataspace::DEPTH:
		return PublicFormat::DEPTH16;
		default:
		// Assume non-depth Y16 is just Y16.
		return PublicFormat::Y16;
		}
		break;
		case HAL_PIXEL_FORMAT_BLOB:
		// Dataspace-dependent
		switch (ds) {
		case Dataspace::DEPTH:
		return PublicFormat::DEPTH_POINT_CLOUD;
		case Dataspace::V0_JFIF:
		return PublicFormat::JPEG;
		case Dataspace::HEIF:
		return PublicFormat::HEIC;
		default:
		if (dataSpace == static_cast<android_dataspace>(HAL_DATASPACE_DYNAMIC_DEPTH)) {
		return PublicFormat::DEPTH_JPEG;
		} else {
		// Assume otherwise-marked blobs are also JPEG
		return PublicFormat::JPEG;
		}
		}
		break;
		case HAL_PIXEL_FORMAT_BGRA_8888:
		// Not defined in public API
		return PublicFormat::UNKNOWN;

		default:
		return PublicFormat::UNKNOWN;
		}
		return mapHalFormatDataspaceToPublicFormat(format, dataSpace);
		}
		// ----------------------------------------------------------------------------

core/jni/include/android_runtime/android_view_Surface.h

+1 −35

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

		#include <android/native_window.h>
		#include <system/graphics.h>
		#include <ui/PublicFormat.h>

		#include "jni.h"

		@@ -27,41 +28,6 @@ namespace android {
		class Surface;
		class IGraphicBufferProducer;

		/**
		* Enum mirroring the public API definitions for image and pixel formats.
		* Some of these are hidden in the public API
		*
		* Keep up to date with android.graphics.ImageFormat and
		* android.graphics.PixelFormat
		*/
		enum class PublicFormat {
		UNKNOWN = 0x0,
		RGBA_8888 = 0x1,
		RGBX_8888 = 0x2,
		RGB_888 = 0x3,
		RGB_565 = 0x4,
		NV16 = 0x10,
		NV21 = 0x11,
		YUY2 = 0x14,
		RGBA_FP16 = 0x16,
		RAW_SENSOR = 0x20,
		PRIVATE = 0x22,
		YUV_420_888 = 0x23,
		RAW_PRIVATE = 0x24,
		RAW10 = 0x25,
		RAW12 = 0x26,
		RGBA_1010102 = 0x2b,
		JPEG = 0x100,
		DEPTH_POINT_CLOUD = 0x101,
		RAW_DEPTH = 0x1002, // @hide
		YV12 = 0x32315659,
		Y8 = 0x20203859,
		Y16 = 0x20363159, // @hide
		DEPTH16 = 0x44363159,
		DEPTH_JPEG = 0x69656963,
		HEIC = 0x48454946,
		};

		/* Gets the underlying ANativeWindow for a Surface. */
		extern sp<ANativeWindow> android_view_Surface_getNativeWindow(
		JNIEnv* env, jobject surfaceObj);