From 9d06df4ecfe39e7e46873f7cd75a71e32a01d4f7 Mon Sep 17 00:00:00 2001
From: Daniel Lam <dalam@google.com>
Date: Mon, 16 Apr 2012 22:47:07 -0700
Subject: Fixed leaks in SurfaceMediaSource_test

mEglSurface was being reused which resulted in
EGLSurfaces being lost.

Change-Id: Ica07cd24b0e4f3d4b2156f55b7de8e83d5466136
---
 media/libstagefright/tests/SurfaceMediaSource_test.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'media/libstagefright/tests')

diff --git a/media/libstagefright/tests/SurfaceMediaSource_test.cpp b/media/libstagefright/tests/SurfaceMediaSource_test.cpp
index 10713fe..466f521 100644
--- a/media/libstagefright/tests/SurfaceMediaSource_test.cpp
+++ b/media/libstagefright/tests/SurfaceMediaSource_test.cpp
@@ -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());
-- 
cgit v1.1