Merge "C2SoftVpxEnc: process QP bounding parameters" into main (01a2bd3f) · Commits · e / os / android_frameworks_av

media/codec2/components/vpx/C2SoftVpxEnc.cpp

+85 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,12 @@
		#define INT32_MAX 2147483647
		#endif

		/* Quantization param values defined by the spec */
		#define VPX_QP_MIN 0
		#define VPX_QP_MAX 63
		#define VPX_QP_DEFAULT_MIN VPX_QP_MIN
		#define VPX_QP_DEFAULT_MAX VPX_QP_MAX

		namespace android {

		C2SoftVpxEnc::IntfImpl::IntfImpl(const std::shared_ptr<C2ReflectorHelper> &helper)
		@@ -197,6 +203,20 @@ C2SoftVpxEnc::IntfImpl::IntfImpl(const std::shared_ptr<C2ReflectorHelper> &helpe
		})
		.withSetter(CodedColorAspectsSetter, mColorAspects)
		.build());

		addParameter(
		DefineParam(mPictureQuantization, C2_PARAMKEY_PICTURE_QUANTIZATION)
		.withDefault(C2StreamPictureQuantizationTuning::output::AllocShared(
		0 /* flexCount /, 0u / stream */))
		.withFields({C2F(mPictureQuantization, m.values[0].type_).oneOf(
		{C2Config::I_FRAME, C2Config::P_FRAME}),
		C2F(mPictureQuantization, m.values[0].min).inRange(
		VPX_QP_DEFAULT_MIN, VPX_QP_DEFAULT_MAX),
		C2F(mPictureQuantization, m.values[0].max).inRange(
		VPX_QP_DEFAULT_MIN, VPX_QP_DEFAULT_MAX)})
		.withSetter(PictureQuantizationSetter)
		.build());

		}

		C2R C2SoftVpxEnc::IntfImpl::BitrateSetter(bool mayBlock, C2P<C2StreamBitrateInfo::output> &me) {
		@@ -330,6 +350,58 @@ uint32_t C2SoftVpxEnc::IntfImpl::getSyncFramePeriod() const {
		double period = mSyncFramePeriod->value / 1e6 * mFrameRate->value;
		return (uint32_t)c2_max(c2_min(period + 0.5, double(UINT32_MAX)), 1.);
		}

		C2R C2SoftVpxEnc::IntfImpl::PictureQuantizationSetter(bool mayBlock,
		C2P<C2StreamPictureQuantizationTuning::output>
		&me) {
		(void)mayBlock;
		// these are the ones we're going to set, so want them to default
		// to the DEFAULT values for the codec
		int32_t iMin = VPX_QP_DEFAULT_MIN, pMin = VPX_QP_DEFAULT_MIN;
		int32_t iMax = VPX_QP_DEFAULT_MAX, pMax = VPX_QP_DEFAULT_MAX;
		for (size_t i = 0; i < me.v.flexCount(); ++i) {
		const C2PictureQuantizationStruct &layer = me.v.m.values[i];
		// layerMin is clamped to [VPX_QP_MIN, layerMax] to avoid error
		// cases where layer.min > layer.max
		int32_t layerMax = std::clamp(layer.max, VPX_QP_MIN, VPX_QP_MAX);
		int32_t layerMin = std::clamp(layer.min, VPX_QP_MIN, layerMax);
		if (layer.type_ == C2Config::picture_type_t(I_FRAME)) {
		iMax = layerMax;
		iMin = layerMin;
		ALOGV("iMin %d iMax %d", iMin, iMax);
		} else if (layer.type_ == C2Config::picture_type_t(P_FRAME)) {
		pMax = layerMax;
		pMin = layerMin;
		ALOGV("pMin %d pMax %d", pMin, pMax);
		}
		}
		ALOGV("PictureQuantizationSetter(entry): i %d-%d p %d-%d",
		iMin, iMax, pMin, pMax);

		// vpx library takes same range for I/P picture type
		int32_t maxFrameQP = std::min({iMax, pMax});
		int32_t minFrameQP = std::max({iMin, pMin});
		if (minFrameQP > maxFrameQP) {
		minFrameQP = maxFrameQP;
		}
		// put them back into the structure
		for (size_t i = 0; i < me.v.flexCount(); ++i) {
		const C2PictureQuantizationStruct &layer = me.v.m.values[i];

		if (layer.type_ == C2Config::picture_type_t(I_FRAME)) {
		me.set().m.values[i].max = maxFrameQP;
		me.set().m.values[i].min = minFrameQP;
		}
		else if (layer.type_ == C2Config::picture_type_t(P_FRAME)) {
		me.set().m.values[i].max = maxFrameQP;
		me.set().m.values[i].min = minFrameQP;
		}
		}
		ALOGV("PictureQuantizationSetter(exit): minFrameQP = %d maxFrameQP = %d",
		minFrameQP, maxFrameQP);
		return C2R::Ok();
		}

		C2R C2SoftVpxEnc::IntfImpl::ColorAspectsSetter(bool mayBlock,
		C2P<C2StreamColorAspectsInfo::input>& me) {
		(void)mayBlock;
		@@ -453,6 +525,7 @@ status_t C2SoftVpxEnc::initEncoder() {
		mRequestSync = mIntf->getRequestSync_l();
		mLayering = mIntf->getTemporalLayers_l();
		mTemporalLayers = mLayering->m.layerCount;
		mQpBounds = mIntf->getPictureQuantization_l();
		}

		switch (mBitrateMode->value) {
		@@ -466,6 +539,18 @@ status_t C2SoftVpxEnc::initEncoder() {
		break;
		}

		if (mQpBounds->flexCount() > 0) {
		// read min max qp for sequence
		for (size_t i = 0; i < mQpBounds->flexCount(); ++i) {
		const C2PictureQuantizationStruct &layer = mQpBounds->m.values[i];
		if (layer.type_ == C2Config::picture_type_t(I_FRAME)) {
		mMaxQuantizer = layer.max;
		mMinQuantizer = layer.min;
		break;
		}
		}
		}

		setCodecSpecificInterface();
		if (!mCodecInterface) goto CleanUp;

media/codec2/components/vpx/C2SoftVpxEnc.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -219,6 +219,7 @@ struct C2SoftVpxEnc : public SimpleC2Component {
		std::shared_ptr<C2StreamBitrateModeTuning::output> mBitrateMode;
		std::shared_ptr<C2StreamRequestSyncFrameTuning::output> mRequestSync;
		std::shared_ptr<C2StreamTemporalLayeringTuning::output> mLayering;
		std::shared_ptr<C2StreamPictureQuantizationTuning::output> mQpBounds;

		C2_DO_NOT_COPY(C2SoftVpxEnc);
		};
		@@ -250,6 +251,9 @@ class C2SoftVpxEnc::IntfImpl : public SimpleInterface<void>::BaseParams {

		static C2R LayeringSetter(bool mayBlock, C2P<C2StreamTemporalLayeringTuning::output>& me);

		static C2R PictureQuantizationSetter(bool mayBlock,
		C2P<C2StreamPictureQuantizationTuning::output> &me);

		// unsafe getters
		std::shared_ptr<C2StreamPictureSizeInfo::input> getSize_l() const { return mSize; }
		std::shared_ptr<C2StreamIntraRefreshTuning::output> getIntraRefresh_l() const {
		@@ -269,6 +273,9 @@ class C2SoftVpxEnc::IntfImpl : public SimpleInterface<void>::BaseParams {
		std::shared_ptr<C2StreamColorAspectsInfo::output> getCodedColorAspects_l() const {
		return mCodedColorAspects;
		}
		std::shared_ptr<C2StreamPictureQuantizationTuning::output> getPictureQuantization_l() const {
		return mPictureQuantization;
		}
		uint32_t getSyncFramePeriod() const;
		static C2R ColorAspectsSetter(bool mayBlock, C2P<C2StreamColorAspectsInfo::input> &me);
		static C2R CodedColorAspectsSetter(bool mayBlock, C2P<C2StreamColorAspectsInfo::output> &me,
		@@ -287,6 +294,7 @@ class C2SoftVpxEnc::IntfImpl : public SimpleInterface<void>::BaseParams {
		std::shared_ptr<C2StreamProfileLevelInfo::output> mProfileLevel;
		std::shared_ptr<C2StreamColorAspectsInfo::input> mColorAspects;
		std::shared_ptr<C2StreamColorAspectsInfo::output> mCodedColorAspects;
		std::shared_ptr<C2StreamPictureQuantizationTuning::output> mPictureQuantization;
		};

		} // namespace android