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

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

Merge cherrypicks of [6909075, 6907367, 6908059, 6905571, 6905572, 6905573,... 

Merge cherrypicks of [6909075, 6907367, 6908059, 6905571, 6905572, 6905573, 6905574, 6905575, 6905576, 6905577, 6905578, 6905579, 6905580, 6907712, 6907713, 6907714, 6907715, 6907716, 6907717, 6907718, 6907719, 6907720, 6907721, 6909142, 6909143, 6909144, 6909145] into pi-qpr3-b-release

Change-Id: I38ce4056eaf4bfb5b01bb532737c057c96f0ac78
parents e1336214 e397f431

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 {