Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 279cf4b9 authored by Sungtak Lee's avatar Sungtak Lee Committed by Android (Google) Code Review
Browse files

Merge changes from topic "124962433" into qt-dev 

* changes:
  codec2: Derive video encoder components from SimpleInterface
  codec2: Add support to derive from base class for audio decoders
  codec2: Add support to derive from base class for audio encoders
parents 1526ab3e 9acd73d1

media/codec2/components/aac/C2SoftAacDec.cpp

+0 −4
Original line number Diff line number Diff line
@@ -205,10 +205,6 @@ public: 
    int32_t getDrcEffectType() const { return mDrcEffectType->value; }



private:

    std::shared_ptr<C2StreamBufferTypeSetting::input> mInputFormat;

    std::shared_ptr<C2StreamBufferTypeSetting::output> mOutputFormat;

    std::shared_ptr<C2PortMediaTypeSetting::input> mInputMediaType;

    std::shared_ptr<C2PortMediaTypeSetting::output> mOutputMediaType;

    std::shared_ptr<C2StreamSampleRateInfo::output> mSampleRate;

    std::shared_ptr<C2StreamChannelCountInfo::output> mChannelCount;

    std::shared_ptr<C2StreamBitrateInfo::input> mBitrate;

media/codec2/components/aac/C2SoftAacEnc.cpp

+21 −28
Original line number Diff line number Diff line
@@ -29,33 +29,32 @@ 


namespace android {



class C2SoftAacEnc::IntfImpl : public C2InterfaceHelper {

public:

    explicit IntfImpl(const std::shared_ptr<C2ReflectorHelper> &helper)

        : C2InterfaceHelper(helper) {



        setDerivedInstance(this);

namespace {



        addParameter(

                DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE)

                .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR))

                .build());

constexpr char COMPONENT_NAME[] = "c2.android.aac.encoder";



        addParameter(

                DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE)

                .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR))

                .build());

}  // namespace



        addParameter(

                DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE)

                .withConstValue(AllocSharedString<C2PortMediaTypeSetting::input>(

                        MEDIA_MIMETYPE_AUDIO_RAW))

                .build());

class C2SoftAacEnc::IntfImpl : public SimpleInterface<void>::BaseParams {

public:

    explicit IntfImpl(const std::shared_ptr<C2ReflectorHelper> &helper)

        : SimpleInterface<void>::BaseParams(

                helper,

                COMPONENT_NAME,

                C2Component::KIND_ENCODER,

                C2Component::DOMAIN_AUDIO,

                MEDIA_MIMETYPE_AUDIO_AAC) {

        noPrivateBuffers();

        noInputReferences();

        noOutputReferences();

        noInputLatency();

        noTimeStretch();

        setDerivedInstance(this);



        addParameter(

                DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE)

                .withConstValue(AllocSharedString<C2PortMediaTypeSetting::output>(

                        MEDIA_MIMETYPE_AUDIO_AAC))

                DefineParam(mAttrib, C2_PARAMKEY_COMPONENT_ATTRIBUTES)

                .withConstValue(new C2ComponentAttributesSetting(

                    C2Component::ATTRIB_IS_TEMPORAL))

                .build());



        addParameter(
@@ -125,10 +124,6 @@ public: 
    }



private:

    std::shared_ptr<C2StreamBufferTypeSetting::input> mInputFormat;

    std::shared_ptr<C2StreamBufferTypeSetting::output> mOutputFormat;

    std::shared_ptr<C2PortMediaTypeSetting::input> mInputMediaType;

    std::shared_ptr<C2PortMediaTypeSetting::output> mOutputMediaType;

    std::shared_ptr<C2StreamSampleRateInfo::input> mSampleRate;

    std::shared_ptr<C2StreamChannelCountInfo::input> mChannelCount;

    std::shared_ptr<C2StreamBitrateInfo::output> mBitrate;
@@ -136,8 +131,6 @@ private: 
    std::shared_ptr<C2StreamProfileLevelInfo::output> mProfileLevel;

};



constexpr char COMPONENT_NAME[] = "c2.android.aac.encoder";



