Snap for 8730838 from f51f239bde8a32ec81f98bacc6f7adb0c575b6a3 to tm-release (af674986) · Commits · e / os / android_frameworks_av

media/TEST_MAPPING

+5 −40

Original line number	Diff line number	Diff line
		// for frameworks/av/media
		{
		"presubmit-large": [
		// runs whenever we change something in this tree
		{
		"name": "CtsMediaCodecTestCases",
		"options": [
		{
		"include-filter": "android.media.codec.cts.EncodeDecodeTest"
		}
		]
		},
		{
		"name": "CtsMediaCodecTestCases",
		"options": [
		{
		"include-filter": "android.media.codec.cts.DecodeEditEncodeTest"
		}
		]
		}
		],
		// TODO (b/229286407) Add EncodeDecodeTest and DecodeEditEncodeTest to
		// presubmit-large once issues in cuttlefish are fixed
		"presubmit": [
		{
		"name": "GtsMediaTestCases",
		@@ -40,26 +23,8 @@
		{
		"path": "frameworks/av/drm/mediadrm/plugins"
		}
		],

		"platinum-postsubmit": [
		// runs regularly, independent of changes in this tree.
		// signals if changes elsewhere break media functionality
		{
		"name": "CtsMediaCodecTestCases",
		"options": [
		{
		"include-filter": "android.media.codec.cts.EncodeDecodeTest"
		}
		]
		},
		{
		"name": "CtsMediaCodecTestCases",
		"options": [
		{
		"include-filter": "android.media.codec.cts.DecodeEditEncodeTest"
		}
		]
		}
		]

		// TODO (b/229286407) Add EncodeDecodeTest and DecodeEditEncodeTest to
		// platinum-postsubmit once issues in cuttlefish are fixed
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -1514,7 +1514,8 @@ c2_status_t C2SoftAvcEnc::setEncodeArgs(
		vPlane = uPlane + yPlaneSize / 4;
		yStride = width;
		uStride = vStride = yStride / 2;
		ConvertRGBToPlanarYUV(yPlane, yStride, height, conversionBuffer.size(), *input);
		ConvertRGBToPlanarYUV(yPlane, yStride, height, conversionBuffer.size(), *input,
		mColorAspects->matrix, mColorAspects->range);
		break;
		}
		case C2PlanarLayout::TYPE_YUV: {

+2 −1

Original line number	Diff line number	Diff line
		@@ -901,7 +901,8 @@ c2_status_t C2SoftHevcEnc::setEncodeArgs(ihevce_inp_buf_t* ps_encode_ip,
		yStride = width;
		uStride = vStride = yStride / 2;
		ConvertRGBToPlanarYUV(yPlane, yStride, height,
		conversionBuffer.size(), *input);
		conversionBuffer.size(), *input,
		mColorAspects->matrix, mColorAspects->range);
		break;
		}
		case C2PlanarLayout::TYPE_YUV: {

+7 −1

Original line number	Diff line number	Diff line
		@@ -733,8 +733,14 @@ void C2SoftVpxEnc::process(
		switch (layout.type) {
		case C2PlanarLayout::TYPE_RGB:
		case C2PlanarLayout::TYPE_RGBA: {
		std::shared_ptr<C2StreamColorAspectsInfo::output> colorAspects;
		{
		IntfImpl::Lock lock = mIntf->lock();
		colorAspects = mIntf->getCodedColorAspects_l();
		}
		ConvertRGBToPlanarYUV(mConversionBuffer.data(), stride, vstride,
		mConversionBuffer.size(), *rView.get());
		mConversionBuffer.size(), *rView.get(),
		colorAspects->matrix, colorAspects->range);
		vpx_img_wrap(&raw_frame, VPX_IMG_FMT_I420, width, height,
		mStrideAlign, mConversionBuffer.data());
		break;

+3 −0

Original line number	Diff line number	Diff line
		@@ -265,6 +265,9 @@ class C2SoftVpxEnc::IntfImpl : public SimpleInterface<void>::BaseParams {
		std::shared_ptr<C2StreamTemporalLayeringTuning::output> getTemporalLayers_l() const {
		return mLayering;
		}
		std::shared_ptr<C2StreamColorAspectsInfo::output> getCodedColorAspects_l() const {
		return mCodedColorAspects;
		}
		uint32_t getSyncFramePeriod() const;
		static C2R ColorAspectsSetter(bool mayBlock, C2P<C2StreamColorAspectsInfo::input> &me);
		static C2R CodedColorAspectsSetter(bool mayBlock, C2P<C2StreamColorAspectsInfo::output> &me,