commit 184f79db44846b492e2b8b3785b5b62df1f22479
author Chong Zhang <chz@google.com> Fri Aug 23 18:39:48 2013 -0700
committer Jeff Brown <jeffbrown@google.com> Mon Aug 26 16:25:45 2013 +0000
tree 2dd24ddd38e92bcd839ba0b04d45ed3692b3c488
parent 9299c6cdd8e5d084ef4c10e5b7f044e0ea590641

Support7Demo: fix video playback on GB

Change-Id: I2d403832d82428746dd3ccdbe0cfd56315d72ed9
(cherry picked from commit dbcc746cb0d727ac9aed60bb4156b3bf9f4668aa)

samples/Support7Demos/src/com/example/android/supportv7/media/MediaPlayerWrapper.java

diff --git a/samples/Support7Demos/src/com/example/android/supportv7/media/MediaPlayerWrapper.java b/samples/Support7Demos/src/com/example/android/supportv7/media/MediaPlayerWrapper.java
index 658caca..8b82631 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/media/MediaPlayerWrapper.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/media/MediaPlayerWrapper.java
@@ -226,7 +226,7 @@
         });
     }
 
-    private void reset() {
+    public void reset() {
         if (mMediaPlayer != null) {
             mMediaPlayer.stop();
             mMediaPlayer.release();

samples/Support7Demos/src/com/example/android/supportv7/media/OverlayDisplayWindow.java

diff --git a/samples/Support7Demos/src/com/example/android/supportv7/media/OverlayDisplayWindow.java b/samples/Support7Demos/src/com/example/android/supportv7/media/OverlayDisplayWindow.java
index e691c14..0234a30 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/media/OverlayDisplayWindow.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/media/OverlayDisplayWindow.java
@@ -145,7 +145,9 @@
                 mWindowManager.addView(mSurfaceView, params);
                 mWindowVisible = true;
 
-                mListener.onWindowCreated(mSurfaceView.getHolder());
+                SurfaceHolder holder = mSurfaceView.getHolder();
+                holder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+                mListener.onWindowCreated(holder);
             }
         }
 
@@ -458,4 +460,4 @@
             }
         };
     }
-}
\ No newline at end of file
+}

samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java

diff --git a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java
index 4f95302..04d57a0 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java
@@ -794,6 +794,7 @@
             mLayout = (FrameLayout)findViewById(R.id.player);
             mSurfaceView = (SurfaceView)findViewById(R.id.surface_view);
             SurfaceHolder holder = mSurfaceView.getHolder();
+            holder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
             holder.addCallback(mLocalPlayer);
         }
 
@@ -980,6 +981,8 @@
 
             if (mPresentation != null || route.supportsControlCategory(
                     MediaControlIntent.CATEGORY_REMOTE_PLAYBACK)) {
+                mMediaPlayer.setSurface((SurfaceHolder)null);
+                mMediaPlayer.reset();
                 mSurfaceView.setVisibility(View.GONE);
                 mLayout.setVisibility(View.GONE);
             } else {
@@ -1024,6 +1027,7 @@
                 // Set up the surface view.
                 mPresentationSurfaceView = (SurfaceView)findViewById(R.id.surface_view);
                 SurfaceHolder holder = mPresentationSurfaceView.getHolder();
+                holder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
                 holder.addCallback(mLocalPlayer);
             }