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

Commit 28d12549 authored by Mathias Agopian's avatar Mathias Agopian Committed by android-build-merger
Browse files

Merge "Remove useless GraphicBuffer() constructor" into oc-dev 

am: 549f2088

Change-Id: Ib5a76d2237b5f2f8b1e43984287ae9bd4faf8231
parents 3e06f3fd 549f2088

media/libstagefright/ACodec.cpp

+3 −4
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ status_t ACodec::allocateOutputBuffersFromNativeWindow() { 
            break;

        }



        sp<GraphicBuffer> graphicBuffer(new GraphicBuffer(buf, false));

        sp<GraphicBuffer> graphicBuffer(GraphicBuffer::from(buf));

        BufferInfo info;

        info.mStatus = BufferInfo::OWNED_BY_US;

        info.mFenceFd = fenceFd;
@@ -1515,7 +1515,7 @@ ACodec::BufferInfo *ACodec::dequeueBufferFromNativeWindow() { 
    CHECK(storingMetadataInDecodedBuffers());



    // discard buffer in LRU info and replace with new buffer

    oldest->mGraphicBuffer = new GraphicBuffer(buf, false);

    oldest->mGraphicBuffer = GraphicBuffer::from(buf);

    oldest->mNewGraphicBuffer = true;

    oldest->mStatus = BufferInfo::OWNED_BY_US;

    oldest->setWriteFence(fenceFd, "dequeueBufferFromNativeWindow for oldest");
@@ -5728,8 +5728,7 @@ void ACodec::BaseState::onInputBufferFilled(const sp<AMessage> &msg) { 
                case IOMX::kPortModeDynamicANWBuffer:

                    if (info->mCodecData->size() >= sizeof(VideoNativeMetadata)) {

                        VideoNativeMetadata *vnmd = (VideoNativeMetadata*)info->mCodecData->base();

                        sp<GraphicBuffer> graphicBuffer = new GraphicBuffer(

                                vnmd->pBuffer, false /* keepOwnership */);

                        sp<GraphicBuffer> graphicBuffer = GraphicBuffer::from(vnmd->pBuffer);

                        err2 = mCodec->mOMXNode->emptyBuffer(

                            bufferID, graphicBuffer, flags, timeUs, info->mFenceFd);

                    }

media/libstagefright/SurfaceUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ status_t pushBlankBuffersToNativeWindow(ANativeWindow *nativeWindow /* nonnull * 
            break;

        }



        sp<GraphicBuffer> buf(new GraphicBuffer(anb, false));

        sp<GraphicBuffer> buf(GraphicBuffer::from(anb));



        // Fill the buffer with the a 1x1 checkerboard pattern ;)

        uint32_t *img = NULL;

media/libstagefright/tests/SurfaceMediaSource_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ void SurfaceMediaSourceTest::oneBufferPass(int width, int height ) { 


    // Fill the buffer with the a checkerboard pattern

    uint8_t* img = NULL;

    sp<GraphicBuffer> buf(new GraphicBuffer(anb, false));

    sp<GraphicBuffer> buf(GraphicBuffer::from(anb));

    buf->lock(GRALLOC_USAGE_SW_WRITE_OFTEN, (void**)(&img));

    SurfaceMediaSourceTest::fillYV12Buffer(img, width, height, buf->getStride());

    buf->unlock();
@@ -527,7 +527,7 @@ void SurfaceMediaSourceTest::oneBufferPassNoFill( 
    ASSERT_TRUE(anb != NULL);



    // We do not fill the buffer in. Just queue it back.

    sp<GraphicBuffer> buf(new GraphicBuffer(anb, false));

    sp<GraphicBuffer> buf(GraphicBuffer::from(anb));

    ASSERT_EQ(NO_ERROR, mANW->queueBuffer(mANW.get(), buf->getNativeBuffer(),

            -1));

}