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

Commit e6e18e8d authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "stagefright: allow scenarios when dequeueBufferFromNativeWindow fails" into lmp-dev

parents 49d00ad9 e5335037

media/libstagefright/ACodec.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -3946,8 +3946,7 @@ void ACodec::BaseState::onInputBufferFilled(const sp<AMessage> &msg) { 
                            (outputMode == FREE_BUFFERS ? "FREE" :

                            (outputMode == FREE_BUFFERS ? "FREE" :

                             outputMode == KEEP_BUFFERS ? "KEEP" : "RESUBMIT"));

                             outputMode == KEEP_BUFFERS ? "KEEP" : "RESUBMIT"));

                    if (outputMode == RESUBMIT_BUFFERS) {

                    if (outputMode == RESUBMIT_BUFFERS) {

                        CHECK_EQ(mCodec->submitOutputMetaDataBuffer(),

                        mCodec->submitOutputMetaDataBuffer();

                                (status_t)OK);

                    }

                    }

                }

                }