Merge "codec2: remove deprecated configs and their remaining usage" (16be62cc) · Commits · e / os / android_frameworks_av

media/codec2/components/aac/C2SoftAacDec.cpp

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,7 @@ public:
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING)		DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE)
	.withDefault(new C2StreamSampleRateInfo::output(0u, 44100))		.withDefault(new C2StreamSampleRateInfo::output(0u, 44100))
	.withFields({C2F(mSampleRate, value).oneOf({		.withFields({C2F(mSampleRate, value).oneOf({
	7350, 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000		7350, 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000
	@@ -84,15 +84,15 @@ public:
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING)		DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT)
	.withDefault(new C2StreamChannelCountInfo::output(0u, 1))		.withDefault(new C2StreamChannelCountInfo::output(0u, 1))
	.withFields({C2F(mChannelCount, value).inRange(1, 8)})		.withFields({C2F(mChannelCount, value).inRange(1, 8)})
	.withSetter(Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps)		.withSetter(Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps)
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING)		DefineParam(mBitrate, C2_PARAMKEY_BITRATE)
	.withDefault(new C2BitrateTuning::input(0u, 64000))		.withDefault(new C2StreamBitrateInfo::input(0u, 64000))
	.withFields({C2F(mBitrate, value).inRange(8000, 960000)})		.withFields({C2F(mBitrate, value).inRange(8000, 960000)})
	.withSetter(Setter<decltype(*mBitrate)>::NonStrictValueWithNoDeps)		.withSetter(Setter<decltype(*mBitrate)>::NonStrictValueWithNoDeps)
	.build());		.build());
	@@ -103,10 +103,10 @@ public:
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mAacFormat, C2_NAME_STREAM_AAC_FORMAT_SETTING)		DefineParam(mAacFormat, C2_PARAMKEY_AAC_PACKAGING)
	.withDefault(new C2StreamAacFormatInfo::input(0u, C2AacStreamFormatRaw))		.withDefault(new C2StreamAacFormatInfo::input(0u, C2Config::AAC_PACKAGING_RAW))
	.withFields({C2F(mAacFormat, value).oneOf({		.withFields({C2F(mAacFormat, value).oneOf({
	C2AacStreamFormatRaw, C2AacStreamFormatAdts		C2Config::AAC_PACKAGING_RAW, C2Config::AAC_PACKAGING_ADTS
	})})		})})
	.withSetter(Setter<decltype(*mAacFormat)>::StrictValueWithNoDeps)		.withSetter(Setter<decltype(*mAacFormat)>::StrictValueWithNoDeps)
	.build());		.build());
	@@ -191,7 +191,7 @@ public:
	.build());		.build());
	}		}

	bool isAdts() const { return mAacFormat->value == C2AacStreamFormatAdts; }		bool isAdts() const { return mAacFormat->value == C2Config::AAC_PACKAGING_ADTS; }
	static C2R ProfileLevelSetter(bool mayBlock, C2P<C2StreamProfileLevelInfo::input> &me) {		static C2R ProfileLevelSetter(bool mayBlock, C2P<C2StreamProfileLevelInfo::input> &me) {
	(void)mayBlock;		(void)mayBlock;
	(void)me; // TODO: validate		(void)me; // TODO: validate
	@@ -205,13 +205,13 @@ public:
	int32_t getDrcEffectType() const { return mDrcEffectType->value; }		int32_t getDrcEffectType() const { return mDrcEffectType->value; }

	private:		private:
	std::shared_ptr<C2StreamFormatConfig::input> mInputFormat;		std::shared_ptr<C2StreamBufferTypeSetting::input> mInputFormat;
	std::shared_ptr<C2StreamFormatConfig::output> mOutputFormat;		std::shared_ptr<C2StreamBufferTypeSetting::output> mOutputFormat;
	std::shared_ptr<C2PortMimeConfig::input> mInputMediaType;		std::shared_ptr<C2PortMediaTypeSetting::input> mInputMediaType;
	std::shared_ptr<C2PortMimeConfig::output> mOutputMediaType;		std::shared_ptr<C2PortMediaTypeSetting::output> mOutputMediaType;
	std::shared_ptr<C2StreamSampleRateInfo::output> mSampleRate;		std::shared_ptr<C2StreamSampleRateInfo::output> mSampleRate;
	std::shared_ptr<C2StreamChannelCountInfo::output> mChannelCount;		std::shared_ptr<C2StreamChannelCountInfo::output> mChannelCount;
	std::shared_ptr<C2BitrateTuning::input> mBitrate;		std::shared_ptr<C2StreamBitrateInfo::input> mBitrate;
	std::shared_ptr<C2StreamMaxBufferSizeInfo::input> mInputMaxBufSize;		std::shared_ptr<C2StreamMaxBufferSizeInfo::input> mInputMaxBufSize;
	std::shared_ptr<C2StreamAacFormatInfo::input> mAacFormat;		std::shared_ptr<C2StreamAacFormatInfo::input> mAacFormat;
	std::shared_ptr<C2StreamProfileLevelInfo::input> mProfileLevel;		std::shared_ptr<C2StreamProfileLevelInfo::input> mProfileLevel;

media/codec2/components/aac/C2SoftAacEnc.cpp

+19 −19

Original line number	Original line	Diff line number	Diff line
	@@ -37,29 +37,29 @@ public:
	setDerivedInstance(this);		setDerivedInstance(this);

	addParameter(		addParameter(
	DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING)		DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE)
	.withConstValue(new C2StreamFormatConfig::input(0u, C2FormatAudio))		.withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING)		DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE)
	.withConstValue(new C2StreamFormatConfig::output(0u, C2FormatCompressed))		.withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING)		DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE)
	.withConstValue(AllocSharedString<C2PortMimeConfig::input>(		.withConstValue(AllocSharedString<C2PortMediaTypeSetting::input>(
	MEDIA_MIMETYPE_AUDIO_RAW))		MEDIA_MIMETYPE_AUDIO_RAW))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING)		DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE)
	.withConstValue(AllocSharedString<C2PortMimeConfig::output>(		.withConstValue(AllocSharedString<C2PortMediaTypeSetting::output>(
	MEDIA_MIMETYPE_AUDIO_AAC))		MEDIA_MIMETYPE_AUDIO_AAC))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING)		DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE)
	.withDefault(new C2StreamSampleRateInfo::input(0u, 44100))		.withDefault(new C2StreamSampleRateInfo::input(0u, 44100))
	.withFields({C2F(mSampleRate, value).oneOf({		.withFields({C2F(mSampleRate, value).oneOf({
	8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000		8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000
	@@ -68,15 +68,15 @@ public:
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING)		DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT)
	.withDefault(new C2StreamChannelCountInfo::input(0u, 1))		.withDefault(new C2StreamChannelCountInfo::input(0u, 1))
	.withFields({C2F(mChannelCount, value).inRange(1, 6)})		.withFields({C2F(mChannelCount, value).inRange(1, 6)})
	.withSetter(Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps)		.withSetter(Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps)
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING)		DefineParam(mBitrate, C2_PARAMKEY_BITRATE)
	.withDefault(new C2BitrateTuning::output(0u, 64000))		.withDefault(new C2StreamBitrateInfo::output(0u, 64000))
	.withFields({C2F(mBitrate, value).inRange(8000, 960000)})		.withFields({C2F(mBitrate, value).inRange(8000, 960000)})
	.withSetter(Setter<decltype(*mBitrate)>::NonStrictValueWithNoDeps)		.withSetter(Setter<decltype(*mBitrate)>::NonStrictValueWithNoDeps)
	.build());		.build());
	@@ -125,13 +125,13 @@ public:
	}		}

	private:		private:
	std::shared_ptr<C2StreamFormatConfig::input> mInputFormat;		std::shared_ptr<C2StreamBufferTypeSetting::input> mInputFormat;
	std::shared_ptr<C2StreamFormatConfig::output> mOutputFormat;		std::shared_ptr<C2StreamBufferTypeSetting::output> mOutputFormat;
	std::shared_ptr<C2PortMimeConfig::input> mInputMediaType;		std::shared_ptr<C2PortMediaTypeSetting::input> mInputMediaType;
	std::shared_ptr<C2PortMimeConfig::output> mOutputMediaType;		std::shared_ptr<C2PortMediaTypeSetting::output> mOutputMediaType;
	std::shared_ptr<C2StreamSampleRateInfo::input> mSampleRate;		std::shared_ptr<C2StreamSampleRateInfo::input> mSampleRate;
	std::shared_ptr<C2StreamChannelCountInfo::input> mChannelCount;		std::shared_ptr<C2StreamChannelCountInfo::input> mChannelCount;
	std::shared_ptr<C2BitrateTuning::output> mBitrate;		std::shared_ptr<C2StreamBitrateInfo::output> mBitrate;
	std::shared_ptr<C2StreamMaxBufferSizeInfo::input> mInputMaxBufSize;		std::shared_ptr<C2StreamMaxBufferSizeInfo::input> mInputMaxBufSize;
	std::shared_ptr<C2StreamProfileLevelInfo::output> mProfileLevel;		std::shared_ptr<C2StreamProfileLevelInfo::output> mProfileLevel;
	};		};
	@@ -323,8 +323,8 @@ void C2SoftAacEnc::process(
	return;		return;
	}		}

	std::unique_ptr<C2StreamCsdInfo::output> csd =		std::unique_ptr<C2StreamInitDataInfo::output> csd =
	C2StreamCsdInfo::output::AllocUnique(encInfo.confSize, 0u);		C2StreamInitDataInfo::output::AllocUnique(encInfo.confSize, 0u);
	if (!csd) {		if (!csd) {
	ALOGE("CSD allocation failed");		ALOGE("CSD allocation failed");
	mSignalledError = true;		mSignalledError = true;

media/codec2/components/amr_nb_wb/C2SoftAmrDec.cpp

+18 −18

Original line number	Original line	Diff line number	Diff line
	@@ -47,18 +47,18 @@ public:
	setDerivedInstance(this);		setDerivedInstance(this);

	addParameter(		addParameter(
	DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING)		DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE)
	.withConstValue(new C2StreamFormatConfig::input(0u, C2FormatCompressed))		.withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING)		DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE)
	.withConstValue(new C2StreamFormatConfig::output(0u, C2FormatAudio))		.withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING)		DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE)
	.withConstValue(AllocSharedString<C2PortMimeConfig::input>(		.withConstValue(AllocSharedString<C2PortMediaTypeSetting::input>(
	#ifdef AMRNB		#ifdef AMRNB
	MEDIA_MIMETYPE_AUDIO_AMR_NB		MEDIA_MIMETYPE_AUDIO_AMR_NB
	#else		#else
	@@ -67,13 +67,13 @@ public:
	)).build());		)).build());

	addParameter(		addParameter(
	DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING)		DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE)
	.withConstValue(AllocSharedString<C2PortMimeConfig::output>(		.withConstValue(AllocSharedString<C2PortMediaTypeSetting::output>(
	MEDIA_MIMETYPE_AUDIO_RAW))		MEDIA_MIMETYPE_AUDIO_RAW))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING)		DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE)
	#ifdef AMRNB		#ifdef AMRNB
	.withDefault(new C2StreamSampleRateInfo::output(0u, 8000))		.withDefault(new C2StreamSampleRateInfo::output(0u, 8000))
	.withFields({C2F(mSampleRate, value).equalTo(8000)})		.withFields({C2F(mSampleRate, value).equalTo(8000)})
	@@ -85,19 +85,19 @@ public:
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING)		DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT)
	.withDefault(new C2StreamChannelCountInfo::output(0u, 1))		.withDefault(new C2StreamChannelCountInfo::output(0u, 1))
	.withFields({C2F(mChannelCount, value).equalTo(1)})		.withFields({C2F(mChannelCount, value).equalTo(1)})
	.withSetter((Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps))		.withSetter((Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING)		DefineParam(mBitrate, C2_PARAMKEY_BITRATE)
	#ifdef AMRNB		#ifdef AMRNB
	.withDefault(new C2BitrateTuning::input(0u, 4750))		.withDefault(new C2StreamBitrateInfo::input(0u, 4750))
	.withFields({C2F(mBitrate, value).inRange(4750, 12200)})		.withFields({C2F(mBitrate, value).inRange(4750, 12200)})
	#else		#else
	.withDefault(new C2BitrateTuning::input(0u, 6600))		.withDefault(new C2StreamBitrateInfo::input(0u, 6600))
	.withFields({C2F(mBitrate, value).inRange(6600, 23850)})		.withFields({C2F(mBitrate, value).inRange(6600, 23850)})
	#endif		#endif
	.withSetter(Setter<decltype(*mBitrate)>::NonStrictValueWithNoDeps)		.withSetter(Setter<decltype(*mBitrate)>::NonStrictValueWithNoDeps)
	@@ -110,13 +110,13 @@ public:
	}		}

	private:		private:
	std::shared_ptr<C2StreamFormatConfig::input> mInputFormat;		std::shared_ptr<C2StreamBufferTypeSetting::input> mInputFormat;
	std::shared_ptr<C2StreamFormatConfig::output> mOutputFormat;		std::shared_ptr<C2StreamBufferTypeSetting::output> mOutputFormat;
	std::shared_ptr<C2PortMimeConfig::input> mInputMediaType;		std::shared_ptr<C2PortMediaTypeSetting::input> mInputMediaType;
	std::shared_ptr<C2PortMimeConfig::output> mOutputMediaType;		std::shared_ptr<C2PortMediaTypeSetting::output> mOutputMediaType;
	std::shared_ptr<C2StreamSampleRateInfo::output> mSampleRate;		std::shared_ptr<C2StreamSampleRateInfo::output> mSampleRate;
	std::shared_ptr<C2StreamChannelCountInfo::output> mChannelCount;		std::shared_ptr<C2StreamChannelCountInfo::output> mChannelCount;
	std::shared_ptr<C2BitrateTuning::input> mBitrate;		std::shared_ptr<C2StreamBitrateInfo::input> mBitrate;
	std::shared_ptr<C2StreamMaxBufferSizeInfo::input> mInputMaxBufSize;		std::shared_ptr<C2StreamMaxBufferSizeInfo::input> mInputMaxBufSize;
	};		};

