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

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

Merge cherrypicks of [6916730, 6913831, 6916555, 6916731, 6916732, 6916733,... 

Merge cherrypicks of [6916730, 6913831, 6916555, 6916731, 6916732, 6916733, 6916734, 6916735, 6916736, 6916738, 6916739, 6916740, 6916741, 6916942, 6916715, 6916717, 6916718, 6916719, 6916720, 6916721, 6916962, 6916964, 6916966, 6916967, 6916968, 6916970, 6916972, 6916974] into pi-qpr3-b-release

Change-Id: I87e8e29a2bee24413883a530fba285ded315ff25
parents 86f616a7 3f176f57

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 {