Snap for 10017950 from d8b8e3e9a8744bd276eee70db8984441d4a6530e to udc-release (b700fdcf) · 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/libaudiohal/impl/effectsAidlConversion/AidlConversionVisualizer.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ status_t AidlConversionVisualizer::setParameter(EffectParamReader& param) {
		Parameter aidlParam;
		switch (type) {
		case VISUALIZER_PARAM_CAPTURE_SIZE: {
		mCaptureSize = value;
		aidlParam = MAKE_SPECIFIC_PARAMETER(Visualizer, visualizer, captureSamples, value);
		break;
		}

media/libstagefright/Android.bp

+3 −6

Original line number	Diff line number	Diff line
		@@ -79,7 +79,6 @@ cc_library_shared {
		},
		}

		// this library gets wrapped into libstagefright as well as modules
		cc_library_static {
		name: "libstagefright_mpeg2extractor",
		apex_available: [
		@@ -242,6 +241,7 @@ cc_library {
		"CodecErrorLog.cpp",
		"CryptoAsync.cpp",
		"FrameDecoder.cpp",
		"HevcUtils.cpp",
		"InterfaceUtils.cpp",
		"JPEGSource.cpp",
		"MPEG2TSWriter.cpp",
		@@ -255,6 +255,7 @@ cc_library {
		"MediaCodecSource.cpp",
		"MediaExtractor.cpp",
		"MediaExtractorFactory.cpp",
		"MediaSource.cpp",
		"MediaSync.cpp",
		"MediaTrack.cpp",
		"MediaMuxer.cpp",
		@@ -268,6 +269,7 @@ cc_library {
		"StagefrightMediaScanner.cpp",
		"SurfaceUtils.cpp",
		"ThrottledSource.cpp",
		"Utils.cpp",
		"VideoFrameSchedulerBase.cpp",
		"VideoFrameScheduler.cpp",
		],
		@@ -326,11 +328,6 @@ cc_library {
		"libmedia_ndkformatpriv",
		],

		// to get Utils, MediaSource, HevcUtils
		whole_static_libs: [
		"libstagefright_mpeg2extractor",
		],

		header_libs:[
		"libmediadrm_headers",
		"libnativeloader-headers",

media/libstagefright/colorconversion/ColorConverter.cpp

+19 −15

Original line number	Diff line number	Diff line
		@@ -733,32 +733,36 @@ const struct ColorConverter::Coeffs *ColorConverter::getMatrix() const {
		const bool is10Bit = (mSrcFormat == COLOR_FormatYUVP010
		\|\| mSrcFormat == OMX_COLOR_FormatYUV420Planar16);

		switch (mSrcColorSpace.mStandard) {
		case ColorUtils::kColorStandardBT601_525:
		case ColorUtils::kColorStandardBT601_625:
		ColorAspects::Primaries primaries;
		ColorAspects::MatrixCoeffs matrix;
		if (ColorUtils::unwrapColorAspectsFromColorStandard(
		mSrcColorSpace.mStandard, &primaries, &matrix) != OK) {
		matrix = ColorAspects::MatrixUnspecified;
		}

		switch (matrix) {
		case ColorAspects::MatrixBT601_6:
		case ColorAspects::MatrixBT470_6M: // use 601 matrix as that is the closest for now
		case ColorAspects::MatrixSMPTE240M: // use 601 matrix as that is the closest for now
		return (isFullRange ? &BT601_FULL :
		is10Bit ? &BT601_LTD_10BIT : &BT601_LIMITED);

		case ColorUtils::kColorStandardBT709:
		case ColorAspects::MatrixBT709_5:
		return (isFullRange ? &BT709_FULL :
		is10Bit ? &BT709_LTD_10BIT : &BT709_LIMITED);

		case ColorUtils::kColorStandardBT2020:
		case ColorAspects::MatrixBT2020:
		case ColorAspects::MatrixBT2020Constant: // use 2020 matrix as that is the closest for now
		return (isFullRange ? &BT2020_FULL :
		is10Bit ? &BT2020_LTD_10BIT : &BT2020_LIMITED);

		default:
		// for now use the default matrices for unhandled color spaces
		// TODO: fail?
		// return nullptr;
		[[fallthrough]];

		case ColorUtils::kColorStandardUnspecified:
		if (isFullRange) {
		return is10Bit ? &BT2020_FULL : &BT601_FULL;
		// use BT.2020 for 10-bit and 601 for 8-bit by default
		if (is10Bit) {
		return isFullRange ? &BT2020_FULL : &BT2020_LTD_10BIT;
		} else {
		return isFullRange ? &BT601_FULL : &BT601_LIMITED;
		}
		return is10Bit ? &BT2020_LTD_10BIT : &BT601_LIMITED;

		}
		}

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) },
		}
		};