Merge "C2SoftVpxEnc: add support for color aspect" (ad954785) · Commits · e / os / android_frameworks_av

media/codec2/components/vpx/C2SoftVpxEnc.h

+63 −0

Original line number	Diff line number	Diff line
		@@ -345,6 +345,42 @@ class C2SoftVpxEnc::IntfImpl : public SimpleInterface<void>::BaseParams {
		.withFields({C2F(mRequestSync, value).oneOf({ C2_FALSE, C2_TRUE }) })
		.withSetter(Setter<decltype(*mRequestSync)>::NonStrictValueWithNoDeps)
		.build());

		addParameter(
		DefineParam(mColorAspects, C2_PARAMKEY_COLOR_ASPECTS)
		.withDefault(new C2StreamColorAspectsInfo::input(
		0u, C2Color::RANGE_UNSPECIFIED, C2Color::PRIMARIES_UNSPECIFIED,
		C2Color::TRANSFER_UNSPECIFIED, C2Color::MATRIX_UNSPECIFIED))
		.withFields({
		C2F(mColorAspects, range).inRange(
		C2Color::RANGE_UNSPECIFIED, C2Color::RANGE_OTHER),
		C2F(mColorAspects, primaries).inRange(
		C2Color::PRIMARIES_UNSPECIFIED, C2Color::PRIMARIES_OTHER),
		C2F(mColorAspects, transfer).inRange(
		C2Color::TRANSFER_UNSPECIFIED, C2Color::TRANSFER_OTHER),
		C2F(mColorAspects, matrix).inRange(
		C2Color::MATRIX_UNSPECIFIED, C2Color::MATRIX_OTHER)
		})
		.withSetter(ColorAspectsSetter)
		.build());

		addParameter(
		DefineParam(mCodedColorAspects, C2_PARAMKEY_VUI_COLOR_ASPECTS)
		.withDefault(new C2StreamColorAspectsInfo::output(
		0u, C2Color::RANGE_LIMITED, C2Color::PRIMARIES_UNSPECIFIED,
		C2Color::TRANSFER_UNSPECIFIED, C2Color::MATRIX_UNSPECIFIED))
		.withFields({
		C2F(mCodedColorAspects, range).inRange(
		C2Color::RANGE_UNSPECIFIED, C2Color::RANGE_OTHER),
		C2F(mCodedColorAspects, primaries).inRange(
		C2Color::PRIMARIES_UNSPECIFIED, C2Color::PRIMARIES_OTHER),
		C2F(mCodedColorAspects, transfer).inRange(
		C2Color::TRANSFER_UNSPECIFIED, C2Color::TRANSFER_OTHER),
		C2F(mCodedColorAspects, matrix).inRange(
		C2Color::MATRIX_UNSPECIFIED, C2Color::MATRIX_OTHER)
		})
		.withSetter(CodedColorAspectsSetter, mColorAspects)
		.build());
		}

		static C2R BitrateSetter(bool mayBlock, C2P<C2StreamBitrateInfo::output> &me) {
		@@ -415,6 +451,31 @@ class C2SoftVpxEnc::IntfImpl : public SimpleInterface<void>::BaseParams {
		double period = mSyncFramePeriod->value / 1e6 * mFrameRate->value;
		return (uint32_t)c2_max(c2_min(period + 0.5, double(UINT32_MAX)), 1.);
		}
		static C2R ColorAspectsSetter(bool mayBlock, C2P<C2StreamColorAspectsInfo::input> &me) {
		(void)mayBlock;
		if (me.v.range > C2Color::RANGE_OTHER) {
		me.set().range = C2Color::RANGE_OTHER;
		}
		if (me.v.primaries > C2Color::PRIMARIES_OTHER) {
		me.set().primaries = C2Color::PRIMARIES_OTHER;
		}
		if (me.v.transfer > C2Color::TRANSFER_OTHER) {
		me.set().transfer = C2Color::TRANSFER_OTHER;
		}
		if (me.v.matrix > C2Color::MATRIX_OTHER) {
		me.set().matrix = C2Color::MATRIX_OTHER;
		}
		return C2R::Ok();
		}
		static C2R CodedColorAspectsSetter(bool mayBlock, C2P<C2StreamColorAspectsInfo::output> &me,
		const C2P<C2StreamColorAspectsInfo::input> &coded) {
		(void)mayBlock;
		me.set().range = coded.v.range;
		me.set().primaries = coded.v.primaries;
		me.set().transfer = coded.v.transfer;
		me.set().matrix = coded.v.matrix;
		return C2R::Ok();
		}

		private:
		std::shared_ptr<C2StreamUsageTuning::input> mUsage;
		@@ -427,6 +488,8 @@ class C2SoftVpxEnc::IntfImpl : public SimpleInterface<void>::BaseParams {
		std::shared_ptr<C2StreamBitrateInfo::output> mBitrate;
		std::shared_ptr<C2StreamBitrateModeTuning::output> mBitrateMode;
		std::shared_ptr<C2StreamProfileLevelInfo::output> mProfileLevel;
		std::shared_ptr<C2StreamColorAspectsInfo::input> mColorAspects;
		std::shared_ptr<C2StreamColorAspectsInfo::output> mCodedColorAspects;
		};

		} // namespace android