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

Commit 60313387 authored by Xiao Huang's avatar Xiao Huang Committed by Automerger Merge Worker
Browse files

Merge "change ALOGD() to ALOGV() in onWorkDone() when tunneled" am: b416f3bb... 

Merge "change ALOGD() to ALOGV() in onWorkDone() when tunneled" am: b416f3bb am: d6628ebe am: 8e498d0e am: 40aae515 am: d03b3df1

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



Change-Id: I0ce638eccc0b5889d2bb70f1e0c6608691fa533b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c984927a d03b3df1

media/codec2/sfplugin/CCodecBufferChannel.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1593,7 +1593,8 @@ status_t CCodecBufferChannel::start( 
        watcher->inputDelay(inputDelayValue)

                .pipelineDelay(pipelineDelayValue)

                .outputDelay(outputDelayValue)

                .smoothnessFactor(kSmoothnessFactor);

                .smoothnessFactor(kSmoothnessFactor)

                .tunneled(mTunneled);

        watcher->flush();

    }

media/codec2/sfplugin/PipelineWatcher.cpp

+12 −2
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ PipelineWatcher &PipelineWatcher::smoothnessFactor(uint32_t value) { 
    return *this;

}



PipelineWatcher &PipelineWatcher::tunneled(bool value) {

    mTunneled = value;

    return *this;

}



void PipelineWatcher::onWorkQueued(

        uint64_t frameIndex,

        std::vector<std::shared_ptr<C2Buffer>> &&buffers,
@@ -87,8 +92,13 @@ void PipelineWatcher::onWorkDone(uint64_t frameIndex) { 
    ALOGV("onWorkDone(frameIndex=%llu)", (unsigned long long)frameIndex);

    auto it = mFramesInPipeline.find(frameIndex);

    if (it == mFramesInPipeline.end()) {

        if (!mTunneled) {

            ALOGD("onWorkDone: frameIndex not found (%llu); ignored",

                  (unsigned long long)frameIndex);

        } else {

            ALOGV("onWorkDone: frameIndex not found (%llu); ignored",

                  (unsigned long long)frameIndex);

        }

        return;

    }

    (void)mFramesInPipeline.erase(it);

media/codec2/sfplugin/PipelineWatcher.h

+9 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ public: 
        : mInputDelay(0),

          mPipelineDelay(0),

          mOutputDelay(0),

          mSmoothnessFactor(0) {}

          mSmoothnessFactor(0),

          mTunneled(false) {}

    ~PipelineWatcher() = default;



    /**
@@ -64,6 +65,12 @@ public: 
     */

    PipelineWatcher &smoothnessFactor(uint32_t value);



    /**

     * \param value the new tunneled value

     * \return  this object

     */

    PipelineWatcher &tunneled(bool value);



    /**

     * Client queued a work item to the component.

     *
@@ -122,6 +129,7 @@ private: 
    uint32_t mPipelineDelay;

    uint32_t mOutputDelay;

    uint32_t mSmoothnessFactor;

    bool mTunneled;



    struct Frame {

        Frame(std::vector<std::shared_ptr<C2Buffer>> &&b,