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

Commit 13692a5d authored by Eddy Talvala's avatar Eddy Talvala Committed by Android (Google) Code Review
Browse files

Merge "Fixed leaks in SurfaceMediaSource_test"

parents 97b5d0d5 9d06df4e

media/libstagefright/tests/SurfaceMediaSource_test.cpp

+9 −0
Original line number Diff line number Diff line
@@ -486,6 +486,10 @@ void SurfaceMediaSourceGLTest::setUpEGLSurfaceFromMediaRecorder(sp<MediaRecorder 
    mSTC = new SurfaceTextureClient(iST);

    mANW = mSTC;



    if (mEglSurface != EGL_NO_SURFACE) {

        EXPECT_TRUE(eglDestroySurface(mEglDisplay, mEglSurface));

        mEglSurface = EGL_NO_SURFACE;

    }

    mEglSurface = eglCreateWindowSurface(mEglDisplay, mGlConfig,

                                mANW.get(), NULL);

    ASSERT_EQ(EGL_SUCCESS, eglGetError());
@@ -783,6 +787,11 @@ TEST_F(SurfaceMediaSourceGLTest, ChooseAndroidRecordableEGLConfigDummyWriter) { 
    DummyRecorder writer(mSMS);

    writer.start();



    if (mEglSurface != EGL_NO_SURFACE) {

        EXPECT_TRUE(eglDestroySurface(mEglDisplay, mEglSurface));

        mEglSurface = EGL_NO_SURFACE;

    }



    mEglSurface = eglCreateWindowSurface(mEglDisplay, mGlConfig,

                                mANW.get(), NULL);

    ASSERT_EQ(EGL_SUCCESS, eglGetError());