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

Commit 694ebf67 authored by Robert Shih's avatar Robert Shih
Browse files

Fix Omx emptyBuffer fd leak in GraphicBufferSource 

Bug: 36110748
Test: adb shell am instrument -e size small -w android.media.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I733bb9a0206760e8cdd74a6a72ae40f8bffaaac8
parent d095e65c

media/libstagefright/omx/hal/1.0/impl/WGraphicBufferSource.cpp

+6 −2
Original line number Original line Diff line number Diff line
@@ -47,12 +47,16 @@ struct TWGraphicBufferSource::TWOmxNodeWrapper : public IOmxNodeWrapper { 
            const sp<GraphicBuffer> &buffer,

            const sp<GraphicBuffer> &buffer,

            int64_t timestamp, int fenceFd) override {

            int64_t timestamp, int fenceFd) override {

        CodecBuffer tBuffer;

        CodecBuffer tBuffer;

        return toStatusT(mOmxNode->emptyBuffer(

        native_handle_t* fenceNh = native_handle_create_from_fd(fenceFd);

        status_t err = toStatusT(mOmxNode->emptyBuffer(

              bufferId,

              bufferId,

              *wrapAs(&tBuffer, buffer),

              *wrapAs(&tBuffer, buffer),

              flags,

              flags,

              toRawTicks(timestamp),

              toRawTicks(timestamp),

              native_handle_create_from_fd(fenceFd)));

              fenceNh));

        native_handle_close(fenceNh);

        native_handle_delete(fenceNh);

        return err;

    }

    }





    virtual void dispatchDataSpaceChanged(

    virtual void dispatchDataSpaceChanged(