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

Commit b7fba8a2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "media: Implement CodecBase interfaces in ACodec" am: 10e58274 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1810296

Change-Id: I94b6f11100fb77fb2e0f063b15abdf94ea892ced
parents b77c91c9 10e58274

media/libstagefright/ACodec.cpp

+16 −0
Original line number Diff line number Diff line
@@ -5433,6 +5433,7 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) { 
                    notify->setInt32("channel-count", params.nChannels);

                    notify->setInt32("sample-rate", params.nSampleRate);

                    notify->setInt32("bitrate", params.nBitRate);

                    notify->setInt32("aac-profile", params.eAACProfile);

                    break;

                }
@@ -9207,4 +9208,19 @@ status_t ACodec::getOMXChannelMapping(size_t numChannels, OMX_AUDIO_CHANNELTYPE 
    return OK;

}



status_t ACodec::querySupportedParameters(std::vector<std::string> *names) {

    if (!names) {

        return BAD_VALUE;

    }

    return OK;

}



status_t ACodec::subscribeToParameters([[maybe_unused]] const std::vector<std::string> &names) {

    return OK;

}



status_t ACodec::unsubscribeFromParameters([[maybe_unused]] const std::vector<std::string> &names) {

    return OK;

}



}  // namespace android

media/libstagefright/include/media/stagefright/ACodec.h

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ struct ACodec : public AHierarchicalStateMachine, public CodecBase { 
    virtual void initiateSetInputSurface(const sp<PersistentSurface> &surface);

    virtual void initiateStart();

    virtual void initiateShutdown(bool keepComponentAllocated = false);

    virtual status_t querySupportedParameters(std::vector<std::string> *names) override;

    virtual status_t subscribeToParameters(const std::vector<std::string> &names) override;

    virtual status_t unsubscribeFromParameters(const std::vector<std::string> &names) override;



    status_t queryCapabilities(

            const char* owner, const char* name,