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

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

Snap for 5422807 from 34f058f9 to pi-qpr3-b-release 

Change-Id: I8ae46c626588c5c4ad323f2f8295e01a04ed96b5
parents 7729649e 34f058f9

media/libstagefright/ACodec.cpp

+0 −3
Original line number Diff line number Diff line
@@ -783,9 +783,6 @@ 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

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



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

                                mSurface->setDequeueTimeout(-1);

                                mSoftRenderer = new SoftwareRenderer(mSurface, mRotationDegrees);

                            }

                        }
@@ -2486,7 +2485,6 @@ 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 {