Merge "stagefright: define DCI and Display P3 primaries" into udc-dev (3606074f) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/utils/Codec2Mapper.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -119,8 +119,8 @@ ALookup<C2Color::primaries_t, ColorAspects::Primaries> sColorPrimariesSf = {
		{ C2Color::PRIMARIES_BT601_525, ColorAspects::PrimariesBT601_6_525 },
		{ C2Color::PRIMARIES_GENERIC_FILM, ColorAspects::PrimariesGenericFilm },
		{ C2Color::PRIMARIES_BT2020, ColorAspects::PrimariesBT2020 },
		// { C2Color::PRIMARIES_RP431, ColorAspects::Primaries... },
		// { C2Color::PRIMARIES_EG432, ColorAspects::Primaries... },
		{ C2Color::PRIMARIES_RP431, ColorAspects::PrimariesRP431 },
		{ C2Color::PRIMARIES_EG432, ColorAspects::PrimariesEG432 },
		// { C2Color::PRIMARIES_EBU3213, ColorAspects::Primaries... },
		{ C2Color::PRIMARIES_OTHER, ColorAspects::PrimariesOther },
		};

media/module/foundation/ColorUtils.cpp

+11 −1

Original line number	Diff line number	Diff line
		@@ -60,6 +60,10 @@ ALookup<CU::ColorStandard, std::pair<CA::Primaries, CA::MatrixCoeffs>> sStandard
		{ CU::kColorStandardBT470M, { CA::PrimariesBT470_6M, CA::MatrixBT470_6M } },
		// NOTE: there is no close match to the matrix used by standard film, chose closest
		{ CU::kColorStandardFilm, { CA::PrimariesGenericFilm, CA::MatrixBT2020 } },
		// DCI-P3 (in DataSpace that drives this standard) is actually Display P3
		// ITU does not specify a matrix suitable for P3. The theoretical KR/KB numbers are
		// 0.229 and 0.079. Assume BT.601 matrix as P3 is commonly used for JPEG with BT.601.
		{ CU::kColorStandardDisplay_P3, { CA::PrimariesEG432, CA::MatrixBT601_6 } },
		}
		};

		@@ -264,6 +268,8 @@ ALookup<int32_t, ColorAspects::Primaries> sIsoPrimaries {
		{ 8, ColorAspects::PrimariesGenericFilm },
		{ 9, ColorAspects::PrimariesBT2020 },
		{ 10, ColorAspects::PrimariesOther /* XYZ */ },
		{ 11, ColorAspects::PrimariesRP431 },
		{ 12, ColorAspects::PrimariesEG432 },
		}
		};

		@@ -438,6 +444,9 @@ ALookup<CU::ColorStandard, CA::Primaries> sStandardPrimariesFallbacks {
		{ CU::kColorStandardBT2020, CA::PrimariesBT2020 },
		{ CU::kColorStandardBT601_525_Unadjusted, CA::PrimariesBT601_6_525 },
		{ CU::kColorStandardBT601_625_Unadjusted, CA::PrimariesBT601_6_625 },
		{ CU::kColorStandardDisplay_P3, CA::PrimariesEG432 },
		// fall back DCI P3 primaries to Display P3
		{ CU::kColorStandardDisplay_P3, CA::PrimariesRP431 },
		}
		};

		@@ -469,7 +478,8 @@ ALookup<CU::ColorStandard, uint32_t> sGfxStandards {
		{ CU::kColorStandardBT2020Constant, GET_HAL_BITFIELD(STANDARD, BT2020_CONSTANT_LUMINANCE) },
		{ CU::kColorStandardBT470M, GET_HAL_BITFIELD(STANDARD, BT470M) },
		{ CU::kColorStandardFilm, GET_HAL_BITFIELD(STANDARD, FILM) },
		{ CU::kColorStandardDCI_P3, GET_HAL_BITFIELD(STANDARD, DCI_P3) },
		// DCI-P3 (in DataSpace that drives this standard) is actually Display P3
		{ CU::kColorStandardDisplay_P3, GET_HAL_BITFIELD(STANDARD, DCI_P3) },
		}
		};

media/module/foundation/include/media/stagefright/foundation/ColorUtils.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -57,7 +57,8 @@ struct ColorUtils {
		kColorStandardBT2020Constant = 7, // not in SDK
		kColorStandardBT470M = 8, // not in SDK
		kColorStandardFilm = 9, // not in SDK
		kColorStandardDCI_P3 = 10, // not in SDK, new in Android 8.0
		kColorStandardDisplay_P3 = 10, // not in SDK, new in Android 8.0
		kColorStandardDCI_P3 = kColorStandardDisplay_P3, // legacy (incorrect) name for Display P3

		/* This marks a section of color-standard values that are not supported by graphics HAL,
		but track defined color primaries-matrix coefficient combinations in media.
		@@ -211,7 +212,7 @@ inline static const char *asString(android::ColorUtils::ColorStandard i, const c
		case ColorUtils::kColorStandardBT2020Constant: return "BT2020Constant";
		case ColorUtils::kColorStandardBT470M: return "BT470M";
		case ColorUtils::kColorStandardFilm: return "Film";
		case ColorUtils::kColorStandardDCI_P3: return "DCI_P3";
		case ColorUtils::kColorStandardDisplay_P3: return "Display_P3";
		default: return def;
		}
		}