diff --git a/media/codec2/components/aac/C2SoftAacDec.cpp b/media/codec2/components/aac/C2SoftAacDec.cpp index 04dda8f52c..4d00d35680 100644 --- a/media/codec2/components/aac/C2SoftAacDec.cpp +++ b/media/codec2/components/aac/C2SoftAacDec.cpp @@ -75,7 +75,7 @@ public: .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::output(0u, 44100)) .withFields({C2F(mSampleRate, value).oneOf({ 7350, 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 @@ -84,15 +84,15 @@ public: .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::output(0u, 1)) .withFields({C2F(mChannelCount, value).inRange(1, 8)}) .withSetter(Setter::StrictValueWithNoDeps) .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::input(0u, 64000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::input(0u, 64000)) .withFields({C2F(mBitrate, value).inRange(8000, 960000)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -103,10 +103,10 @@ public: .build()); addParameter( - DefineParam(mAacFormat, C2_NAME_STREAM_AAC_FORMAT_SETTING) - .withDefault(new C2StreamAacFormatInfo::input(0u, C2AacStreamFormatRaw)) + DefineParam(mAacFormat, C2_PARAMKEY_AAC_PACKAGING) + .withDefault(new C2StreamAacFormatInfo::input(0u, C2Config::AAC_PACKAGING_RAW)) .withFields({C2F(mAacFormat, value).oneOf({ - C2AacStreamFormatRaw, C2AacStreamFormatAdts + C2Config::AAC_PACKAGING_RAW, C2Config::AAC_PACKAGING_ADTS })}) .withSetter(Setter::StrictValueWithNoDeps) .build()); @@ -191,7 +191,7 @@ public: .build()); } - bool isAdts() const { return mAacFormat->value == C2AacStreamFormatAdts; } + bool isAdts() const { return mAacFormat->value == C2Config::AAC_PACKAGING_ADTS; } static C2R ProfileLevelSetter(bool mayBlock, C2P &me) { (void)mayBlock; (void)me; // TODO: validate @@ -205,13 +205,13 @@ public: int32_t getDrcEffectType() const { return mDrcEffectType->value; } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; std::shared_ptr mAacFormat; std::shared_ptr mProfileLevel; diff --git a/media/codec2/components/aac/C2SoftAacEnc.cpp b/media/codec2/components/aac/C2SoftAacEnc.cpp index d1bdf0d513..137e775e9f 100644 --- a/media/codec2/components/aac/C2SoftAacEnc.cpp +++ b/media/codec2/components/aac/C2SoftAacEnc.cpp @@ -37,29 +37,29 @@ public: setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::input(0u, C2FormatAudio)) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::output(0u, C2FormatCompressed)) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_AAC)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::input(0u, 44100)) .withFields({C2F(mSampleRate, value).oneOf({ 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 @@ -68,15 +68,15 @@ public: .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::input(0u, 1)) .withFields({C2F(mChannelCount, value).inRange(1, 6)}) .withSetter(Setter::StrictValueWithNoDeps) .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::output(0u, 64000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::output(0u, 64000)) .withFields({C2F(mBitrate, value).inRange(8000, 960000)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -125,13 +125,13 @@ public: } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; std::shared_ptr mProfileLevel; }; @@ -323,8 +323,8 @@ void C2SoftAacEnc::process( return; } - std::unique_ptr csd = - C2StreamCsdInfo::output::AllocUnique(encInfo.confSize, 0u); + std::unique_ptr csd = + C2StreamInitDataInfo::output::AllocUnique(encInfo.confSize, 0u); if (!csd) { ALOGE("CSD allocation failed"); mSignalledError = true; diff --git a/media/codec2/components/amr_nb_wb/C2SoftAmrDec.cpp b/media/codec2/components/amr_nb_wb/C2SoftAmrDec.cpp index c591e212ac..edad75a4bd 100644 --- a/media/codec2/components/amr_nb_wb/C2SoftAmrDec.cpp +++ b/media/codec2/components/amr_nb_wb/C2SoftAmrDec.cpp @@ -47,18 +47,18 @@ public: setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::input(0u, C2FormatCompressed)) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::output(0u, C2FormatAudio)) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( #ifdef AMRNB MEDIA_MIMETYPE_AUDIO_AMR_NB #else @@ -67,13 +67,13 @@ public: )).build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) #ifdef AMRNB .withDefault(new C2StreamSampleRateInfo::output(0u, 8000)) .withFields({C2F(mSampleRate, value).equalTo(8000)}) @@ -85,19 +85,19 @@ public: .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::output(0u, 1)) .withFields({C2F(mChannelCount, value).equalTo(1)}) .withSetter((Setter::StrictValueWithNoDeps)) .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) #ifdef AMRNB - .withDefault(new C2BitrateTuning::input(0u, 4750)) + .withDefault(new C2StreamBitrateInfo::input(0u, 4750)) .withFields({C2F(mBitrate, value).inRange(4750, 12200)}) #else - .withDefault(new C2BitrateTuning::input(0u, 6600)) + .withDefault(new C2StreamBitrateInfo::input(0u, 6600)) .withFields({C2F(mBitrate, value).inRange(6600, 23850)}) #endif .withSetter(Setter::NonStrictValueWithNoDeps) @@ -110,13 +110,13 @@ public: } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; }; diff --git a/media/codec2/components/amr_nb_wb/C2SoftAmrNbEnc.cpp b/media/codec2/components/amr_nb_wb/C2SoftAmrNbEnc.cpp index 8c03257a74..3d3aa7dbf2 100644 --- a/media/codec2/components/amr_nb_wb/C2SoftAmrNbEnc.cpp +++ b/media/codec2/components/amr_nb_wb/C2SoftAmrNbEnc.cpp @@ -36,38 +36,38 @@ class C2SoftAmrNbEnc::IntfImpl : public C2InterfaceHelper { setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) .withConstValue( - new C2StreamFormatConfig::input(0u, C2FormatAudio)) + new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) .withConstValue( - new C2StreamFormatConfig::output(0u, C2FormatCompressed)) + new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_AMR_NB)) .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::input(0u, 1)) .withFields({C2F(mChannelCount, value).equalTo(1)}) .withSetter((Setter::StrictValueWithNoDeps)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::input(0u, 8000)) .withFields({C2F(mSampleRate, value).equalTo(8000)}) .withSetter( @@ -75,8 +75,8 @@ class C2SoftAmrNbEnc::IntfImpl : public C2InterfaceHelper { .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::output(0u, 4750)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::output(0u, 4750)) .withFields({C2F(mBitrate, value).inRange(4750, 12200)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -92,13 +92,13 @@ class C2SoftAmrNbEnc::IntfImpl : public C2InterfaceHelper { uint32_t getBitrate() const { return mBitrate->value; } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; }; diff --git a/media/codec2/components/amr_nb_wb/C2SoftAmrWbEnc.cpp b/media/codec2/components/amr_nb_wb/C2SoftAmrWbEnc.cpp index 074493c42a..379cb32fc1 100644 --- a/media/codec2/components/amr_nb_wb/C2SoftAmrWbEnc.cpp +++ b/media/codec2/components/amr_nb_wb/C2SoftAmrWbEnc.cpp @@ -38,38 +38,38 @@ class C2SoftAmrWbEnc::IntfImpl : public C2InterfaceHelper { setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) .withConstValue( - new C2StreamFormatConfig::input(0u, C2FormatAudio)) + new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) .withConstValue( - new C2StreamFormatConfig::output(0u, C2FormatCompressed)) + new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_AMR_WB)) .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::input(0u, 1)) .withFields({C2F(mChannelCount, value).equalTo(1)}) .withSetter((Setter::StrictValueWithNoDeps)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::input(0u, 16000)) .withFields({C2F(mSampleRate, value).equalTo(16000)}) .withSetter( @@ -77,8 +77,8 @@ class C2SoftAmrWbEnc::IntfImpl : public C2InterfaceHelper { .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::output(0u, 6600)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::output(0u, 6600)) .withFields({C2F(mBitrate, value).inRange(6600, 23850)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -94,13 +94,13 @@ class C2SoftAmrWbEnc::IntfImpl : public C2InterfaceHelper { uint32_t getBitrate() const { return mBitrate->value; } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; }; diff --git a/media/codec2/components/aom/C2SoftAomDec.cpp b/media/codec2/components/aom/C2SoftAomDec.cpp index 6be18078d9..4bcc2c669e 100644 --- a/media/codec2/components/aom/C2SoftAomDec.cpp +++ b/media/codec2/components/aom/C2SoftAomDec.cpp @@ -141,7 +141,7 @@ class C2SoftAomDec::IntfImpl : public SimpleInterface::BaseParams { static C2R SizeSetter(bool mayBlock, const C2P& oldMe, - C2P& me) { + C2P& me) { (void)mayBlock; C2R res = C2R::Ok(); if (!me.F(me.v.width).supportsAtAll(me.v.width)) { @@ -586,7 +586,7 @@ bool C2SoftAomDec::outputBuffer( mWidth = img->d_w; mHeight = img->d_h; - C2VideoSizeStreamInfo::output size(0u, mWidth, mHeight); + C2StreamPictureSizeInfo::output size(0u, mWidth, mHeight); std::vector> failures; c2_status_t err = mIntf->config({&size}, C2_MAY_BLOCK, &failures); if (err == C2_OK) { diff --git a/media/codec2/components/avc/C2SoftAvcDec.cpp b/media/codec2/components/avc/C2SoftAvcDec.cpp index 86cd3d8fb6..9290d743d3 100644 --- a/media/codec2/components/avc/C2SoftAvcDec.cpp +++ b/media/codec2/components/avc/C2SoftAvcDec.cpp @@ -198,7 +198,7 @@ public: } static C2R SizeSetter(bool mayBlock, const C2P &oldMe, - C2P &me) { + C2P &me) { (void)mayBlock; C2R res = C2R::Ok(); if (!me.F(me.v.width).supportsAtAll(me.v.width)) { @@ -845,7 +845,7 @@ void C2SoftAvcDec::process( mHeight = s_decode_op.u4_pic_ht; CHECK_EQ(0u, s_decode_op.u4_output_present); - C2VideoSizeStreamInfo::output size(0u, mWidth, mHeight); + C2StreamPictureSizeInfo::output size(0u, mWidth, mHeight); std::vector> failures; c2_status_t err = mIntf->config({&size}, C2_MAY_BLOCK, &failures); if (err == OK) { diff --git a/media/codec2/components/avc/C2SoftAvcEnc.cpp b/media/codec2/components/avc/C2SoftAvcEnc.cpp index 6ddb9ff735..b851908749 100644 --- a/media/codec2/components/avc/C2SoftAvcEnc.cpp +++ b/media/codec2/components/avc/C2SoftAvcEnc.cpp @@ -45,36 +45,36 @@ public: setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::input(0u, C2FormatVideo)) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::GRAPHIC)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::output(0u, C2FormatCompressed)) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_VIDEO_RAW)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_VIDEO_AVC)) .build()); addParameter( - DefineParam(mUsage, C2_NAME_INPUT_STREAM_USAGE_SETTING) + DefineParam(mUsage, C2_PARAMKEY_INPUT_STREAM_USAGE) .withConstValue(new C2StreamUsageTuning::input( 0u, (uint64_t)C2MemoryUsage::CPU_READ)) .build()); addParameter( - DefineParam(mSize, C2_NAME_STREAM_VIDEO_SIZE_SETTING) - .withDefault(new C2VideoSizeStreamTuning::input(0u, 320, 240)) + DefineParam(mSize, C2_PARAMKEY_PICTURE_SIZE) + .withDefault(new C2StreamPictureSizeInfo::input(0u, 320, 240)) .withFields({ C2F(mSize, width).inRange(2, 2560, 2), C2F(mSize, height).inRange(2, 2560, 2), @@ -83,7 +83,7 @@ public: .build()); addParameter( - DefineParam(mFrameRate, C2_NAME_STREAM_FRAME_RATE_SETTING) + DefineParam(mFrameRate, C2_PARAMKEY_FRAME_RATE) .withDefault(new C2StreamFrameRateInfo::output(0u, 30.)) // TODO: More restriction? .withFields({C2F(mFrameRate, value).greaterThan(0.)}) @@ -91,8 +91,8 @@ public: .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::output(0u, 64000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::output(0u, 64000)) .withFields({C2F(mBitrate, value).inRange(4096, 12000000)}) .withSetter(BitrateSetter) .build()); @@ -182,9 +182,9 @@ public: static C2R ProfileLevelSetter( bool mayBlock, C2P &me, - const C2P &size, + const C2P &size, const C2P &frameRate, - const C2P &bitrate) { + const C2P &bitrate) { (void)mayBlock; if (!me.F(me.v.profile).supportsAtAll(me.v.profile)) { me.set().profile = PROFILE_AVC_CONSTRAINED_BASELINE; @@ -325,16 +325,16 @@ public: std::shared_ptr getRequestSync_l() const { return mRequestSync; } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mUsage; - std::shared_ptr mSize; + std::shared_ptr mSize; std::shared_ptr mFrameRate; std::shared_ptr mRequestSync; std::shared_ptr mIntraRefresh; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mProfileLevel; std::shared_ptr mSyncFramePeriod; }; @@ -1332,8 +1332,8 @@ void C2SoftAvcEnc::process( mSpsPpsHeaderReceived = true; - std::unique_ptr csd = - C2StreamCsdInfo::output::AllocUnique(s_encode_op.s_out_buf.u4_bytes, 0u); + std::unique_ptr csd = + C2StreamInitDataInfo::output::AllocUnique(s_encode_op.s_out_buf.u4_bytes, 0u); if (!csd) { ALOGE("CSD allocation failed"); mSignalledError = true; @@ -1492,7 +1492,7 @@ void C2SoftAvcEnc::process( if (IV_IDR_FRAME == s_encode_op.u4_encoded_frame_type) { ALOGV("IDR frame produced"); buffer->setInfo(std::make_shared( - 0u /* stream id */, C2PictureTypeKeyFrame)); + 0u /* stream id */, C2Config::SYNC_FRAME)); } work->worklets.front()->output.buffers.push_back(buffer); } diff --git a/media/codec2/components/base/SimpleC2Component.cpp b/media/codec2/components/base/SimpleC2Component.cpp index b158f8f2b0..44f1fe0677 100644 --- a/media/codec2/components/base/SimpleC2Component.cpp +++ b/media/codec2/components/base/SimpleC2Component.cpp @@ -473,7 +473,7 @@ bool SimpleC2Component::processQueue() { if (!mOutputBlockPool) { c2_status_t err = [this] { // TODO: don't use query_vb - C2StreamFormatConfig::output outputFormat(0u); + C2StreamBufferTypeSetting::output outputFormat(0u); std::vector> params; c2_status_t err = intf()->query_vb( { &outputFormat }, @@ -485,7 +485,7 @@ bool SimpleC2Component::processQueue() { return err; } C2BlockPool::local_id_t poolId = - outputFormat.value == C2FormatVideo + outputFormat.value == C2BufferData::GRAPHIC ? C2BlockPool::BASIC_GRAPHIC : C2BlockPool::BASIC_LINEAR; if (params.size()) { diff --git a/media/codec2/components/flac/C2SoftFlacDec.cpp b/media/codec2/components/flac/C2SoftFlacDec.cpp index 86b16e8a64..10b14ce6e2 100644 --- a/media/codec2/components/flac/C2SoftFlacDec.cpp +++ b/media/codec2/components/flac/C2SoftFlacDec.cpp @@ -37,44 +37,44 @@ public: setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::input(0u, C2FormatCompressed)) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::output(0u, C2FormatAudio)) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_FLAC)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::output(0u, 44100)) .withFields({C2F(mSampleRate, value).inRange(1, 655350)}) .withSetter((Setter::StrictValueWithNoDeps)) .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::output(0u, 1)) .withFields({C2F(mChannelCount, value).inRange(1, 8)}) .withSetter(Setter::StrictValueWithNoDeps) .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::input(0u, 768000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::input(0u, 768000)) .withFields({C2F(mBitrate, value).inRange(1, 21000000)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -99,13 +99,13 @@ public: int32_t getPcmEncodingInfo() const { return mPcmEncodingInfo->value; } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; std::shared_ptr mPcmEncodingInfo; }; diff --git a/media/codec2/components/flac/C2SoftFlacEnc.cpp b/media/codec2/components/flac/C2SoftFlacEnc.cpp index 4ea35c21f9..0ce2543bad 100644 --- a/media/codec2/components/flac/C2SoftFlacEnc.cpp +++ b/media/codec2/components/flac/C2SoftFlacEnc.cpp @@ -34,38 +34,38 @@ public: : C2InterfaceHelper(helper) { setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::input(0u, C2FormatAudio)) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::output(0u, C2FormatCompressed)) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_FLAC)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::input(0u, 44100)) .withFields({C2F(mSampleRate, value).inRange(1, 655350)}) .withSetter((Setter::StrictValueWithNoDeps)) .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::input(0u, 1)) .withFields({C2F(mChannelCount, value).inRange(1, 2)}) .withSetter(Setter::StrictValueWithNoDeps) .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::output(0u, 768000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::output(0u, 768000)) .withFields({C2F(mBitrate, value).inRange(1, 21000000)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -92,13 +92,13 @@ public: int32_t getPcmEncodingInfo() const { return mPcmEncodingInfo->value; } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; std::shared_ptr mPcmEncodingInfo; }; @@ -223,8 +223,8 @@ void C2SoftFlacEnc::process( } if (!mWroteHeader) { - std::unique_ptr csd = - C2StreamCsdInfo::output::AllocUnique(mHeaderOffset, 0u); + std::unique_ptr csd = + C2StreamInitDataInfo::output::AllocUnique(mHeaderOffset, 0u); if (!csd) { ALOGE("CSD allocation failed"); mSignalledError = true; diff --git a/media/codec2/components/g711/C2SoftG711Dec.cpp b/media/codec2/components/g711/C2SoftG711Dec.cpp index 1c71d458c7..504ca787a3 100644 --- a/media/codec2/components/g711/C2SoftG711Dec.cpp +++ b/media/codec2/components/g711/C2SoftG711Dec.cpp @@ -41,18 +41,18 @@ public: setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::input(0u, C2FormatCompressed)) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::output(0u, C2FormatAudio)) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( #ifdef ALAW MEDIA_MIMETYPE_AUDIO_G711_ALAW #else @@ -61,28 +61,28 @@ public: )).build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::output(0u, 8000)) .withFields({C2F(mSampleRate, value).inRange(8000, 48000)}) .withSetter((Setter::StrictValueWithNoDeps)) .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::output(0u, 1)) .withFields({C2F(mChannelCount, value).equalTo(1)}) .withSetter(Setter::StrictValueWithNoDeps) .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::input(0u, 64000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::input(0u, 64000)) .withFields({C2F(mBitrate, value).equalTo(64000)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -94,13 +94,13 @@ public: } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; }; diff --git a/media/codec2/components/gsm/C2SoftGsmDec.cpp b/media/codec2/components/gsm/C2SoftGsmDec.cpp index 7101c799fe..69d4885874 100644 --- a/media/codec2/components/gsm/C2SoftGsmDec.cpp +++ b/media/codec2/components/gsm/C2SoftGsmDec.cpp @@ -36,44 +36,44 @@ class C2SoftGsmDec::IntfImpl : public C2InterfaceHelper { setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::input(0u, C2FormatCompressed)) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::output(0u, C2FormatAudio)) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_MSGSM)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::output(0u, 8000)) .withFields({C2F(mSampleRate, value).equalTo(8000)}) .withSetter((Setter::StrictValueWithNoDeps)) .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::output(0u, 1)) .withFields({C2F(mChannelCount, value).equalTo(1)}) .withSetter(Setter::StrictValueWithNoDeps) .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::input(0u, 13200)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::input(0u, 13200)) .withFields({C2F(mBitrate, value).equalTo(13200)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -85,13 +85,13 @@ class C2SoftGsmDec::IntfImpl : public C2InterfaceHelper { } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; }; diff --git a/media/codec2/components/hevc/C2SoftHevcDec.cpp b/media/codec2/components/hevc/C2SoftHevcDec.cpp index f0d7d887f6..bb8dda03ed 100644 --- a/media/codec2/components/hevc/C2SoftHevcDec.cpp +++ b/media/codec2/components/hevc/C2SoftHevcDec.cpp @@ -192,7 +192,7 @@ public: } static C2R SizeSetter(bool mayBlock, const C2P &oldMe, - C2P &me) { + C2P &me) { (void)mayBlock; C2R res = C2R::Ok(); if (!me.F(me.v.width).supportsAtAll(me.v.width)) { @@ -839,7 +839,7 @@ void C2SoftHevcDec::process( mHeight = s_decode_op.u4_pic_ht; CHECK_EQ(0u, s_decode_op.u4_output_present); - C2VideoSizeStreamInfo::output size(0u, mWidth, mHeight); + C2StreamPictureSizeInfo::output size(0u, mWidth, mHeight); std::vector> failures; c2_status_t err = mIntf->config({&size}, C2_MAY_BLOCK, &failures); diff --git a/media/codec2/components/hevc/C2SoftHevcEnc.cpp b/media/codec2/components/hevc/C2SoftHevcEnc.cpp index 5e6f44f00b..2c0a7a025c 100644 --- a/media/codec2/components/hevc/C2SoftHevcEnc.cpp +++ b/media/codec2/components/hevc/C2SoftHevcEnc.cpp @@ -45,37 +45,37 @@ class C2SoftHevcEnc::IntfImpl : public C2InterfaceHelper { setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) .withConstValue( - new C2StreamFormatConfig::input(0u, C2FormatVideo)) + new C2StreamBufferTypeSetting::input(0u, C2BufferData::GRAPHIC)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) .withConstValue( - new C2StreamFormatConfig::output(0u, C2FormatCompressed)) + new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_VIDEO_RAW)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_VIDEO_HEVC)) .build()); - addParameter(DefineParam(mUsage, C2_NAME_INPUT_STREAM_USAGE_SETTING) + addParameter(DefineParam(mUsage, C2_PARAMKEY_INPUT_STREAM_USAGE) .withConstValue(new C2StreamUsageTuning::input( 0u, (uint64_t)C2MemoryUsage::CPU_READ)) .build()); addParameter( - DefineParam(mSize, C2_NAME_STREAM_VIDEO_SIZE_SETTING) - .withDefault(new C2VideoSizeStreamTuning::input(0u, 320, 240)) + DefineParam(mSize, C2_PARAMKEY_PICTURE_SIZE) + .withDefault(new C2StreamPictureSizeInfo::input(0u, 320, 240)) .withFields({ C2F(mSize, width).inRange(320, 1920, 2), C2F(mSize, height).inRange(128, 1088, 2), @@ -84,7 +84,7 @@ class C2SoftHevcEnc::IntfImpl : public C2InterfaceHelper { .build()); addParameter( - DefineParam(mFrameRate, C2_NAME_STREAM_FRAME_RATE_SETTING) + DefineParam(mFrameRate, C2_PARAMKEY_FRAME_RATE) .withDefault(new C2StreamFrameRateInfo::output(0u, 30.)) .withFields({C2F(mFrameRate, value).greaterThan(0.)}) .withSetter( @@ -92,8 +92,8 @@ class C2SoftHevcEnc::IntfImpl : public C2InterfaceHelper { .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::output(0u, 64000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::output(0u, 64000)) .withFields({C2F(mBitrate, value).inRange(4096, 12000000)}) .withSetter(BitrateSetter) .build()); @@ -162,9 +162,9 @@ class C2SoftHevcEnc::IntfImpl : public C2InterfaceHelper { static C2R ProfileLevelSetter( bool mayBlock, C2P &me, - const C2P &size, + const C2P &size, const C2P &frameRate, - const C2P &bitrate) { + const C2P &bitrate) { (void)mayBlock; if (!me.F(me.v.profile).supportsAtAll(me.v.profile)) { me.set().profile = PROFILE_HEVC_MAIN; @@ -292,15 +292,15 @@ class C2SoftHevcEnc::IntfImpl : public C2InterfaceHelper { } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mUsage; - std::shared_ptr mSize; + std::shared_ptr mSize; std::shared_ptr mFrameRate; std::shared_ptr mRequestSync; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mProfileLevel; std::shared_ptr mSyncFramePeriod; }; @@ -661,8 +661,8 @@ void C2SoftHevcEnc::process(const std::unique_ptr& work, ihevce_out_buf_t s_header_op{}; err = ihevce_encode_header(mCodecCtx, &s_header_op); if (err == IHEVCE_EOK && s_header_op.i4_bytes_generated) { - std::unique_ptr csd = - C2StreamCsdInfo::output::AllocUnique( + std::unique_ptr csd = + C2StreamInitDataInfo::output::AllocUnique( s_header_op.i4_bytes_generated, 0u); if (!csd) { ALOGE("CSD allocation failed"); @@ -746,7 +746,7 @@ void C2SoftHevcEnc::process(const std::unique_ptr& work, ALOGV("IDR frame produced"); buffer->setInfo( std::make_shared( - 0u /* stream id */, C2PictureTypeKeyFrame)); + 0u /* stream id */, C2Config::SYNC_FRAME)); } work->worklets.front()->output.buffers.push_back(buffer); } diff --git a/media/codec2/components/mp3/C2SoftMp3Dec.cpp b/media/codec2/components/mp3/C2SoftMp3Dec.cpp index c8b8397f34..9db6d8f801 100644 --- a/media/codec2/components/mp3/C2SoftMp3Dec.cpp +++ b/media/codec2/components/mp3/C2SoftMp3Dec.cpp @@ -40,29 +40,29 @@ public: setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::input(0u, C2FormatCompressed)) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::output(0u, C2FormatAudio)) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_MPEG)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::output(0u, 44100)) .withFields({C2F(mSampleRate, value).oneOf({8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000})}) @@ -70,15 +70,15 @@ public: .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::output(0u, 2)) .withFields({C2F(mChannelCount, value).inRange(1, 2)}) .withSetter(Setter::StrictValueWithNoDeps) .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::input(0u, 64000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::input(0u, 64000)) .withFields({C2F(mBitrate, value).inRange(8000, 320000)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -90,13 +90,13 @@ public: } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; }; @@ -555,4 +555,3 @@ extern "C" void DestroyCodec2Factory(::C2ComponentFactory* factory) { ALOGV("in %s", __func__); delete factory; } - diff --git a/media/codec2/components/mpeg2/C2SoftMpeg2Dec.cpp b/media/codec2/components/mpeg2/C2SoftMpeg2Dec.cpp index da32ec0275..290677ed44 100644 --- a/media/codec2/components/mpeg2/C2SoftMpeg2Dec.cpp +++ b/media/codec2/components/mpeg2/C2SoftMpeg2Dec.cpp @@ -180,7 +180,7 @@ public: } static C2R SizeSetter(bool mayBlock, const C2P &oldMe, - C2P &me) { + C2P &me) { (void)mayBlock; C2R res = C2R::Ok(); if (!me.F(me.v.width).supportsAtAll(me.v.width)) { @@ -892,7 +892,7 @@ void C2SoftMpeg2Dec::process( ALOGI("Configuring decoder: mWidth %d , mHeight %d ", mWidth, mHeight); - C2VideoSizeStreamInfo::output size(0u, mWidth, mHeight); + C2StreamPictureSizeInfo::output size(0u, mWidth, mHeight); std::vector> failures; c2_status_t err = mIntf->config({&size}, C2_MAY_BLOCK, &failures); @@ -931,7 +931,7 @@ void C2SoftMpeg2Dec::process( ALOGI("Configuring decoder out: mWidth %d , mHeight %d ", mWidth, mHeight); - C2VideoSizeStreamInfo::output size(0u, mWidth, mHeight); + C2StreamPictureSizeInfo::output size(0u, mWidth, mHeight); std::vector> failures; c2_status_t err = mIntf->config({&size}, C2_MAY_BLOCK, &failures); diff --git a/media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp b/media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp index 0b89cff68c..3d4a733714 100644 --- a/media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp +++ b/media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp @@ -186,7 +186,7 @@ public: } static C2R SizeSetter(bool mayBlock, const C2P &oldMe, - C2P &me) { + C2P &me) { (void)mayBlock; C2R res = C2R::Ok(); if (!me.F(me.v.width).supportsAtAll(me.v.width)) { @@ -574,7 +574,7 @@ void C2SoftMpeg4Dec::process( PVSetPostProcType(mDecHandle, 0); if (handleResChange(work)) { ALOGI("Setting width and height"); - C2VideoSizeStreamInfo::output size(0u, mWidth, mHeight); + C2StreamPictureSizeInfo::output size(0u, mWidth, mHeight); std::vector> failures; c2_status_t err = mIntf->config({&size}, C2_MAY_BLOCK, &failures); if (err == OK) { @@ -646,7 +646,7 @@ void C2SoftMpeg4Dec::process( return; } else if (resChange) { ALOGI("Setting width and height"); - C2VideoSizeStreamInfo::output size(0u, mWidth, mHeight); + C2StreamPictureSizeInfo::output size(0u, mWidth, mHeight); std::vector> failures; c2_status_t err = mIntf->config({&size}, C2_MAY_BLOCK, &failures); if (err == OK) { diff --git a/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp b/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp index c8796f3392..89fa59d05d 100644 --- a/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp +++ b/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp @@ -52,26 +52,26 @@ class C2SoftMpeg4Enc::IntfImpl : public C2InterfaceHelper { setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) .withConstValue( - new C2StreamFormatConfig::input(0u, C2FormatVideo)) + new C2StreamBufferTypeSetting::input(0u, C2BufferData::GRAPHIC)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) .withConstValue( - new C2StreamFormatConfig::output(0u, C2FormatCompressed)) + new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_VIDEO_RAW)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( #ifdef MPEG4 MEDIA_MIMETYPE_VIDEO_MPEG4 #else @@ -80,14 +80,14 @@ class C2SoftMpeg4Enc::IntfImpl : public C2InterfaceHelper { )) .build()); - addParameter(DefineParam(mUsage, C2_NAME_INPUT_STREAM_USAGE_SETTING) + addParameter(DefineParam(mUsage, C2_PARAMKEY_INPUT_STREAM_USAGE) .withConstValue(new C2StreamUsageTuning::input( 0u, (uint64_t)C2MemoryUsage::CPU_READ)) .build()); addParameter( - DefineParam(mSize, C2_NAME_STREAM_VIDEO_SIZE_SETTING) - .withDefault(new C2VideoSizeStreamTuning::input(0u, 176, 144)) + DefineParam(mSize, C2_PARAMKEY_PICTURE_SIZE) + .withDefault(new C2StreamPictureSizeInfo::input(0u, 176, 144)) .withFields({ #ifdef MPEG4 C2F(mSize, width).inRange(16, 176, 16), @@ -101,7 +101,7 @@ class C2SoftMpeg4Enc::IntfImpl : public C2InterfaceHelper { .build()); addParameter( - DefineParam(mFrameRate, C2_NAME_STREAM_FRAME_RATE_SETTING) + DefineParam(mFrameRate, C2_PARAMKEY_FRAME_RATE) .withDefault(new C2StreamFrameRateInfo::output(0u, 17.)) // TODO: More restriction? .withFields({C2F(mFrameRate, value).greaterThan(0.)}) @@ -110,8 +110,8 @@ class C2SoftMpeg4Enc::IntfImpl : public C2InterfaceHelper { .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::output(0u, 64000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::output(0u, 64000)) .withFields({C2F(mBitrate, value).inRange(4096, 12000000)}) .withSetter(BitrateSetter) .build()); @@ -217,14 +217,14 @@ class C2SoftMpeg4Enc::IntfImpl : public C2InterfaceHelper { } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mUsage; - std::shared_ptr mSize; + std::shared_ptr mSize; std::shared_ptr mFrameRate; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mProfileLevel; std::shared_ptr mSyncFramePeriod; }; @@ -446,8 +446,8 @@ void C2SoftMpeg4Enc::process( } ++mNumInputFrames; - std::unique_ptr csd = - C2StreamCsdInfo::output::AllocUnique(outputSize, 0u); + std::unique_ptr csd = + C2StreamInitDataInfo::output::AllocUnique(outputSize, 0u); if (!csd) { ALOGE("CSD allocation failed"); mSignalledError = true; @@ -595,7 +595,7 @@ void C2SoftMpeg4Enc::process( work->worklets.front()->output.ordinal.timestamp = inputTimeStamp; if (hintTrack.CodeType == 0) { buffer->setInfo(std::make_shared( - 0u /* stream id */, C2PictureTypeKeyFrame)); + 0u /* stream id */, C2Config::SYNC_FRAME)); } work->worklets.front()->output.buffers.push_back(buffer); } diff --git a/media/codec2/components/opus/C2SoftOpusDec.cpp b/media/codec2/components/opus/C2SoftOpusDec.cpp index 3ce1fd67d3..680712e950 100644 --- a/media/codec2/components/opus/C2SoftOpusDec.cpp +++ b/media/codec2/components/opus/C2SoftOpusDec.cpp @@ -40,44 +40,44 @@ class C2SoftOpusDec::IntfImpl : public C2InterfaceHelper { setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::input(0u, C2FormatCompressed)) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::output(0u, C2FormatAudio)) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_OPUS)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::output(0u, 48000)) .withFields({C2F(mSampleRate, value).equalTo(48000)}) .withSetter((Setter::StrictValueWithNoDeps)) .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::output(0u, 1)) .withFields({C2F(mChannelCount, value).inRange(1, 8)}) .withSetter(Setter::StrictValueWithNoDeps) .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::input(0u, 6000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::input(0u, 6000)) .withFields({C2F(mBitrate, value).inRange(6000, 510000)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -89,13 +89,13 @@ class C2SoftOpusDec::IntfImpl : public C2InterfaceHelper { } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; }; diff --git a/media/codec2/components/opus/C2SoftOpusEnc.cpp b/media/codec2/components/opus/C2SoftOpusEnc.cpp index 68fcea14e1..a0b244387b 100644 --- a/media/codec2/components/opus/C2SoftOpusEnc.cpp +++ b/media/codec2/components/opus/C2SoftOpusEnc.cpp @@ -42,29 +42,29 @@ public: setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::input(0u, C2FormatAudio)) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::output(0u, C2FormatCompressed)) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_OPUS)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::input(0u, 48000)) .withFields({C2F(mSampleRate, value).oneOf({ 8000, 12000, 16000, 24000, 48000})}) @@ -72,15 +72,15 @@ public: .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::input(0u, 1)) .withFields({C2F(mChannelCount, value).inRange(1, 8)}) .withSetter((Setter::StrictValueWithNoDeps)) .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::output(0u, 128000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::output(0u, 128000)) .withFields({C2F(mBitrate, value).inRange(500, 512000)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -104,13 +104,13 @@ public: uint32_t getComplexity() const { return mComplexity->value; } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mComplexity; std::shared_ptr mInputMaxBufSize; }; @@ -423,8 +423,8 @@ void C2SoftOpusEnc::process(const std::unique_ptr& work, int headerLen = WriteOpusHeaders(opusHeader, mSampleRate, header, sizeof(header), mCodecDelay, mSeekPreRoll); - std::unique_ptr csd = - C2StreamCsdInfo::output::AllocUnique(headerLen, 0u); + std::unique_ptr csd = + C2StreamInitDataInfo::output::AllocUnique(headerLen, 0u); if (!csd) { ALOGE("CSD allocation failed"); mSignalledError = true; diff --git a/media/codec2/components/raw/C2SoftRawDec.cpp b/media/codec2/components/raw/C2SoftRawDec.cpp index 5c834814b8..802caa477e 100644 --- a/media/codec2/components/raw/C2SoftRawDec.cpp +++ b/media/codec2/components/raw/C2SoftRawDec.cpp @@ -37,44 +37,44 @@ public: setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::input(0u, C2FormatCompressed)) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::output(0u, C2FormatAudio)) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::output(0u, 44100)) .withFields({C2F(mSampleRate, value).inRange(8000, 192000)}) .withSetter((Setter::StrictValueWithNoDeps)) .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::output(0u, 2)) .withFields({C2F(mChannelCount, value).inRange(1, 8)}) .withSetter(Setter::StrictValueWithNoDeps) .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::input(0u, 64000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::input(0u, 64000)) .withFields({C2F(mBitrate, value).inRange(1, 10000000)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -98,13 +98,13 @@ public: } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; std::shared_ptr mPcmEncodingInfo; }; diff --git a/media/codec2/components/vorbis/C2SoftVorbisDec.cpp b/media/codec2/components/vorbis/C2SoftVorbisDec.cpp index 48825e4421..e7393eeee7 100644 --- a/media/codec2/components/vorbis/C2SoftVorbisDec.cpp +++ b/media/codec2/components/vorbis/C2SoftVorbisDec.cpp @@ -45,44 +45,44 @@ public: setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::input(0u, C2FormatCompressed)) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::output(0u, C2FormatAudio)) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_VORBIS)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::output(0u, 48000)) .withFields({C2F(mSampleRate, value).inRange(8000, 96000)}) .withSetter((Setter::StrictValueWithNoDeps)) .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::output(0u, 1)) .withFields({C2F(mChannelCount, value).inRange(1, 8)}) .withSetter(Setter::StrictValueWithNoDeps) .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::input(0u, 64000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::input(0u, 64000)) .withFields({C2F(mBitrate, value).inRange(32000, 500000)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -94,13 +94,13 @@ public: } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; }; diff --git a/media/codec2/components/vpx/C2SoftVpxDec.cpp b/media/codec2/components/vpx/C2SoftVpxDec.cpp index 9ba23624e1..3120f7af54 100644 --- a/media/codec2/components/vpx/C2SoftVpxDec.cpp +++ b/media/codec2/components/vpx/C2SoftVpxDec.cpp @@ -215,7 +215,7 @@ public: } static C2R SizeSetter(bool mayBlock, const C2P &oldMe, - C2P &me) { + C2P &me) { (void)mayBlock; C2R res = C2R::Ok(); if (!me.F(me.v.width).supportsAtAll(me.v.width)) { @@ -700,7 +700,7 @@ bool C2SoftVpxDec::outputBuffer( mWidth = img->d_w; mHeight = img->d_h; - C2VideoSizeStreamInfo::output size(0u, mWidth, mHeight); + C2StreamPictureSizeInfo::output size(0u, mWidth, mHeight); std::vector> failures; c2_status_t err = mIntf->config({&size}, C2_MAY_BLOCK, &failures); if (err == C2_OK) { diff --git a/media/codec2/components/vpx/C2SoftVpxEnc.cpp b/media/codec2/components/vpx/C2SoftVpxEnc.cpp index 155a84f898..6509a88a94 100644 --- a/media/codec2/components/vpx/C2SoftVpxEnc.cpp +++ b/media/codec2/components/vpx/C2SoftVpxEnc.cpp @@ -633,7 +633,7 @@ void C2SoftVpxEnc::process( std::shared_ptr buffer = createLinearBuffer(block); if (encoded_packet->data.frame.flags & VPX_FRAME_IS_KEY) { buffer->setInfo(std::make_shared( - 0u /* stream id */, C2PictureTypeKeyFrame)); + 0u /* stream id */, C2Config::SYNC_FRAME)); } work->worklets.front()->output.buffers.push_back(buffer); work->worklets.front()->output.ordinal = work->input.ordinal; diff --git a/media/codec2/components/vpx/C2SoftVpxEnc.h b/media/codec2/components/vpx/C2SoftVpxEnc.h index 87ed1a9e8b..5591a49019 100644 --- a/media/codec2/components/vpx/C2SoftVpxEnc.h +++ b/media/codec2/components/vpx/C2SoftVpxEnc.h @@ -229,26 +229,26 @@ class C2SoftVpxEnc::IntfImpl : public C2InterfaceHelper { setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) .withConstValue( - new C2StreamFormatConfig::input(0u, C2FormatVideo)) + new C2StreamBufferTypeSetting::input(0u, C2BufferData::GRAPHIC)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) .withConstValue( - new C2StreamFormatConfig::output(0u, C2FormatCompressed)) + new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_VIDEO_RAW)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( #ifdef VP9 MEDIA_MIMETYPE_VIDEO_VP9 #else @@ -257,14 +257,14 @@ class C2SoftVpxEnc::IntfImpl : public C2InterfaceHelper { )) .build()); - addParameter(DefineParam(mUsage, C2_NAME_INPUT_STREAM_USAGE_SETTING) + addParameter(DefineParam(mUsage, C2_PARAMKEY_INPUT_STREAM_USAGE) .withConstValue(new C2StreamUsageTuning::input( 0u, (uint64_t)C2MemoryUsage::CPU_READ)) .build()); addParameter( - DefineParam(mSize, C2_NAME_STREAM_VIDEO_SIZE_SETTING) - .withDefault(new C2VideoSizeStreamTuning::input(0u, 320, 240)) + DefineParam(mSize, C2_PARAMKEY_PICTURE_SIZE) + .withDefault(new C2StreamPictureSizeInfo::input(0u, 320, 240)) .withFields({ C2F(mSize, width).inRange(2, 2048, 2), C2F(mSize, height).inRange(2, 2048, 2), @@ -285,7 +285,7 @@ class C2SoftVpxEnc::IntfImpl : public C2InterfaceHelper { .build()); addParameter( - DefineParam(mFrameRate, C2_NAME_STREAM_FRAME_RATE_SETTING) + DefineParam(mFrameRate, C2_PARAMKEY_FRAME_RATE) .withDefault(new C2StreamFrameRateInfo::output(0u, 30.)) // TODO: More restriction? .withFields({C2F(mFrameRate, value).greaterThan(0.)}) @@ -312,8 +312,8 @@ class C2SoftVpxEnc::IntfImpl : public C2InterfaceHelper { .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::output(0u, 64000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::output(0u, 64000)) .withFields({C2F(mBitrate, value).inRange(4096, 40000000)}) .withSetter(BitrateSetter) .build()); @@ -416,18 +416,18 @@ class C2SoftVpxEnc::IntfImpl : public C2InterfaceHelper { } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mUsage; - std::shared_ptr mSize; + std::shared_ptr mSize; std::shared_ptr mFrameRate; std::shared_ptr mLayering; std::shared_ptr mIntraRefresh; std::shared_ptr mRequestSync; std::shared_ptr mSyncFramePeriod; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mBitrateMode; std::shared_ptr mProfileLevel; }; diff --git a/media/codec2/components/xaac/C2SoftXaacDec.cpp b/media/codec2/components/xaac/C2SoftXaacDec.cpp index 1c0e70b2a2..86739c24a2 100644 --- a/media/codec2/components/xaac/C2SoftXaacDec.cpp +++ b/media/codec2/components/xaac/C2SoftXaacDec.cpp @@ -66,29 +66,29 @@ public: setDerivedInstance(this); addParameter( - DefineParam(mInputFormat, C2_NAME_INPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::input(0u, C2FormatCompressed)) + DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mOutputFormat, C2_NAME_OUTPUT_STREAM_FORMAT_SETTING) - .withConstValue(new C2StreamFormatConfig::output(0u, C2FormatAudio)) + DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE) + .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR)) .build()); addParameter( - DefineParam(mInputMediaType, C2_NAME_INPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_AAC)) .build()); addParameter( - DefineParam(mOutputMediaType, C2_NAME_OUTPUT_PORT_MIME_SETTING) - .withConstValue(AllocSharedString( + DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE) + .withConstValue(AllocSharedString( MEDIA_MIMETYPE_AUDIO_RAW)) .build()); addParameter( - DefineParam(mSampleRate, C2_NAME_STREAM_SAMPLE_RATE_SETTING) + DefineParam(mSampleRate, C2_PARAMKEY_SAMPLE_RATE) .withDefault(new C2StreamSampleRateInfo::output(0u, 44100)) .withFields({C2F(mSampleRate, value).oneOf({ 7350, 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 @@ -97,15 +97,15 @@ public: .build()); addParameter( - DefineParam(mChannelCount, C2_NAME_STREAM_CHANNEL_COUNT_SETTING) + DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT) .withDefault(new C2StreamChannelCountInfo::output(0u, 1)) .withFields({C2F(mChannelCount, value).inRange(1, 8)}) .withSetter(Setter::StrictValueWithNoDeps) .build()); addParameter( - DefineParam(mBitrate, C2_NAME_STREAM_BITRATE_SETTING) - .withDefault(new C2BitrateTuning::input(0u, 64000)) + DefineParam(mBitrate, C2_PARAMKEY_BITRATE) + .withDefault(new C2StreamBitrateInfo::input(0u, 64000)) .withFields({C2F(mBitrate, value).inRange(8000, 960000)}) .withSetter(Setter::NonStrictValueWithNoDeps) .build()); @@ -116,10 +116,10 @@ public: .build()); addParameter( - DefineParam(mAacFormat, C2_NAME_STREAM_AAC_FORMAT_SETTING) - .withDefault(new C2StreamAacFormatInfo::input(0u, C2AacStreamFormatRaw)) + DefineParam(mAacFormat, C2_PARAMKEY_AAC_PACKAGING) + .withDefault(new C2StreamAacFormatInfo::input(0u, C2Config::AAC_PACKAGING_RAW)) .withFields({C2F(mAacFormat, value).oneOf({ - C2AacStreamFormatRaw, C2AacStreamFormatAdts + C2Config::AAC_PACKAGING_RAW, C2Config::AAC_PACKAGING_ADTS })}) .withSetter(Setter::StrictValueWithNoDeps) .build()); @@ -203,7 +203,7 @@ public: .build()); } - bool isAdts() const { return mAacFormat->value == C2AacStreamFormatAdts; } + bool isAdts() const { return mAacFormat->value == C2Config::AAC_PACKAGING_ADTS; } uint32_t getBitrate() const { return mBitrate->value; } static C2R ProfileLevelSetter(bool mayBlock, C2P &me) { (void)mayBlock; @@ -218,13 +218,13 @@ public: int32_t getDrcEffectType() const { return mDrcEffectType->value; } private: - std::shared_ptr mInputFormat; - std::shared_ptr mOutputFormat; - std::shared_ptr mInputMediaType; - std::shared_ptr mOutputMediaType; + std::shared_ptr mInputFormat; + std::shared_ptr mOutputFormat; + std::shared_ptr mInputMediaType; + std::shared_ptr mOutputMediaType; std::shared_ptr mSampleRate; std::shared_ptr mChannelCount; - std::shared_ptr mBitrate; + std::shared_ptr mBitrate; std::shared_ptr mInputMaxBufSize; std::shared_ptr mAacFormat; std::shared_ptr mProfileLevel; diff --git a/media/codec2/core/include/C2Buffer.h b/media/codec2/core/include/C2Buffer.h index c428122a1c..3d3587c513 100644 --- a/media/codec2/core/include/C2Buffer.h +++ b/media/codec2/core/include/C2Buffer.h @@ -1994,7 +1994,6 @@ public: GRAPHIC, ///< the buffer contains a single graphic block GRAPHIC_CHUNKS, ///< the buffer contains one of more graphic blocks }; - typedef type_t Type; // deprecated /** * Gets the type of this buffer (data). @@ -2042,23 +2041,6 @@ public: */ const C2BufferData data() const; - /** - * These will still work if used in onDeathNotify. - */ -#if 0 - inline std::shared_ptr asLinearBuffer() const { - return mType == LINEAR ? std::shared_ptr::reinterpret_cast(this) : nullptr; - } - - inline std::shared_ptr asGraphicBuffer() const { - return mType == GRAPHIC ? std::shared_ptr::reinterpret_cast(this) : nullptr; - } - - inline std::shared_ptr asCircularBuffer() const { - return mType == CIRCULAR ? std::shared_ptr::reinterpret_cast(this) : nullptr; - } -#endif - ///@name Pre-destroy notification handling ///@{ @@ -2163,8 +2145,6 @@ public: */ static std::shared_ptr CreateGraphicBuffer(const C2ConstGraphicBlock &block); - - protected: // no public constructor explicit C2Buffer(const std::vector &blocks); @@ -2173,7 +2153,6 @@ protected: private: class Impl; std::shared_ptr mImpl; -// Type _mType; }; /** @@ -2200,109 +2179,6 @@ public: /// @} -/// \cond INTERNAL - -/// \todo These are no longer used - -/// \addtogroup linear -/// @{ - -/** \deprecated */ -class C2LinearBuffer - : public C2Buffer, public _C2LinearRangeAspect, - public std::enable_shared_from_this { -public: - /** \todo what is this? */ - const C2Handle *handle() const; - -protected: - inline C2LinearBuffer(const C2ConstLinearBlock &block); - -private: - class Impl; - Impl *mImpl; -}; - -class C2ReadCursor; - -class C2WriteCursor { -public: - uint32_t remaining() const; // remaining data to be read - void commit(); // commits the current position. discard data before current position - void reset() const; // resets position to the last committed position - // slices off at most |size| bytes, and moves cursor ahead by the number of bytes - // sliced off. - C2ReadCursor slice(uint32_t size) const; - // slices off at most |size| bytes, and moves cursor ahead by the number of bytes - // sliced off. - C2WriteCursor reserve(uint32_t size); - // bool read(T&); - // bool write(T&); - C2Fence waitForSpace(uint32_t size); -}; - -/// @} - -/// \addtogroup graphic -/// @{ - -struct C2ColorSpace { -//public: - enum Standard { - BT601, - BT709, - BT2020, - // TODO - }; - - enum Range { - LIMITED, - FULL, - // TODO - }; - - enum TransferFunction { - BT709Transfer, - BT2020Transfer, - HybridLogGamma2, - HybridLogGamma4, - // TODO - }; -}; - -/** \deprecated */ -class C2GraphicBuffer : public C2Buffer { -public: - // constant attributes - inline uint32_t width() const { return mWidth; } - inline uint32_t height() const { return mHeight; } - inline uint32_t format() const { return mFormat; } - inline const C2MemoryUsage usage() const { return mUsage; } - - // modifiable attributes - - - virtual const C2ColorSpace colorSpace() const = 0; - // best effort - virtual void setColorSpace_be(const C2ColorSpace &colorSpace) = 0; - virtual bool setColorSpace(const C2ColorSpace &colorSpace) = 0; - - const C2Handle *handle() const; - -protected: - uint32_t mWidth; - uint32_t mHeight; - uint32_t mFormat; - C2MemoryUsage mUsage; - - class Impl; - Impl *mImpl; -}; - -/// @} - -/// \endcond - /// @} #endif // C2BUFFER_H_ diff --git a/media/codec2/core/include/C2Config.h b/media/codec2/core/include/C2Config.h index fb6edb6114..9545c45375 100644 --- a/media/codec2/core/include/C2Config.h +++ b/media/codec2/core/include/C2Config.h @@ -240,19 +240,6 @@ enum C2ParamIndexKind : C2Param::type_index_t { kParamIndexTimestampGapAdjustment, // input-surface, struct kParamIndexSurfaceAllocator, // u32 - - // deprecated indices due to renaming - kParamIndexAacStreamFormat = kParamIndexAacPackaging, - kParamIndexCsd = kParamIndexInitData, - kParamIndexMaxVideoSizeHint = kParamIndexMaxPictureSize, - kParamIndexMime = kParamIndexMediaType, - kParamIndexRequestedInfos = kParamIndexSubscribedParamIndices, - - - // deprecated indices due to removal - kParamIndexSupportedParams = 0xDEAD0000, - kParamIndexReadOnlyParams, - kParamIndexTemporal, }; } @@ -337,14 +324,8 @@ constexpr char C2_PARAMKEY_COMPONENT_KIND[] = "component.kind"; // read-only typedef C2GlobalParam, kParamIndexDomain> C2ComponentDomainSetting; -typedef C2ComponentDomainSetting C2ComponentDomainInfo; // deprecated -typedef C2Component::domain_t C2DomainKind; // deprecated constexpr char C2_PARAMKEY_COMPONENT_DOMAIN[] = "component.domain"; -constexpr C2Component::domain_t C2DomainAudio = C2Component::DOMAIN_AUDIO; // deprecated -constexpr C2Component::domain_t C2DomainOther = C2Component::DOMAIN_OTHER; // deprecate -constexpr C2Component::domain_t C2DomainVideo = C2Component::DOMAIN_VIDEO; // deprecate - /** * Component attributes. * @@ -359,9 +340,6 @@ typedef C2GlobalParam, kPa C2ComponentAttributesSetting; constexpr char C2_PARAMKEY_COMPONENT_ATTRIBUTES[] = "component.attributes"; -// deprecated -typedef C2ComponentAttributesSetting C2ComponentTemporalInfo; - /** * Time stretching. * @@ -707,7 +685,6 @@ struct C2ProfileLevelStruct { typedef C2StreamParam C2StreamProfileLevelInfo; constexpr char C2_PARAMKEY_PROFILE_LEVEL[] = "coded.pl"; -#define C2_PARAMKEY_STREAM_PROFILE_LEVEL C2_PARAMKEY_PROFILE_LEVEL /** * Codec-specific initialization data. @@ -719,9 +696,7 @@ constexpr char C2_PARAMKEY_PROFILE_LEVEL[] = "coded.pl"; * TODO: define for other codecs. */ typedef C2StreamParam C2StreamInitDataInfo; -typedef C2StreamInitDataInfo C2StreamCsdInfo; // deprecated constexpr char C2_PARAMKEY_INIT_DATA[] = "coded.init-data"; -#define C2_PARAMKEY_STREAM_INIT_DATA C2_PARAMKEY_INIT_DATA /** * Supplemental Data. @@ -781,11 +756,8 @@ constexpr char C2_PARAMKEY_SUBSCRIBED_SUPPLEMENTAL_DATA[] = "output.subscribed-s * port media type. */ typedef C2PortParam C2PortMediaTypeSetting; -typedef C2PortMediaTypeSetting C2PortMimeConfig; // deprecated constexpr char C2_PARAMKEY_INPUT_MEDIA_TYPE[] = "input.media-type"; constexpr char C2_PARAMKEY_OUTPUT_MEDIA_TYPE[] = "output.media-type"; -#define C2_NAME_INPUT_PORT_MIME_SETTING C2_PARAMKEY_INPUT_MEDIA_TYPE -#define C2_NAME_OUTPUT_PORT_MIME_SETTING C2_PARAMKEY_OUTPUT_MEDIA_TYPE typedef C2StreamParam C2StreamMediaTypeSetting; @@ -808,24 +780,20 @@ typedef C2StreamParam C2StreamMe */ typedef C2PortParam C2PortRequestedDelayTuning; -typedef C2PortRequestedDelayTuning C2PortRequestedLatencyTuning; // deprecated constexpr char C2_PARAMKEY_INPUT_DELAY_REQUEST[] = "input.delay.requested"; constexpr char C2_PARAMKEY_OUTPUT_DELAY_REQUEST[] = "output.delay.requested"; typedef C2GlobalParam C2RequestedPipelineDelayTuning; -typedef C2RequestedPipelineDelayTuning C2ComponentRequestedLatencyTuning; // deprecated constexpr char C2_PARAMKEY_PIPELINE_DELAY_REQUEST[] = "pipeline-delay.requested"; // read-only typedef C2PortParam C2PortActualDelayTuning; -typedef C2PortActualDelayTuning C2PortLatencyInfo; // deprecated constexpr char C2_PARAMKEY_INPUT_DELAY[] = "input.delay.actual"; constexpr char C2_PARAMKEY_OUTPUT_DELAY[] = "output.delay.actual"; // read-only typedef C2GlobalParam C2ActualPipelineDelayTuning; -typedef C2ActualPipelineDelayTuning C2ComponentLatencyInfo; // deprecated constexpr char C2_PARAMKEY_PIPELINE_DELAY[] = "algo.delay.actual"; /** @@ -875,7 +843,6 @@ constexpr char C2_PARAMKEY_OUTPUT_REORDER_KEY[] = "output.reorder.key"; */ // private typedef C2PortParam C2PortStreamCountTuning; -typedef C2PortStreamCountTuning C2PortStreamCountConfig; // deprecated constexpr char C2_PARAMKEY_INPUT_STREAM_COUNT[] = "input.stream-count"; constexpr char C2_PARAMKEY_OUTPUT_STREAM_COUNT[] = "output.stream-count"; @@ -985,20 +952,9 @@ constexpr char C2_PARAMKEY_MAX_PRIVATE_BUFFER_COUNT[] = "algo.buffers.max-count" typedef C2StreamParam>, kParamIndexBufferType> C2StreamBufferTypeSetting; - -constexpr C2BufferData::type_t C2FormatAudio = C2BufferData::LINEAR; // deprecated -constexpr C2BufferData::type_t C2FormatCompressed = C2BufferData::LINEAR; // deprecated -constexpr C2BufferData::type_t C2FormatVideo = C2BufferData::GRAPHIC; // deprecated -typedef C2BufferData::type_t C2FormatKind; // deprecated - -typedef C2StreamBufferTypeSetting C2StreamFormatConfig; // deprecated constexpr char C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE[] = "input.buffers.type"; constexpr char C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE[] = "output.buffers.type"; -// deprecated -#define C2_NAME_INPUT_STREAM_FORMAT_SETTING C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE -#define C2_NAME_OUTPUT_STREAM_FORMAT_SETTING C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE - /** * Memory usage. * @@ -1007,8 +963,6 @@ constexpr char C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE[] = "output.buffers.type"; typedef C2StreamParam C2StreamUsageTuning; constexpr char C2_PARAMKEY_INPUT_STREAM_USAGE[] = "input.buffers.usage"; constexpr char C2_PARAMKEY_OUTPUT_STREAM_USAGE[] = "output.buffers.usage"; -// deprecated -#define C2_NAME_INPUT_STREAM_USAGE_SETTING C2_PARAMKEY_INPUT_STREAM_USAGE /** * Picture (video or image frame) size. @@ -1068,8 +1022,6 @@ typedef C2StreamParam C2StreamM constexpr char C2_PARAMKEY_INPUT_MAX_BUFFER_SIZE[] = "input.buffers.max-size"; constexpr char C2_PARAMKEY_OUTPUT_MAX_BUFFER_SIZE[] = "output.buffers.max-size"; -#define C2_NAME_STREAM_MAX_BUFFER_SIZE_SETTING C2_PARAMKEY_INPUT_MAX_BUFFER_SIZE - /* ---------------------------------------- misc. state ---------------------------------------- */ /** @@ -1170,9 +1122,7 @@ constexpr char C2_PARAMKEY_SECURE_MODE[] = "algo.secure-mode"; * Bitrate */ typedef C2StreamParam C2StreamBitrateInfo; -typedef C2StreamBitrateInfo C2BitrateTuning; // deprecated constexpr char C2_PARAMKEY_BITRATE[] = "coded.bitrate"; -#define C2_NAME_STREAM_BITRATE_SETTING C2_PARAMKEY_BITRATE /** * Bitrate mode. @@ -1261,15 +1211,8 @@ constexpr char C2_PARAMKEY_PREPEND_HEADER_MODE[] = "output.buffers.prepend-heade * * This is used for the output of the video decoder, and the input of the video encoder. */ -typedef C2PictureSizeStruct C2VideoSizeStruct; // deprecated - typedef C2StreamParam C2StreamPictureSizeInfo; constexpr char C2_PARAMKEY_PICTURE_SIZE[] = "raw.size"; -#define C2_PARAMKEY_STREAM_PICTURE_SIZE C2_PARAMKEY_PICTURE_SIZE -#define C2_NAME_STREAM_VIDEO_SIZE_INFO C2_PARAMKEY_PICTURE_SIZE -typedef C2StreamPictureSizeInfo C2VideoSizeStreamInfo; // deprecated -typedef C2StreamPictureSizeInfo C2VideoSizeStreamTuning; // deprecated -#define C2_NAME_STREAM_VIDEO_SIZE_SETTING C2_PARAMKEY_PICTURE_SIZE /** * Crop rectangle. @@ -1344,12 +1287,10 @@ typedef C2StreamParam, kParamIndexScalingMethod> C2StreamScalingMethodTuning; constexpr char C2_PARAMKEY_SCALING_MODE[] = "raw.scaling-method"; -#define C2_PARAMKEY_STREAM_SCALING_MODE C2_PARAMKEY_SCALING_MODE typedef C2StreamParam C2StreamScaledPictureSizeTuning; constexpr char C2_PARAMKEY_SCALED_PICTURE_SIZE[] = "raw.scaled-size"; -#define C2_PARAMKEY_STREAM_SCALED_PICTURE_SIZE C2_PARAMKEY_SCALED_PICTURE_SIZE typedef C2StreamParam C2StreamScaledCropRectTuning; @@ -1504,15 +1445,8 @@ C2ENUM(C2Color::matrix_t, uint32_t, MATRIX_BT2020_CONSTANT, ///< Rec.ITU-R BT.2020 constant luminance MATRIX_VENDOR_START = 0x80, ///< vendor-specific matrix coefficient values start here MATRIX_OTHER = 0xff, ///< max value, reserved for undefined values - - MATRIX_SMPTE240M = MATRIX_240M, // deprecated - MATRIX_BT2020CONSTANT = MATRIX_BT2020_CONSTANT, // deprecated ) -constexpr C2Color::matrix_t MATRIX_BT470_6M = MATRIX_FCC47_73_682; // deprecated -constexpr C2Color::matrix_t MATRIX_BT709_5 = MATRIX_BT709; // deprecated -constexpr C2Color::matrix_t MATRIX_BT601_6 = MATRIX_BT601; // deprecated - struct C2ColorAspectsStruct { C2Color::range_t range; C2Color::primaries_t primaries; @@ -1635,7 +1569,6 @@ constexpr char C2_PARAMKEY_BLOCK_RATE[] = "coded.block-rate"; */ typedef C2StreamParam C2StreamFrameRateInfo; constexpr char C2_PARAMKEY_FRAME_RATE[] = "coded.frame-rate"; -#define C2_NAME_STREAM_FRAME_RATE_SETTING C2_PARAMKEY_FRAME_RATE typedef C2PortParam C2PortFrameRateInfo; constexpr char C2_PARAMKEY_INPUT_FRAME_RATE[] = "input.frame-rate"; @@ -1668,9 +1601,6 @@ C2ENUM(C2Config::picture_type_t, uint32_t, B_FRAME = (1 << 3), ///< backward predicted (out-of-order) frame ) -typedef C2Config::picture_type_t C2PictureTypeMask; // deprecated -constexpr C2Config::picture_type_t C2PictureTypeKeyFrame = C2Config::SYNC_FRAME; // deprecated - /** * Allowed picture types. */ @@ -1750,8 +1680,6 @@ constexpr char C2_PARAMKEY_REQUEST_SYNC_FRAME[] = "coding.request-sync-frame"; typedef C2StreamParam C2StreamSyncFrameIntervalTuning; constexpr char C2_PARAMKEY_SYNC_FRAME_INTERVAL[] = "coding.sync-frame-interval"; -// deprecated -#define C2_PARAMKEY_SYNC_FRAME_PERIOD C2_PARAMKEY_SYNC_FRAME_INTERVAL /** * Temporal layering @@ -1885,8 +1813,6 @@ constexpr char C2_PARAMKEY_TILE_HANDLING[] = "coding.tile-handling"; typedef C2StreamParam C2StreamSampleRateInfo; constexpr char C2_PARAMKEY_SAMPLE_RATE[] = "raw.sample-rate"; constexpr char C2_PARAMKEY_CODED_SAMPLE_RATE[] = "coded.sample-rate"; -// deprecated -#define C2_NAME_STREAM_SAMPLE_RATE_SETTING C2_PARAMKEY_SAMPLE_RATE /** * Channel count. @@ -1894,8 +1820,6 @@ constexpr char C2_PARAMKEY_CODED_SAMPLE_RATE[] = "coded.sample-rate"; typedef C2StreamParam C2StreamChannelCountInfo; constexpr char C2_PARAMKEY_CHANNEL_COUNT[] = "raw.channel-count"; constexpr char C2_PARAMKEY_CODED_CHANNEL_COUNT[] = "coded.channel-count"; -// deprecated -#define C2_NAME_STREAM_CHANNEL_COUNT_SETTING C2_PARAMKEY_CHANNEL_COUNT /** * Max channel count. Used to limit the number of coded or decoded channels. @@ -2005,16 +1929,10 @@ C2ENUM(C2Config::aac_packaging_t, uint32_t, AAC_PACKAGING_ADTS ) -typedef C2Config::aac_packaging_t C2AacStreamFormatKind; // deprecated -// deprecated -constexpr C2Config::aac_packaging_t C2AacStreamFormatRaw = C2Config::AAC_PACKAGING_RAW; -constexpr C2Config::aac_packaging_t C2AacStreamFormatAdts = C2Config::AAC_PACKAGING_ADTS; - typedef C2StreamParam>, kParamIndexAacPackaging> C2StreamAacPackagingInfo; typedef C2StreamAacPackagingInfo C2StreamAacFormatInfo; constexpr char C2_PARAMKEY_AAC_PACKAGING[] = "coded.aac-packaging"; -#define C2_NAME_STREAM_AAC_FORMAT_SETTING C2_PARAMKEY_AAC_PACKAGING /* ================================ PLATFORM-DEFINED PARAMETERS ================================ */ @@ -2134,7 +2052,6 @@ constexpr char C2_PARAMKEY_SURFACE_SCALING_MODE[] = "raw.surface-scaling"; typedef C2GlobalParam C2InputSurfaceEosTuning; constexpr char C2_PARAMKEY_INPUT_SURFACE_EOS[] = "input-surface.eos"; -#define C2_NAME_INPUT_SURFACE_EOS_TUNING C2_PARAMKEY_INPUT_SURFACE_EOS /** * Start/suspend/resume/stop controls and timestamps for input surface. diff --git a/media/codec2/core/include/C2Param.h b/media/codec2/core/include/C2Param.h index efc5c8944c..d264bf3c91 100644 --- a/media/codec2/core/include/C2Param.h +++ b/media/codec2/core/include/C2Param.h @@ -1012,15 +1012,6 @@ public: _mNamedValues(_NamedValuesGetter::getNamedValues()), _mFieldId(offset) {} -/* - template::type> - inline C2FieldDescriptor(T* offset, const char *name) - : _mType(this->GetType((B*)nullptr)), - _mExtent(std::is_array::value ? std::extent::value : 1), - _mName(name), - _mFieldId(offset) {} -*/ - /// \deprecated template::type> inline C2FieldDescriptor(S*, T S::* field, const char *name) diff --git a/media/codec2/hidl/1.0/utils/InputSurface.cpp b/media/codec2/hidl/1.0/utils/InputSurface.cpp index 2cbe64b967..85c44c3146 100644 --- a/media/codec2/hidl/1.0/utils/InputSurface.cpp +++ b/media/codec2/hidl/1.0/utils/InputSurface.cpp @@ -45,7 +45,7 @@ public: setDerivedInstance(this); addParameter( - DefineParam(mEos, C2_NAME_INPUT_SURFACE_EOS_TUNING) + DefineParam(mEos, C2_PARAMKEY_INPUT_SURFACE_EOS) .withDefault(new C2InputSurfaceEosTuning(false)) .withFields({C2F(mEos, value).oneOf({true, false})}) .withSetter(EosSetter) diff --git a/media/codec2/hidl/1.0/utils/InputSurfaceConnection.cpp b/media/codec2/hidl/1.0/utils/InputSurfaceConnection.cpp index 1024f50be0..c9932ef4f4 100644 --- a/media/codec2/hidl/1.0/utils/InputSurfaceConnection.cpp +++ b/media/codec2/hidl/1.0/utils/InputSurfaceConnection.cpp @@ -124,7 +124,7 @@ struct InputSurfaceConnection::Impl : public ComponentWrapper { } // TODO: read settings properly from the interface - C2VideoSizeStreamTuning::input inputSize; + C2StreamPictureSizeInfo::input inputSize; C2StreamUsageTuning::input usage; c2_status_t c2Status = queryFromSink({ &inputSize, &usage }, {}, diff --git a/media/codec2/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.cpp b/media/codec2/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.cpp index 31da111a89..1f36270312 100644 --- a/media/codec2/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.cpp +++ b/media/codec2/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.cpp @@ -93,14 +93,14 @@ void workDone( std::vector> failures; for (size_t i = 0; i < updates.size(); ++i) { C2Param* param = updates[i].get(); - if (param->index() == C2StreamCsdInfo::output::PARAM_TYPE) { + if (param->index() == C2StreamInitDataInfo::output::PARAM_TYPE) { csd = true; } else if ((param->index() == C2StreamSampleRateInfo::output::PARAM_TYPE) || (param->index() == C2StreamChannelCountInfo::output::PARAM_TYPE) || (param->index() == - C2VideoSizeStreamInfo::output::PARAM_TYPE)) { + C2StreamPictureSizeInfo::output::PARAM_TYPE)) { configParam.push_back(param); } } diff --git a/media/codec2/hidl/1.0/vts/functional/video/VtsHidlC2V1_0TargetVideoEncTest.cpp b/media/codec2/hidl/1.0/vts/functional/video/VtsHidlC2V1_0TargetVideoEncTest.cpp index 95d1b726ee..7db41c090b 100644 --- a/media/codec2/hidl/1.0/vts/functional/video/VtsHidlC2V1_0TargetVideoEncTest.cpp +++ b/media/codec2/hidl/1.0/vts/functional/video/VtsHidlC2V1_0TargetVideoEncTest.cpp @@ -229,7 +229,7 @@ void validateComponent( // Set Default config param. bool Codec2VideoEncHidlTest::setupConfigParam(int32_t nWidth, int32_t nHeight) { std::vector> failures; - C2VideoSizeStreamTuning::input inputSize(0u, nWidth, nHeight); + C2StreamPictureSizeInfo::input inputSize(0u, nWidth, nHeight); std::vector configParam{&inputSize}; c2_status_t status = mComponent->config(configParam, C2_DONT_BLOCK, &failures); diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp index ff2419d03b..c0195bfc94 100644 --- a/media/codec2/sfplugin/CCodecBufferChannel.cpp +++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp @@ -186,7 +186,7 @@ public: * MediaCodec behavior. */ virtual status_t registerCsd( - const C2StreamCsdInfo::output * /* csd */, + const C2StreamInitDataInfo::output * /* csd */, size_t * /* index */, sp * /* clientBuffer */) = 0; @@ -1187,7 +1187,7 @@ public: } status_t registerCsd( - const C2StreamCsdInfo::output *csd, + const C2StreamInitDataInfo::output *csd, size_t *index, sp *clientBuffer) final { sp c2Buffer; @@ -1286,7 +1286,7 @@ public: } status_t registerCsd( - const C2StreamCsdInfo::output *csd, + const C2StreamInitDataInfo::output *csd, size_t *index, sp *clientBuffer) final { sp newBuffer = new LocalLinearBuffer( @@ -2153,7 +2153,7 @@ status_t CCodecBufferChannel::start( 1 << C2PlatformAllocatorStore::BUFFERQUEUE); if (inputFormat != nullptr) { - bool graphic = (iStreamFormat.value == C2FormatVideo); + bool graphic = (iStreamFormat.value == C2BufferData::GRAPHIC); std::shared_ptr pool; { Mutexed::Locked pools(mBlockPools); @@ -2274,7 +2274,7 @@ status_t CCodecBufferChannel::start( outputGeneration = output->generation; } - bool graphic = (oStreamFormat.value == C2FormatVideo); + bool graphic = (oStreamFormat.value == C2BufferData::GRAPHIC); C2BlockPool::local_id_t outputPoolId_; { @@ -2447,7 +2447,7 @@ status_t CCodecBufferChannel::requestInitialInputBuffers() { return OK; } - C2StreamFormatConfig::output oStreamFormat(0u); + C2StreamBufferTypeSetting::output oStreamFormat(0u); c2_status_t err = mComponent->query({ &oStreamFormat }, {}, C2_DONT_BLOCK, nullptr); if (err != C2_OK) { return UNKNOWN_ERROR; @@ -2734,7 +2734,7 @@ bool CCodecBufferChannel::handleWork( // TODO: properly translate these to metadata switch (info->coreIndex().coreIndex()) { case C2StreamPictureTypeMaskInfo::CORE_INDEX: - if (((C2StreamPictureTypeMaskInfo *)info.get())->value & C2PictureTypeKeyFrame) { + if (((C2StreamPictureTypeMaskInfo *)info.get())->value & C2Config::SYNC_FRAME) { flags |= MediaCodec::BUFFER_FLAG_SYNCFRAME; } break; diff --git a/media/codec2/sfplugin/utils/Codec2Mapper.cpp b/media/codec2/sfplugin/utils/Codec2Mapper.cpp index 0a6a717163..6da131fd45 100644 --- a/media/codec2/sfplugin/utils/Codec2Mapper.cpp +++ b/media/codec2/sfplugin/utils/Codec2Mapper.cpp @@ -101,7 +101,7 @@ ALookup sColorMatricesSf = { { C2Color::MATRIX_BT709, ColorAspects::MatrixBT709_5 }, { C2Color::MATRIX_FCC47_73_682, ColorAspects::MatrixBT470_6M }, { C2Color::MATRIX_BT601, ColorAspects::MatrixBT601_6 }, - { C2Color::MATRIX_SMPTE240M, ColorAspects::MatrixSMPTE240M }, + { C2Color::MATRIX_240M, ColorAspects::MatrixSMPTE240M }, { C2Color::MATRIX_BT2020, ColorAspects::MatrixBT2020 }, { C2Color::MATRIX_BT2020_CONSTANT, ColorAspects::MatrixBT2020Constant }, { C2Color::MATRIX_OTHER, ColorAspects::MatrixOther }, @@ -855,19 +855,19 @@ bool C2Mapper::map( switch (primaries) { case C2Color::PRIMARIES_BT601_525: - *dataSpace |= (matrix == C2Color::MATRIX_SMPTE240M + *dataSpace |= (matrix == C2Color::MATRIX_240M || matrix == C2Color::MATRIX_BT709) ? HAL_DATASPACE_STANDARD_BT601_525_UNADJUSTED : HAL_DATASPACE_STANDARD_BT601_525; break; case C2Color::PRIMARIES_BT601_625: - *dataSpace |= (matrix == C2Color::MATRIX_SMPTE240M + *dataSpace |= (matrix == C2Color::MATRIX_240M || matrix == C2Color::MATRIX_BT709) ? HAL_DATASPACE_STANDARD_BT601_625_UNADJUSTED : HAL_DATASPACE_STANDARD_BT601_625; break; case C2Color::PRIMARIES_BT2020: - *dataSpace |= (matrix == C2Color::MATRIX_BT2020CONSTANT + *dataSpace |= (matrix == C2Color::MATRIX_BT2020_CONSTANT ? HAL_DATASPACE_STANDARD_BT2020_CONSTANT_LUMINANCE : HAL_DATASPACE_STANDARD_BT2020); break; diff --git a/media/codec2/tests/C2ComponentInterface_test.cpp b/media/codec2/tests/C2ComponentInterface_test.cpp index e9079646c9..67f733de21 100644 --- a/media/codec2/tests/C2ComponentInterface_test.cpp +++ b/media/codec2/tests/C2ComponentInterface_test.cpp @@ -182,9 +182,9 @@ template std::unique_ptr makeParam() { return std::make_unique(); } -template <> std::unique_ptr makeParam() { +template <> std::unique_ptr makeParam() { // TODO(hiroh): Set more precise length. - return C2PortMimeConfig::input::AllocUnique(100); + return C2PortMediaTypeSetting::input::AllocUnique(100); } #define TRACED_FAILURE(func) \ @@ -323,17 +323,17 @@ void C2CompIntfTest::configWritableParamInvalidValue(const T &newParam) { EXPECT_EQ(C2SettingResult::BAD_VALUE, failures[0]->failure); } -// There is only used enum type for the field type, that is C2DomainKind. +// There is only used enum type for the field type, that is C2Component::domain_t. // If another field type is added, it is necessary to add function for that. template <> void C2CompIntfTest::getTestValues( const C2FieldSupportedValues &validValueInfos, - std::vector *const validValues, - std::vector *const invalidValues) { + std::vector *const validValues, + std::vector *const invalidValues) { UNUSED(validValueInfos); - validValues->emplace_back(C2DomainVideo); - validValues->emplace_back(C2DomainAudio); - validValues->emplace_back(C2DomainOther); + validValues->emplace_back(C2Component::DOMAIN_VIDEO); + validValues->emplace_back(C2Component::DOMAIN_AUDIO); + validValues->emplace_back(C2Component::DOMAIN_OTHER); // There is no invalid value. UNUSED(invalidValues); @@ -634,20 +634,20 @@ void C2CompIntfTest::testMain(std::shared_ptr intf, std::vector> supportedParams; ASSERT_EQ(C2_OK, mIntf->querySupportedParams_nb(&supportedParams)); - EACH_TEST_SELF(C2ComponentLatencyInfo, TEST_U32_WRITABLE_FIELD); - EACH_TEST_SELF(C2ComponentTemporalInfo, TEST_U32_WRITABLE_FIELD); - EACH_TEST_INPUT(C2PortLatencyInfo, TEST_U32_WRITABLE_FIELD); - EACH_TEST_OUTPUT(C2PortLatencyInfo, TEST_U32_WRITABLE_FIELD); - EACH_TEST_INPUT(C2StreamFormatConfig, TEST_U32_WRITABLE_FIELD); - EACH_TEST_OUTPUT(C2StreamFormatConfig, TEST_U32_WRITABLE_FIELD); - EACH_TEST_INPUT(C2PortStreamCountConfig, TEST_U32_WRITABLE_FIELD); - EACH_TEST_OUTPUT(C2PortStreamCountConfig, TEST_U32_WRITABLE_FIELD); + EACH_TEST_SELF(C2ActualPipelineDelayTuning, TEST_U32_WRITABLE_FIELD); + EACH_TEST_SELF(C2ComponentAttributesSetting, TEST_U32_WRITABLE_FIELD); + EACH_TEST_INPUT(C2PortActualDelayTuning, TEST_U32_WRITABLE_FIELD); + EACH_TEST_OUTPUT(C2PortActualDelayTuning, TEST_U32_WRITABLE_FIELD); + EACH_TEST_INPUT(C2StreamBufferTypeSetting, TEST_U32_WRITABLE_FIELD); + EACH_TEST_OUTPUT(C2StreamBufferTypeSetting, TEST_U32_WRITABLE_FIELD); + EACH_TEST_INPUT(C2PortStreamCountTuning, TEST_U32_WRITABLE_FIELD); + EACH_TEST_OUTPUT(C2PortStreamCountTuning, TEST_U32_WRITABLE_FIELD); - EACH_TEST_SELF(C2ComponentDomainInfo, TEST_ENUM_WRITABLE_FIELD); + EACH_TEST_SELF(C2ComponentDomainSetting, TEST_ENUM_WRITABLE_FIELD); // TODO(hiroh): Support parameters based on uint32_t[] and char[]. - // EACH_TEST_INPUT(C2PortMimeConfig, TEST_STRING_WRITABLE_FIELD); - // EACH_TEST_OUTPUT(C2PortMimeConfig, TEST_STRING_WRITABLE_FIELD); + // EACH_TEST_INPUT(C2PortMediaTypeSetting, TEST_STRING_WRITABLE_FIELD); + // EACH_TEST_OUTPUT(C2PortMediaTypeSetting, TEST_STRING_WRITABLE_FIELD); // EACH_TEST_INPUT(C2StreamMimeConfig, TEST_STRING_WRITABLE_FIELD); // EACH_TEST_OUTPUT(C2StreamMimeConfig, TEST_STRING_WRITABLE_FIELD); @@ -656,10 +656,10 @@ void C2CompIntfTest::testMain(std::shared_ptr intf, // EACH_TEST_SELF(C2ReadOnlyParamsInfo, TEST_U32ARRAY_WRITABLE_FIELD); // EACH_TEST_SELF(C2RequestedInfosInfo, TEST_U32ARRAY_WRITABLE_FIELD); - EACH_TEST_INPUT(C2VideoSizeStreamInfo, TEST_VSSTRUCT_WRITABLE_FIELD); - EACH_TEST_OUTPUT(C2VideoSizeStreamInfo, TEST_VSSTRUCT_WRITABLE_FIELD); - EACH_TEST_INPUT(C2VideoSizeStreamTuning, TEST_VSSTRUCT_WRITABLE_FIELD); - EACH_TEST_OUTPUT(C2VideoSizeStreamTuning, TEST_VSSTRUCT_WRITABLE_FIELD); + EACH_TEST_INPUT(C2StreamPictureSizeInfo, TEST_VSSTRUCT_WRITABLE_FIELD); + EACH_TEST_OUTPUT(C2StreamPictureSizeInfo, TEST_VSSTRUCT_WRITABLE_FIELD); + EACH_TEST_INPUT(C2StreamPictureSizeInfo, TEST_VSSTRUCT_WRITABLE_FIELD); + EACH_TEST_OUTPUT(C2StreamPictureSizeInfo, TEST_VSSTRUCT_WRITABLE_FIELD); EACH_TEST_INPUT(C2MaxVideoSizeHintPortSetting, TEST_VSSTRUCT_WRITABLE_FIELD); EACH_TEST_OUTPUT(C2MaxVideoSizeHintPortSetting, TEST_VSSTRUCT_WRITABLE_FIELD); diff --git a/media/codec2/tests/C2SampleComponent_test.cpp b/media/codec2/tests/C2SampleComponent_test.cpp index cd354adf6a..9956834e30 100644 --- a/media/codec2/tests/C2SampleComponent_test.cpp +++ b/media/codec2/tests/C2SampleComponent_test.cpp @@ -152,7 +152,7 @@ public: std::unordered_map mMyParams; - C2ComponentDomainInfo mDomainInfo; + C2ComponentDomainSetting mDomainInfo; MyComponentInstance() { mMyParams.insert({mDomainInfo.index(), mDomainInfo}); @@ -187,12 +187,12 @@ public: c2_blocking_t mayBlock) const override { (void)mayBlock; for (C2FieldSupportedValuesQuery &query : fields) { - if (query.field() == C2ParamField(&mDomainInfo, &C2ComponentDomainInfo::value)) { + if (query.field() == C2ParamField(&mDomainInfo, &C2ComponentDomainSetting::value)) { query.values = C2FieldSupportedValues( false /* flag */, &mDomainInfo.value //, - //{(int32_t)C2DomainVideo} + //{(int32_t)C2Component::DOMAIN_VIDEO} ); query.status = C2_OK; } else { @@ -391,20 +391,20 @@ void dumpDesc(const C2ParamDescriptor &pd) { } TEST_F(C2SampleComponentTest, ReflectorTest) { - C2ComponentDomainInfo domainInfo; + C2ComponentDomainSetting domainInfo; std::shared_ptr myComp(new MyComponentInstance); std::shared_ptr comp = myComp; std::unique_ptr desc{ - myComp->getParamReflector()->describe(C2ComponentDomainInfo::CORE_INDEX)}; + myComp->getParamReflector()->describe(C2ComponentDomainSetting::CORE_INDEX)}; dumpStruct(*desc); std::vector query = { - { C2ParamField(&domainInfo, &C2ComponentDomainInfo::value), + { C2ParamField(&domainInfo, &C2ComponentDomainSetting::value), C2FieldSupportedValuesQuery::CURRENT }, - C2FieldSupportedValuesQuery(C2ParamField(&domainInfo, &C2ComponentDomainInfo::value), + C2FieldSupportedValuesQuery(C2ParamField(&domainInfo, &C2ComponentDomainSetting::value), C2FieldSupportedValuesQuery::CURRENT), - C2FieldSupportedValuesQuery::Current(C2ParamField(&domainInfo, &C2ComponentDomainInfo::value)), + C2FieldSupportedValuesQuery::Current(C2ParamField(&domainInfo, &C2ComponentDomainSetting::value)), }; EXPECT_EQ(C2_OK, comp->querySupportedValues_vb(query, C2_DONT_BLOCK)); diff --git a/media/codec2/vndk/C2Store.cpp b/media/codec2/vndk/C2Store.cpp index 32588a5ed1..e075849a7e 100644 --- a/media/codec2/vndk/C2Store.cpp +++ b/media/codec2/vndk/C2Store.cpp @@ -712,8 +712,8 @@ c2_status_t C2PlatformComponentStore::ComponentModule::init( } uint32_t mediaTypeIndex = - traits->kind == C2Component::KIND_ENCODER ? C2PortMimeConfig::output::PARAM_TYPE - : C2PortMimeConfig::input::PARAM_TYPE; + traits->kind == C2Component::KIND_ENCODER ? C2PortMediaTypeSetting::output::PARAM_TYPE + : C2PortMediaTypeSetting::input::PARAM_TYPE; std::vector> params; res = intf->query_vb({}, { mediaTypeIndex }, C2_MAY_BLOCK, ¶ms); if (res != C2_OK) { @@ -724,7 +724,7 @@ c2_status_t C2PlatformComponentStore::ComponentModule::init( ALOGD("failed to query interface: unexpected vector size: %zu", params.size()); return mInit; } - C2PortMimeConfig *mediaTypeConfig = C2PortMimeConfig::From(params[0].get()); + C2PortMediaTypeSetting *mediaTypeConfig = C2PortMediaTypeSetting::From(params[0].get()); if (mediaTypeConfig == nullptr) { ALOGD("failed to query media type"); return mInit;