C2SoftAacEnc::C2SoftAacEnc(

        const char *name,

        c2_node_id_t id,

media/codec2/components/amr_nb_wb/C2SoftAmrDec.cpp

+22 −28
Original line number Diff line number Diff line
@@ -33,43 +33,41 @@ 


namespace android {



namespace {



#ifdef AMRNB

  constexpr char COMPONENT_NAME[] = "c2.android.amrnb.decoder";

#else

  constexpr char COMPONENT_NAME[] = "c2.android.amrwb.decoder";

#endif



class C2SoftAmrDec::IntfImpl : public C2InterfaceHelper {

}  // namespace



class C2SoftAmrDec::IntfImpl : public SimpleInterface<void>::BaseParams {

public:

    explicit IntfImpl(const std::shared_ptr<C2ReflectorHelper> &helper)

        : C2InterfaceHelper(helper) {



        setDerivedInstance(this);



        addParameter(

                DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE)

                .withConstValue(new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR))

                .build());



        addParameter(

                DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE)

                .withConstValue(new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR))

                .build());



        addParameter(

                DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE)

                .withConstValue(AllocSharedString<C2PortMediaTypeSetting::input>(

        : SimpleInterface<void>::BaseParams(

                helper,

                COMPONENT_NAME,

                C2Component::KIND_DECODER,

                C2Component::DOMAIN_AUDIO,

#ifdef AMRNB

                MEDIA_MIMETYPE_AUDIO_AMR_NB

#else

                MEDIA_MIMETYPE_AUDIO_AMR_WB

#endif

                )).build());

                ) {

        noPrivateBuffers();

        noInputReferences();

        noOutputReferences();

        noInputLatency();

        noTimeStretch();

        setDerivedInstance(this);



        addParameter(

                DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE)

                .withConstValue(AllocSharedString<C2PortMediaTypeSetting::output>(

                        MEDIA_MIMETYPE_AUDIO_RAW))

                DefineParam(mAttrib, C2_PARAMKEY_COMPONENT_ATTRIBUTES)

                .withConstValue(new C2ComponentAttributesSetting(

                    C2Component::ATTRIB_IS_TEMPORAL))

                .build());



        addParameter(
@@ -110,10 +108,6 @@ public: 
    }



private:

    std::shared_ptr<C2StreamBufferTypeSetting::input> mInputFormat;

    std::shared_ptr<C2StreamBufferTypeSetting::output> mOutputFormat;

    std::shared_ptr<C2PortMediaTypeSetting::input> mInputMediaType;

    std::shared_ptr<C2PortMediaTypeSetting::output> mOutputMediaType;

    std::shared_ptr<C2StreamSampleRateInfo::output> mSampleRate;

    std::shared_ptr<C2StreamChannelCountInfo::output> mChannelCount;

    std::shared_ptr<C2StreamBitrateInfo::input> mBitrate;

media/codec2/components/amr_nb_wb/C2SoftAmrNbEnc.cpp

+22 −29
Original line number Diff line number Diff line
@@ -27,36 +27,33 @@ 


namespace android {



namespace {



constexpr char COMPONENT_NAME[] = "c2.android.amrnb.encoder";



class C2SoftAmrNbEnc::IntfImpl : public C2InterfaceHelper {

}  // namespace





class C2SoftAmrNbEnc::IntfImpl : public SimpleInterface<void>::BaseParams {

public:

    explicit IntfImpl(const std::shared_ptr<C2ReflectorHelper> &helper)

        : C2InterfaceHelper(helper) {

        : SimpleInterface<void>::BaseParams(

                helper,

                COMPONENT_NAME,

                C2Component::KIND_ENCODER,

                C2Component::DOMAIN_AUDIO,

                MEDIA_MIMETYPE_AUDIO_AMR_NB) {

        noPrivateBuffers();

        noInputReferences();

        noOutputReferences();

        noInputLatency();

        noTimeStretch();

        setDerivedInstance(this);



        addParameter(

            DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE)

                .withConstValue(

                    new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR))

                .build());



        addParameter(

            DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE)

                .withConstValue(

                    new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR))

                .build());



        addParameter(

            DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE)

                .withConstValue(AllocSharedString<C2PortMediaTypeSetting::input>(

                    MEDIA_MIMETYPE_AUDIO_RAW))