media/codec2/components/amr_nb_wb/C2SoftAmrNbEnc.cpp

+17 −17

Original line number	Original line	Diff line number	Diff line
	@@ -36,38 +36,38 @@ class C2SoftAmrNbEnc::IntfImpl : public C2InterfaceHelper {
	setDerivedInstance(this);		setDerivedInstance(this);

	addParameter(		addParameter(
	DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING)		DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE)
	.withConstValue(		.withConstValue(
	new C2StreamFormatConfig::input(0u, C2FormatAudio))		new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING)		DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE)
	.withConstValue(		.withConstValue(
	new C2StreamFormatConfig::output(0u, C2FormatCompressed))		new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING)		DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE)
	.withConstValue(AllocSharedString<C2PortMimeConfig::input>(		.withConstValue(AllocSharedString<C2PortMediaTypeSetting::input>(
	MEDIA_MIMETYPE_AUDIO_RAW))		MEDIA_MIMETYPE_AUDIO_RAW))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING)		DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE)
	.withConstValue(AllocSharedString<C2PortMimeConfig::output>(		.withConstValue(AllocSharedString<C2PortMediaTypeSetting::output>(
	MEDIA_MIMETYPE_AUDIO_AMR_NB))		MEDIA_MIMETYPE_AUDIO_AMR_NB))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING)		DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT)
	.withDefault(new C2StreamChannelCountInfo::input(0u, 1))		.withDefault(new C2StreamChannelCountInfo::input(0u, 1))
	.withFields({C2F(mChannelCount, value).equalTo(1)})		.withFields({C2F(mChannelCount, value).equalTo(1)})
	.withSetter((Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps))		.withSetter((Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING)		DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE)
	.withDefault(new C2StreamSampleRateInfo::input(0u, 8000))		.withDefault(new C2StreamSampleRateInfo::input(0u, 8000))
	.withFields({C2F(mSampleRate, value).equalTo(8000)})		.withFields({C2F(mSampleRate, value).equalTo(8000)})
	.withSetter(		.withSetter(
	@@ -75,8 +75,8 @@ class C2SoftAmrNbEnc::IntfImpl : public C2InterfaceHelper {
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING)		DefineParam(mBitrate, C2_PARAMKEY_BITRATE)
	.withDefault(new C2BitrateTuning::output(0u, 4750))		.withDefault(new C2StreamBitrateInfo::output(0u, 4750))
	.withFields({C2F(mBitrate, value).inRange(4750, 12200)})		.withFields({C2F(mBitrate, value).inRange(4750, 12200)})
	.withSetter(Setter<decltype(*mBitrate)>::NonStrictValueWithNoDeps)		.withSetter(Setter<decltype(*mBitrate)>::NonStrictValueWithNoDeps)
	.build());		.build());
	@@ -92,13 +92,13 @@ class C2SoftAmrNbEnc::IntfImpl : public C2InterfaceHelper {
	uint32_t getBitrate() const { return mBitrate->value; }		uint32_t getBitrate() const { return mBitrate->value; }

	private:		private:
	std::shared_ptr<C2StreamFormatConfig::input> mInputFormat;		std::shared_ptr<C2StreamBufferTypeSetting::input> mInputFormat;
	std::shared_ptr<C2StreamFormatConfig::output> mOutputFormat;		std::shared_ptr<C2StreamBufferTypeSetting::output> mOutputFormat;
	std::shared_ptr<C2PortMimeConfig::input> mInputMediaType;		std::shared_ptr<C2PortMediaTypeSetting::input> mInputMediaType;
	std::shared_ptr<C2PortMimeConfig::output> mOutputMediaType;		std::shared_ptr<C2PortMediaTypeSetting::output> mOutputMediaType;
	std::shared_ptr<C2StreamSampleRateInfo::input> mSampleRate;		std::shared_ptr<C2StreamSampleRateInfo::input> mSampleRate;
	std::shared_ptr<C2StreamChannelCountInfo::input> mChannelCount;		std::shared_ptr<C2StreamChannelCountInfo::input> mChannelCount;
	std::shared_ptr<C2BitrateTuning::output> mBitrate;		std::shared_ptr<C2StreamBitrateInfo::output> mBitrate;
	std::shared_ptr<C2StreamMaxBufferSizeInfo::input> mInputMaxBufSize;		std::shared_ptr<C2StreamMaxBufferSizeInfo::input> mInputMaxBufSize;
	};		};

