From 22f2a8728ee2000a01aa6fc6108d8478d7c0ced9 Mon Sep 17 00:00:00 2001 From: Pannag Sanketi Date: Fri, 18 May 2012 11:38:37 -0700 Subject: Crash in SurfaceTextureTarget filter open If the filter graph in an app closes out, the SurfaceTextureTarget filter was losing the reference to the original surfacetexture, and the app would re-start the graph without setting the surfacetexture again, thus leading to a crash in registering a surface from surfacetexture. Typical scenarios is start/stop immediately in camera effects recording. Fix part of b/6651352 Fix part of b/6655597 Change-Id: Ib2bae7e886784e91b3a886f7ccd439ff190feb22 --- .../filterpacks/videosrc/SurfaceTextureTarget.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'media') diff --git a/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java b/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java index 674a2bd..b6d9f94 100644 --- a/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java +++ b/media/mca/filterpacks/java/android/filterpacks/videosrc/SurfaceTextureTarget.java @@ -162,6 +162,10 @@ public class SurfaceTextureTarget extends Filter { @Override public synchronized void open(FilterContext context) { // Set up SurfaceTexture internals + if (mSurfaceTexture == null) { + Log.e(TAG, "SurfaceTexture is null!!"); + throw new RuntimeException("Could not register SurfaceTexture: " + mSurfaceTexture); + } mSurfaceId = context.getGLEnvironment().registerSurfaceTexture( mSurfaceTexture, mScreenWidth, mScreenHeight); if (mSurfaceId <= 0) { @@ -170,19 +174,24 @@ public class SurfaceTextureTarget extends Filter { } + // Once the surface is unregistered, we still need the surfacetexture reference. + // That is because when the the filter graph stops and starts again, the app + // may not set the mSurfaceTexture again on the filter. In some cases, the app + // may not even know that the graph has re-started. So it is difficult to enforce + // that condition on an app using this filter. The only case where we need + // to let go of the mSurfaceTexure reference is when the app wants to shut + // down the graph on purpose, such as in the disconnect call. @Override public synchronized void close(FilterContext context) { if (mSurfaceId > 0) { context.getGLEnvironment().unregisterSurfaceId(mSurfaceId); mSurfaceId = -1; - // Once the surface is unregistered, remove the surfacetexture reference. - // The surfaceId could not have been valid without a valid surfacetexture. - mSurfaceTexture = null; } } // This should be called from the client side when the surfacetexture is no longer // valid. e.g. from onPause() in the application using the filter graph. + // In this case, we need to let go of our surfacetexture reference. public synchronized void disconnect(FilterContext context) { if (mLogVerbose) Log.v(TAG, "disconnect"); if (mSurfaceTexture == null) { -- cgit v1.1