From 1cfcfd55f22577bbc70cddb6137c286b8d3c8491 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Tue, 6 Sep 2011 16:59:58 -0700 Subject: [PATCH] Bugfixes in MediaSource SurfaceTexture management. Regressions from fix to Bug: 5117570 Change-Id: Ic21dc37d2f99e167fad613ae7565d7b7aeba07e1 --- mca/filterpacks/videosrc/java/MediaSource.java | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/mca/filterpacks/videosrc/java/MediaSource.java b/mca/filterpacks/videosrc/java/MediaSource.java index 079f07ee..cb9192bf 100644 --- a/mca/filterpacks/videosrc/java/MediaSource.java +++ b/mca/filterpacks/videosrc/java/MediaSource.java @@ -144,24 +144,26 @@ public class MediaSource extends Filter { mFrameExtractor.setSourceRect(0, 1, 1, -1); createFormats(); - - mMediaFrame = (GLFrame)context.getFrameManager().newBoundFrame(mOutputFormat, - GLFrame.EXTERNAL_TEXTURE, - 0); - mSurfaceTexture = new SurfaceTexture(mMediaFrame.getTextureId()); - } @Override public void open(FilterContext context) { - if (mLogVerbose) Log.v(TAG, "Opening MediaSource"); if (mLogVerbose) { - if (mSelectedIsUrl) { - Log.v(TAG, "Current URL is " + mSourceUrl); - } else { - Log.v(TAG, "Current source is Asset!"); - } + Log.v(TAG, "Opening MediaSource"); + if (mSelectedIsUrl) { + Log.v(TAG, "Current URL is " + mSourceUrl); + } else { + Log.v(TAG, "Current source is Asset!"); + } } + + mMediaFrame = (GLFrame)context.getFrameManager().newBoundFrame( + mOutputFormat, + GLFrame.EXTERNAL_TEXTURE, + 0); + + mSurfaceTexture = new SurfaceTexture(mMediaFrame.getTextureId()); + if (!setupMediaPlayer(mSelectedIsUrl)) { throw new RuntimeException("Error setting up MediaPlayer!"); } -- 2.11.0