diff options
author | Pannag Sanketi <psanketi@google.com> | 2011-09-02 17:56:35 -0700 |
---|---|---|
committer | Pannag Sanketi <psanketi@google.com> | 2011-09-02 17:56:35 -0700 |
commit | 3814ff4b17165e86d1893fde53025c69583599b4 (patch) | |
tree | 5d074d71c89b8ada677c4c3e5f1bba41dc398e1a /media | |
parent | 929827b819415101d526ff68fb0b2c8adb885132 (diff) | |
download | frameworks_base-3814ff4b17165e86d1893fde53025c69583599b4.zip frameworks_base-3814ff4b17165e86d1893fde53025c69583599b4.tar.gz frameworks_base-3814ff4b17165e86d1893fde53025c69583599b4.tar.bz2 |
Fixing bug in SurfaceMediaSource_test
The test was making EGL calls once disconnected. Instead of calling
"disconnect" directly on the Surface, and EGL calls should be made to that
effect.
Change-Id: I21468ac8cbc2cb3145a49269e32a884736cd452e
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/tests/SurfaceMediaSource_test.cpp | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/media/libstagefright/tests/SurfaceMediaSource_test.cpp b/media/libstagefright/tests/SurfaceMediaSource_test.cpp index d663602..d7bb703 100644 --- a/media/libstagefright/tests/SurfaceMediaSource_test.cpp +++ b/media/libstagefright/tests/SurfaceMediaSource_test.cpp @@ -156,8 +156,6 @@ protected: eglDestroySurface(mEglDisplay, mEglSurface); } if (mEglDisplay != EGL_NO_DISPLAY) { - eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, - EGL_NO_CONTEXT); eglTerminate(mEglDisplay); } ASSERT_EQ(EGL_SUCCESS, eglGetError()); @@ -461,6 +459,7 @@ void SurfaceMediaSourceGLTest::oneBufferPassGL(int num) { // The following call dequeues and queues the buffer eglSwapBuffers(mEglDisplay, mEglSurface); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); glDisable(GL_SCISSOR_TEST); } @@ -796,7 +795,12 @@ TEST_F(SurfaceMediaSourceGLTest, ChooseAndroidRecordableEGLConfigDummyWriter) { LOGV("framesCount = %d", nFramesCount); } - ASSERT_EQ(NO_ERROR, native_window_api_disconnect(mANW.get(), NATIVE_WINDOW_API_EGL)); + EXPECT_TRUE(eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, + EGL_NO_CONTEXT)); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + eglDestroySurface(mEglDisplay, mEglSurface); + mEglSurface = EGL_NO_SURFACE; + writer.stop(); } // Test to examine whether we can render GL buffers in to the surface @@ -875,7 +879,12 @@ TEST_F(SurfaceMediaSourceGLTest, EncodingFromGLRgbaSameImageEachBufNpotWrite) { LOGV("framesCount = %d", nFramesCount); } - ASSERT_EQ(NO_ERROR, native_window_api_disconnect(mANW.get(), NATIVE_WINDOW_API_EGL)); + EXPECT_TRUE(eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, + EGL_NO_CONTEXT)); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + eglDestroySurface(mEglDisplay, mEglSurface); + mEglSurface = EGL_NO_SURFACE; + LOGV("Stopping MediaRecorder..."); CHECK_EQ(OK, mr->stop()); mr.clear(); @@ -913,7 +922,12 @@ TEST_F(SurfaceMediaSourceGLTest, EncodingFromGLRgbaDiffImageEachBufNpotWrite) { LOGV("framesCount = %d", nFramesCount); } - ASSERT_EQ(NO_ERROR, native_window_api_disconnect(mANW.get(), NATIVE_WINDOW_API_EGL)); + EXPECT_TRUE(eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, + EGL_NO_CONTEXT)); + ASSERT_EQ(EGL_SUCCESS, eglGetError()); + eglDestroySurface(mEglDisplay, mEglSurface); + mEglSurface = EGL_NO_SURFACE; + LOGV("Stopping MediaRecorder..."); CHECK_EQ(OK, mr->stop()); mr.clear(); |