LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 3e3d973c: am 21e0c25e: am 184f79db: Support7Demo: fix video playback on GB

Browse Source 
* commit '3e3d973c48a5d13ac616b92e70c186c2c6eab128':
  Support7Demo: fix video playback on GB
This commit is contained in:
Chong Zhang
2013-08-26 15:04:07 -07:00
committed by Android Git Automerger
parent 6154b800a9 3e3d973c48
commit 424603a99e
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,7 +226,7 @@ public class MediaPlayerWrapper implements
}); });
} }
private void reset() { public void reset() {
if (mMediaPlayer != null) { if (mMediaPlayer != null) {
mMediaPlayer.stop(); mMediaPlayer.stop();
mMediaPlayer.release(); mMediaPlayer.release();

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

@@ -145,7 +145,9 @@ public abstract class OverlayDisplayWindow {
mWindowManager.addView(mSurfaceView, params); mWindowManager.addView(mSurfaceView, params);
mWindowVisible = true; mWindowVisible = true;
mListener.onWindowCreated(mSurfaceView.getHolder()); SurfaceHolder holder = mSurfaceView.getHolder();
holder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
mListener.onWindowCreated(holder);
} }
} }
@@ -458,4 +460,4 @@ public abstract class OverlayDisplayWindow {
} }
}; };
} }
} }

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

@@ -798,6 +798,7 @@ public class SampleMediaRouterActivity extends ActionBarActivity {
mLayout = (FrameLayout)findViewById(R.id.player); mLayout = (FrameLayout)findViewById(R.id.player);
mSurfaceView = (SurfaceView)findViewById(R.id.surface_view); mSurfaceView = (SurfaceView)findViewById(R.id.surface_view);
SurfaceHolder holder = mSurfaceView.getHolder(); SurfaceHolder holder = mSurfaceView.getHolder();
holder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
holder.addCallback(mLocalPlayer); holder.addCallback(mLocalPlayer);
} }
@@ -984,6 +985,8 @@ public class SampleMediaRouterActivity extends ActionBarActivity {
if (mPresentation != null || route.supportsControlCategory( if (mPresentation != null || route.supportsControlCategory(
MediaControlIntent.CATEGORY_REMOTE_PLAYBACK)) { MediaControlIntent.CATEGORY_REMOTE_PLAYBACK)) {
mMediaPlayer.setSurface((SurfaceHolder)null);
mMediaPlayer.reset();
mSurfaceView.setVisibility(View.GONE); mSurfaceView.setVisibility(View.GONE);
mLayout.setVisibility(View.GONE); mLayout.setVisibility(View.GONE);
} else { } else {
@@ -1028,6 +1031,7 @@ public class SampleMediaRouterActivity extends ActionBarActivity {
// Set up the surface view. // Set up the surface view.
mPresentationSurfaceView = (SurfaceView)findViewById(R.id.surface_view); mPresentationSurfaceView = (SurfaceView)findViewById(R.id.surface_view);
SurfaceHolder holder = mPresentationSurfaceView.getHolder(); SurfaceHolder holder = mPresentationSurfaceView.getHolder();
holder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
holder.addCallback(mLocalPlayer); holder.addCallback(mLocalPlayer);
} }