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

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

Merge "Add a boolean for peek enabled" into main am: 36f90d9b am: b3af3104 am: 69229d96 

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



Change-Id: Iad2938b65468c42310ac6b9d0b444f61797d30e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1087ad91 69229d96

media/libstagefright/MediaCodec.cpp

+10 −5
Original line number Diff line number Diff line
@@ -1197,6 +1197,7 @@ MediaCodec::MediaCodec( 
      mTunneledInputHeight(0),

      mTunneled(false),

      mTunnelPeekState(TunnelPeekState::kLegacyMode),

      mTunnelPeekEnabled(false),

      mHaveInputSurface(false),

      mHavePendingInputBuffers(false),

      mCpuBoostRequested(false),
@@ -1742,6 +1743,7 @@ void MediaCodec::updateTunnelPeek(const sp<AMessage> &msg) { 


    TunnelPeekState previousState = mTunnelPeekState;

    if(tunnelPeek == 0){

        mTunnelPeekEnabled = false;

        switch (mTunnelPeekState) {

            case TunnelPeekState::kLegacyMode:

                msg->setInt32("android._tunnel-peek-set-legacy", 0);
@@ -1757,6 +1759,7 @@ void MediaCodec::updateTunnelPeek(const sp<AMessage> &msg) { 
                return;

        }

    } else {

        mTunnelPeekEnabled = true;

        switch (mTunnelPeekState) {

            case TunnelPeekState::kLegacyMode:

                msg->setInt32("android._tunnel-peek-set-legacy", 0);
@@ -4943,10 +4946,11 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
            CHECK(msg->senderAwaitsResponse(&replyID));

            TunnelPeekState previousState = mTunnelPeekState;

            if (previousState != TunnelPeekState::kLegacyMode) {

                mTunnelPeekState = TunnelPeekState::kEnabledNoBuffer;

                mTunnelPeekState = mTunnelPeekEnabled ? TunnelPeekState::kEnabledNoBuffer :

                    TunnelPeekState::kDisabledNoBuffer;

                ALOGV("TunnelPeekState: %s -> %s",

                        asString(previousState),

                        asString(TunnelPeekState::kEnabledNoBuffer));

                        asString(mTunnelPeekState));

            }



            mReplyID = replyID;
@@ -5445,10 +5449,11 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
            returnBuffersToCodec();

            TunnelPeekState previousState = mTunnelPeekState;

            if (previousState != TunnelPeekState::kLegacyMode) {

                mTunnelPeekState = TunnelPeekState::kEnabledNoBuffer;

                mTunnelPeekState = mTunnelPeekEnabled ? TunnelPeekState::kEnabledNoBuffer :

                    TunnelPeekState::kDisabledNoBuffer;

                ALOGV("TunnelPeekState: %s -> %s",

                        asString(previousState),

                        asString(TunnelPeekState::kEnabledNoBuffer));

                        asString(mTunnelPeekState));

            }

            break;

        }
@@ -5991,7 +5996,7 @@ status_t MediaCodec::onQueueInputBuffer(const sp<AMessage> &msg) { 
        if (isBufferDecodeOnly) {

            buffer->meta()->setInt32("decode-only", true);

        }

        if (mTunneled && !isBufferDecodeOnly) {

        if (mTunneled && !isBufferDecodeOnly && !(flags & BUFFER_FLAG_CODECCONFIG)) {

            TunnelPeekState previousState = mTunnelPeekState;

            switch(mTunnelPeekState){

                case TunnelPeekState::kEnabledNoBuffer:

media/libstagefright/include/media/stagefright/MediaCodec.h

+1 −0
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ private: 
    int32_t mTunneledInputHeight;

    bool mTunneled;

    TunnelPeekState mTunnelPeekState;

    bool mTunnelPeekEnabled;



    sp<IDescrambler> mDescrambler;