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

Commit 6960e0c7 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "MediaCodec: expose # of input slots in block model" into main am: 8062f9dc 

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



Change-Id: I4c08e217ac7660c1c125c7edbfee32a24d33f369
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0837bab5 8062f9dc

media/aconfig/codec_fwk.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ flag { 
  bug: "325550522"

}



flag {

  name: "num_input_slots"

  namespace: "codec_fwk"

  description: "Feature flag for exposing number of input slots"

  bug: "159891571"

}



flag {

  name: "p210_format_support"

  is_exported: true

media/codec2/sfplugin/CCodec.cpp

+4 −1
Original line number Diff line number Diff line
@@ -2877,6 +2877,7 @@ void CCodec::onMessageReceived(const sp<AMessage> &msg) { 


            // handle configuration changes in work done

            std::shared_ptr<const C2StreamInitDataInfo::output> initData;

            sp<AMessage> inputFormat = nullptr;

            sp<AMessage> outputFormat = nullptr;

            {

                Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);
@@ -2964,10 +2965,12 @@ void CCodec::onMessageReceived(const sp<AMessage> &msg) { 
                            initData->m.value, initData->flexCount(), config->mCodingMediaType,

                            config->mOutputFormat);

                }

                inputFormat = config->mInputFormat;

                outputFormat = config->mOutputFormat;

            }

            mChannel->onWorkDone(

                    std::move(work), outputFormat, initData ? initData.get() : nullptr);

                    std::move(work), inputFormat, outputFormat,

                    initData ? initData.get() : nullptr);

            // log metrics to MediaCodec

            if (mMetrics->countEntries() == 0) {

                Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);

media/codec2/sfplugin/CCodecBufferChannel.cpp

+11 −2
Original line number Diff line number Diff line
@@ -1836,6 +1836,9 @@ status_t CCodecBufferChannel::start( 
                    channelCount.value,

                    pcmEncoding ? pcmEncoding.value : C2Config::PCM_16);

        }

        if (!buffersBoundToCodec) {

            inputFormat->setInt32(KEY_NUM_SLOTS, numInputSlots);

        }

        bool conforming = (apiFeatures & API_SAME_INPUT_BUFFER);

        // For encrypted content, framework decrypts source buffer (ashmem) into

        // C2Buffers. Thus non-conforming codecs can process these.
@@ -2356,9 +2359,11 @@ void CCodecBufferChannel::flush(const std::list<std::unique_ptr<C2Work>> &flushe 
}



void CCodecBufferChannel::onWorkDone(

        std::unique_ptr<C2Work> work, const sp<AMessage> &outputFormat,

        std::unique_ptr<C2Work> work,

        const sp<AMessage> &inputFormat,

        const sp<AMessage> &outputFormat,

        const C2StreamInitDataInfo::output *initData) {

    if (handleWork(std::move(work), outputFormat, initData)) {

    if (handleWork(std::move(work), inputFormat, outputFormat, initData)) {

        feedInputBufferIfAvailable();

    }

}
@@ -2388,6 +2393,7 @@ void CCodecBufferChannel::onInputBufferDone( 


bool CCodecBufferChannel::handleWork(

        std::unique_ptr<C2Work> work,

        const sp<AMessage> &inputFormat,

        const sp<AMessage> &outputFormat,

        const C2StreamInitDataInfo::output *initData) {

    {
@@ -2561,6 +2567,9 @@ bool CCodecBufferChannel::handleWork( 
        } else {

            input->numSlots = newNumSlots;

        }

        if (inputFormat->contains(KEY_NUM_SLOTS)) {

            inputFormat->setInt32(KEY_NUM_SLOTS, input->numSlots);

        }

    }

    size_t numOutputSlots = 0;

    uint32_t reorderDepth = 0;

media/codec2/sfplugin/CCodecBufferChannel.h

+9 −4
Original line number Diff line number Diff line
@@ -194,11 +194,14 @@ public: 
     * Notify input client about work done.

     *

     * @param workItems    finished work item.

     * @param inputFormat  input format

     * @param outputFormat new output format if it has changed, otherwise nullptr

     * @param initData     new init data (CSD) if it has changed, otherwise nullptr

     */

    void onWorkDone(

            std::unique_ptr<C2Work> work, const sp<AMessage> &outputFormat,

            std::unique_ptr<C2Work> work,

            const sp<AMessage> &inputFormat,

            const sp<AMessage> &outputFormat,

            const C2StreamInitDataInfo::output *initData);



    /**
@@ -311,7 +314,9 @@ private: 
                                      std::shared_ptr<C2LinearBlock> encryptedBlock = nullptr,

                                      size_t blockSize = 0);

    bool handleWork(

            std::unique_ptr<C2Work> work, const sp<AMessage> &outputFormat,

            std::unique_ptr<C2Work> work,

            const sp<AMessage> &inputFormat,

            const sp<AMessage> &outputFormat,

            const C2StreamInitDataInfo::output *initData);

    void sendOutputBuffers();

    void ensureDecryptDestination(size_t size);

media/libstagefright/include/media/stagefright/MediaCodecConstants.h

+1 −0
Original line number Diff line number Diff line
@@ -983,6 +983,7 @@ inline constexpr char KEY_MAX_OUTPUT_CHANNEL_COUNT[] = "max-output-channel-count 
inline constexpr char KEY_MAX_PTS_GAP_TO_ENCODER[] = "max-pts-gap-to-encoder";

inline constexpr char KEY_MAX_WIDTH[] = "max-width";

inline constexpr char KEY_MIME[] = "mime";

inline constexpr char KEY_NUM_SLOTS[] = "num-slots";

inline constexpr char KEY_OPERATING_RATE[] = "operating-rate";

inline constexpr char KEY_OUTPUT_REORDER_DEPTH[] = "output-reorder-depth";

inline constexpr char KEY_PCM_ENCODING[] = "pcm-encoding";