                .build());



        addParameter(

            DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE)

                .withConstValue(AllocSharedString<C2PortMediaTypeSetting::output>(

                    MEDIA_MIMETYPE_AUDIO_AMR_NB))

                DefineParam(mAttrib, C2_PARAMKEY_COMPONENT_ATTRIBUTES)

                .withConstValue(new C2ComponentAttributesSetting(

                    C2Component::ATTRIB_IS_TEMPORAL))

                .build());



        addParameter(
@@ -92,10 +89,6 @@ class C2SoftAmrNbEnc::IntfImpl : public C2InterfaceHelper { 
    uint32_t getBitrate() const { return mBitrate->value; }



private:

    std::shared_ptr<C2StreamBufferTypeSetting::input> mInputFormat;

    std::shared_ptr<C2StreamBufferTypeSetting::output> mOutputFormat;

    std::shared_ptr<C2PortMediaTypeSetting::input> mInputMediaType;

    std::shared_ptr<C2PortMediaTypeSetting::output> mOutputMediaType;

    std::shared_ptr<C2StreamSampleRateInfo::input> mSampleRate;

    std::shared_ptr<C2StreamChannelCountInfo::input> mChannelCount;

    std::shared_ptr<C2StreamBitrateInfo::output> mBitrate;

media/codec2/components/amr_nb_wb/C2SoftAmrWbEnc.cpp

+22 −30
Original line number Diff line number Diff line
@@ -29,36 +29,32 @@ 


namespace android {



namespace {



constexpr char COMPONENT_NAME[] = "c2.android.amrwb.encoder";



class C2SoftAmrWbEnc::IntfImpl : public C2InterfaceHelper {

}  // namespace



class C2SoftAmrWbEnc::IntfImpl : public SimpleInterface<void>::BaseParams {

public:

    explicit IntfImpl(const std::shared_ptr<C2ReflectorHelper> &helper)

        : C2InterfaceHelper(helper) {

        : SimpleInterface<void>::BaseParams(

                helper,

                COMPONENT_NAME,

                C2Component::KIND_ENCODER,

                C2Component::DOMAIN_AUDIO,

                MEDIA_MIMETYPE_AUDIO_AMR_WB) {

        noPrivateBuffers();

        noInputReferences();

        noOutputReferences();

        noInputLatency();

        noTimeStretch();

        setDerivedInstance(this);



        addParameter(

            DefineParam(mInputFormat, C2_PARAMKEY_INPUT_STREAM_BUFFER_TYPE)

                .withConstValue(

                    new C2StreamBufferTypeSetting::input(0u, C2BufferData::LINEAR))

                .build());



        addParameter(

            DefineParam(mOutputFormat, C2_PARAMKEY_OUTPUT_STREAM_BUFFER_TYPE)

                .withConstValue(

                    new C2StreamBufferTypeSetting::output(0u, C2BufferData::LINEAR))

                .build());



        addParameter(

            DefineParam(mInputMediaType, C2_PARAMKEY_INPUT_MEDIA_TYPE)

                .withConstValue(AllocSharedString<C2PortMediaTypeSetting::input>(

                    MEDIA_MIMETYPE_AUDIO_RAW))

                .build());



        addParameter(

            DefineParam(mOutputMediaType, C2_PARAMKEY_OUTPUT_MEDIA_TYPE)

                .withConstValue(AllocSharedString<C2PortMediaTypeSetting::output>(

                    MEDIA_MIMETYPE_AUDIO_AMR_WB))

                DefineParam(mAttrib, C2_PARAMKEY_COMPONENT_ATTRIBUTES)

                .withConstValue(new C2ComponentAttributesSetting(

                    C2Component::ATTRIB_IS_TEMPORAL))

                .build());



        addParameter(
@@ -94,10 +90,6 @@ class C2SoftAmrWbEnc::IntfImpl : public C2InterfaceHelper { 
    uint32_t getBitrate() const { return mBitrate->value; }



private:

    std::shared_ptr<C2StreamBufferTypeSetting::input> mInputFormat;

    std::shared_ptr<C2StreamBufferTypeSetting::output> mOutputFormat;

    std::shared_ptr<C2PortMediaTypeSetting::input> mInputMediaType;

    std::shared_ptr<C2PortMediaTypeSetting::output> mOutputMediaType;

    std::shared_ptr<C2StreamSampleRateInfo::input> mSampleRate;

    std::shared_ptr<C2StreamChannelCountInfo::input> mChannelCount;

    std::shared_ptr<C2StreamBitrateInfo::output> mBitrate;