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

Commit 5bddd655 authored by Wonsik Kim's avatar Wonsik Kim Committed by android-build-merger
Browse files

Merge "CCodec: reduce log amount for render warning" into qt-dev 

am: 37a9adef

Change-Id: Ic36c32476c1e3a29b68c4d8d5124403d0e73f3ec
parents 31647337 37a9adef

media/codec2/sfplugin/CCodecBufferChannel.cpp

+6 −4
Original line number Diff line number Diff line
@@ -533,10 +533,12 @@ status_t CCodecBufferChannel::renderOutputBuffer( 
    feedInputBufferIfAvailable();

    if (!c2Buffer) {

        if (released) {

            ALOGD("[%s] The app is calling releaseOutputBuffer() with "

            std::call_once(mRenderWarningFlag, [this] {

                ALOGW("[%s] The app is calling releaseOutputBuffer() with "

                      "timestamp or render=true with non-video buffers. Apps should "

                      "call releaseOutputBuffer() with render=false for those.",

                      mName);

            });

        }

        return INVALID_OPERATION;

    }

media/codec2/sfplugin/CCodecBufferChannel.h

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ private: 
    Mutexed<ReorderStash> mReorderStash;



    std::atomic_bool mInputMetEos;

    std::once_flag mRenderWarningFlag;



    inline bool hasCryptoOrDescrambler() {

        return mCrypto != nullptr || mDescrambler != nullptr;