media/codec2/components/amr_nb_wb/C2SoftAmrWbEnc.cpp

+17 −17

Original line number	Original line	Diff line number	Diff line
	@@ -38,38 +38,38 @@ class C2SoftAmrWbEnc::IntfImpl : public C2InterfaceHelper {
	setDerivedInstance(this);		setDerivedInstance(this);

	addParameter(		addParameter(
	DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING)		DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE)
	.withConstValue(		.withConstValue(
	new C2StreamFormatConfig::input(0u, C2FormatAudio))		new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING)		DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE)
	.withConstValue(		.withConstValue(
	new C2StreamFormatConfig::output(0u, C2FormatCompressed))		new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING)		DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE)
	.withConstValue(AllocSharedString<C2PortMimeConfig::input>(		.withConstValue(AllocSharedString<C2PortMediaTypeSetting::input>(
	MEDIA_MIMETYPE_AUDIO_RAW))		MEDIA_MIMETYPE_AUDIO_RAW))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING)		DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE)
	.withConstValue(AllocSharedString<C2PortMimeConfig::output>(		.withConstValue(AllocSharedString<C2PortMediaTypeSetting::output>(
	MEDIA_MIMETYPE_AUDIO_AMR_WB))		MEDIA_MIMETYPE_AUDIO_AMR_WB))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING)		DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT)
	.withDefault(new C2StreamChannelCountInfo::input(0u, 1))		.withDefault(new C2StreamChannelCountInfo::input(0u, 1))
	.withFields({C2F(mChannelCount, value).equalTo(1)})		.withFields({C2F(mChannelCount, value).equalTo(1)})
	.withSetter((Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps))		.withSetter((Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps))
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING)		DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE)
	.withDefault(new C2StreamSampleRateInfo::input(0u, 16000))		.withDefault(new C2StreamSampleRateInfo::input(0u, 16000))
	.withFields({C2F(mSampleRate, value).equalTo(16000)})		.withFields({C2F(mSampleRate, value).equalTo(16000)})
	.withSetter(		.withSetter(
	@@ -77,8 +77,8 @@ class C2SoftAmrWbEnc::IntfImpl : public C2InterfaceHelper {
	.build());		.build());

	addParameter(		addParameter(
	DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING)		DefineParam(mBitrate, C2_PARAMKEY_BITRATE)
	.withDefault(new C2BitrateTuning::output(0u, 6600))		.withDefault(new C2StreamBitrateInfo::output(0u, 6600))
	.withFields({C2F(mBitrate, value).inRange(6600, 23850)})		.withFields({C2F(mBitrate, value).inRange(6600, 23850)})
	.withSetter(Setter<decltype(*mBitrate)>::NonStrictValueWithNoDeps)		.withSetter(Setter<decltype(*mBitrate)>::NonStrictValueWithNoDeps)
	.build());		.build());
	@@ -94,13 +94,13 @@ class C2SoftAmrWbEnc::IntfImpl : public C2InterfaceHelper {
	uint32_t getBitrate() const { return mBitrate->value; }		uint32_t getBitrate() const { return mBitrate->value; }

	private:		private:
	std::shared_ptr<C2StreamFormatConfig::input> mInputFormat;		std::shared_ptr<C2StreamBufferTypeSetting::input> mInputFormat;
	std::shared_ptr<C2StreamFormatConfig::output> mOutputFormat;		std::shared_ptr<C2StreamBufferTypeSetting::output> mOutputFormat;
	std::shared_ptr<C2PortMimeConfig::input> mInputMediaType;		std::shared_ptr<C2PortMediaTypeSetting::input> mInputMediaType;
	std::shared_ptr<C2PortMimeConfig::output> mOutputMediaType;		std::shared_ptr<C2PortMediaTypeSetting::output> mOutputMediaType;
	std::shared_ptr<C2StreamSampleRateInfo::input> mSampleRate;		std::shared_ptr<C2StreamSampleRateInfo::input> mSampleRate;
	std::shared_ptr<C2StreamChannelCountInfo::input> mChannelCount;		std::shared_ptr<C2StreamChannelCountInfo::input> mChannelCount;
	std::shared_ptr<C2BitrateTuning::output> mBitrate;		std::shared_ptr<C2StreamBitrateInfo::output> mBitrate;
	std::shared_ptr<C2StreamMaxBufferSizeInfo::input> mInputMaxBufSize;		std::shared_ptr<C2StreamMaxBufferSizeInfo::input> mInputMaxBufSize;
	};		};