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

Commit 7729649e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [6841458, 6845109, 6844203, 6845110, 6845111, 6845112,... 

Merge cherrypicks of [6841458, 6845109, 6844203, 6845110, 6845111, 6845112, 6845113, 6845114, 6845115, 6845116, 6845117, 6845118, 6845119, 6845376, 6845444, 6845377, 6844204, 6844205, 6844206, 6844207, 6844208, 6844209, 6844210, 6844211, 6844212, 6844213] into pi-qpr3-b-release

Change-Id: I913f8a9359495d4606af6ca077727a5a4a88c0eb
parents 96bbdd15 8ae97555

media/libstagefright/ACodec.cpp

+3 −0
Original line number Diff line number Diff line
@@ -783,6 +783,9 @@ status_t ACodec::handleSetSurface(const sp<Surface> &surface) { 
    // need to enable allocation when attaching

    surface->getIGraphicBufferProducer()->allowAllocation(true);



    // dequeueBuffer cannot time out

    surface->setDequeueTimeout(-1);



    // for meta data mode, we move dequeud buffers to the new surface.

    // for non-meta mode, we must move all registered buffers

    for (size_t i = 0; i < buffers.size(); ++i) {

media/libstagefright/MediaCodec.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2198,6 +2198,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
                            }



                            if (mime.startsWithIgnoreCase("video/")) {

                                mSurface->setDequeueTimeout(-1);

                                mSoftRenderer = new SoftwareRenderer(mSurface, mRotationDegrees);

                            }

                        }
@@ -2485,6 +2486,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
                                            && (mFlags & kFlagPushBlankBuffersOnShutdown)) {

                                        pushBlankBuffersToNativeWindow(mSurface.get());

                                    }

                                    surface->setDequeueTimeout(-1);

                                    mSoftRenderer = new SoftwareRenderer(surface);

                                    // TODO: check if this was successful

                                } else {