Merge "codec2: make i-frame-interval write-only" into qt-r1-dev (68790eb7) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/CCodecConfig.cpp

+2 −7

Original line number	Diff line number	Diff line
		@@ -508,7 +508,8 @@ void CCodecConfig::initializeStandardParams() {
		.limitTo(D::ENCODER & D::VIDEO));
		// convert to timestamp base
		add(ConfigMapper(KEY_I_FRAME_INTERVAL, C2_PARAMKEY_SYNC_FRAME_INTERVAL, "value")
		.withMappers([](C2Value v) -> C2Value {
		.limitTo(D::VIDEO & D::ENCODER & D::CONFIG)
		.withMapper([](C2Value v) -> C2Value {
		// convert from i32 to float
		int32_t i32Value;
		float fpValue;
		@@ -518,12 +519,6 @@ void CCodecConfig::initializeStandardParams() {
		return int64_t(c2_min(1000000 * fpValue + 0.5, (double)INT64_MAX));
		}
		return C2Value();
		}, [](C2Value v) -> C2Value {
		int64_t i64;
		if (v.get(&i64)) {
		return float(i64) / 1000000;
		}
		return C2Value();
		}));
		// remove when codecs switch to proper coding.gop (add support for calculating gop)
		deprecated(ConfigMapper("i-frame-period", "coding.gop", "intra-period")