Merge changes from topic "Video Enc Stats for T" am: c073b57416 am: 3b60dba533 am: f092f4909f (695bf335) · Commits · e / os / android_frameworks_av

media/codec2/core/include/C2Config.h

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -270,6 +270,9 @@ enum C2ParamIndexKind : C2Param::type_index_t {

	// encoding quality requirements		// encoding quality requirements
	kParamIndexEncodingQualityLevel, // encoders, enum		kParamIndexEncodingQualityLevel, // encoders, enum

			// encoding statistics, average block qp of a frame
			kParamIndexAverageBlockQuantization, // int32
	};		};

	}		}
	@@ -2411,6 +2414,17 @@ C2ENUM(C2PlatformConfig::encoding_quality_level_t, uint32_t,
	S_HANDHELD = 1 // corresponds to VMAF=70		S_HANDHELD = 1 // corresponds to VMAF=70
	);		);

			/**
			* Video Encoding Statistics Export
			*/

			/**
			* Average block QP exported from video encoder.
			*/
			typedef C2StreamParam<C2Info, C2SimpleValueStruct<int32_t>, kParamIndexAverageBlockQuantization>
			C2AndroidStreamAverageBlockQuantizationInfo;
			constexpr char C2_PARAMKEY_AVERAGE_QP[] = "coded.average-qp";

	/// @}		/// @}

	#endif // C2CONFIG_H_		#endif // C2CONFIG_H_

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1443,6 +1443,27 @@ void CCodec::configure(const sp<AMessage> &msg) {
	config->mOutputFormat->setInt32("android._tunneled", 1);		config->mOutputFormat->setInt32("android._tunneled", 1);
	}		}

			// Convert an encoding statistics level to corresponding encoding statistics
			// kinds
			int32_t encodingStatisticsLevel = VIDEO_ENCODING_STATISTICS_LEVEL_NONE;
			if ((config->mDomain & Config::IS_ENCODER)
			&& (config->mDomain & Config::IS_VIDEO)
			&& msg->findInt32(KEY_VIDEO_ENCODING_STATISTICS_LEVEL, &encodingStatisticsLevel)) {
			// Higher level include all the enc stats belong to lower level.
			switch (encodingStatisticsLevel) {
			// case VIDEO_ENCODING_STATISTICS_LEVEL_2: // reserved for the future level 2
			// with more enc stat kinds
			// Future extended encoding statistics for the level 2 should be added here
			case VIDEO_ENCODING_STATISTICS_LEVEL_1:
			config->subscribeToConfigUpdate(comp,
			{kParamIndexAverageBlockQuantization, kParamIndexPictureType});
			break;
			case VIDEO_ENCODING_STATISTICS_LEVEL_NONE:
			break;
			}
			}
			ALOGD("encoding statistics level = %d", encodingStatisticsLevel);

	ALOGD("setup formats input: %s",		ALOGD("setup formats input: %s",
	config->mInputFormat->debugString().c_str());		config->mInputFormat->debugString().c_str());
	ALOGD("setup formats output: %s",		ALOGD("setup formats output: %s",

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -953,6 +953,12 @@ void CCodecConfig::initializeStandardParams() {
	return value == 0 ? C2_FALSE : C2_TRUE;		return value == 0 ? C2_FALSE : C2_TRUE;
	}));		}));

			add(ConfigMapper(KEY_VIDEO_QP_AVERAGE, C2_PARAMKEY_AVERAGE_QP, "value")
			.limitTo(D::ENCODER & D::VIDEO & D::READ));

			add(ConfigMapper(KEY_PICTURE_TYPE, C2_PARAMKEY_PICTURE_TYPE, "value")
			.limitTo(D::ENCODER & D::VIDEO & D::READ));

	/* still to do		/* still to do
	constexpr char KEY_PUSH_BLANK_BUFFERS_ON_STOP[] = "push-blank-buffers-on-shutdown";		constexpr char KEY_PUSH_BLANK_BUFFERS_ON_STOP[] = "push-blank-buffers-on-shutdown";

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -363,11 +363,6 @@ struct CCodecConfig {
	const std::vector<std::string> &names,		const std::vector<std::string> &names,
	c2_blocking_t blocking = C2_DONT_BLOCK);		c2_blocking_t blocking = C2_DONT_BLOCK);

	private:

	/// initializes the standard MediaCodec to Codec 2.0 params mapping
	void initializeStandardParams();

	/// Adds indices to the subscribed indices, and updated subscription to component		/// Adds indices to the subscribed indices, and updated subscription to component
	/// \param blocking blocking mode to use with the component		/// \param blocking blocking mode to use with the component
	status_t subscribeToConfigUpdate(		status_t subscribeToConfigUpdate(
	@@ -375,6 +370,11 @@ private:
	const std::vector<C2Param::Index> &indices,		const std::vector<C2Param::Index> &indices,
	c2_blocking_t blocking = C2_DONT_BLOCK);		c2_blocking_t blocking = C2_DONT_BLOCK);

			private:

			/// initializes the standard MediaCodec to Codec 2.0 params mapping
			void initializeStandardParams();

	/// Gets SDK format from codec 2.0 reflected configuration		/// Gets SDK format from codec 2.0 reflected configuration
	/// \param domain input/output bitmask		/// \param domain input/output bitmask
	sp<AMessage> getFormatForDomain(		sp<AMessage> getFormatForDomain(

+12 −0