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

Commit dd259fb0 authored by Houxiang Dai's avatar Houxiang Dai Committed by Hongguang Chen
Browse files

let outputFormat update and discard buffer 

For tunneled playback, there should be no buffer output. But for Codec2,
CCodec still needs to update OutputFormat per frame to MediaCodec. So,
MediaCodec should discard output buffer and only update OutputFormat in
this case. And for Block Model, the null buffer still needs to pass to
application to provide OutputFormat per frame.

Test: Digital TV test pass

Bug: 193867146
Bug: 199668436
Change-Id: Ifbad1de8992cc212d62e21ca6a4db832ee7b2d76
parent ff30f705

media/libstagefright/MediaCodec.cpp

+14 −0
Original line number Diff line number Diff line
@@ -2824,6 +2824,20 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 


                case kWhatDrainThisBuffer:

                {

                    if ((mFlags & kFlagUseBlockModel) == 0 && mTunneled) {

                        sp<RefBase> obj;

                        CHECK(msg->findObject("buffer", &obj));

                        sp<MediaCodecBuffer> buffer = static_cast<MediaCodecBuffer *>(obj.get());

                        if (mFlags & kFlagIsAsync) {

                            // In asynchronous mode, output format change is processed immediately.

                            handleOutputFormatChangeIfNeeded(buffer);

                        } else {

                            postActivityNotificationIfPossible();

                        }

                        mBufferChannel->discardBuffer(buffer);

                        break;

                    }



                    /* size_t index = */updateBuffers(kPortIndexOutput, msg);



                    if (mState == FLUSHING