Merge "[LUT NDK] Add CIE_Y sampling key to ADisplayLuts_SamplingKey enum." into main (51166f25) · Commits · e / os / android_frameworks_native

include/android/display_luts.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ typedef enum ADisplayLuts_Dimension ADisplayLuts_Dimension;
		enum ADisplayLuts_SamplingKey : int32_t {
		ADISPLAYLUTS_SAMPLINGKEY_RGB = 0,
		ADISPLAYLUTS_SAMPLINGKEY_MAX_RGB = 1,
		ADISPLAYLUTS_SAMPLINGKEY_CIE_Y = 2,
		};
		typedef enum ADisplayLuts_SamplingKey ADisplayLuts_SamplingKey;

		@@ -74,7 +75,8 @@ typedef struct ADisplayLuts ADisplayLuts;
		* @return a new \a ADisplayLutsEntry instance.
		*/
		ADisplayLutsEntry* _Nonnull ADisplayLutsEntry_createEntry(float* _Nonnull buffer,
		int32_t length, int32_t dimension, int32_t key) __INTRODUCED_IN(36);
		int32_t length, ADisplayLuts_Dimension dimension, ADisplayLuts_SamplingKey key)
		__INTRODUCED_IN(36);

		/**
		* Destroy the \a ADisplayLutsEntry instance.

+3 −2

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

		#pragma once

		#include <android/display_luts.h>
		#include <stdint.h>
		#include <vector>
		#include <utils/RefBase.h>
		@@ -29,9 +30,9 @@ struct ADisplayLutsEntry_buffer {
		};

		struct ADisplayLutsEntry_properties {
		int32_t dimension;
		ADisplayLuts_Dimension dimension;
		int32_t size;
		int32_t samplingKey;
		ADisplayLuts_SamplingKey samplingKey;
		};

		struct ADisplayLutsEntry: public RefBase {