diff options
| author | Gloria Wang <gwang@google.com> | 2011-08-09 15:29:34 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-08-09 15:31:30 -0700 |
| commit | 80ec929862bcfe8582984f3a28e7a4ca5f4f27bb (patch) | |
| tree | adf6e0d1cbd9c0496fa8caad1a9d3f0ecfca4e09 /media/libstagefright/AwesomePlayer.cpp | |
| parent | 99930d45c40f2d79a7633d9dd9f8478d22307848 (diff) | |
| download | frameworks_av-80ec929862bcfe8582984f3a28e7a4ca5f4f27bb.zip frameworks_av-80ec929862bcfe8582984f3a28e7a4ca5f4f27bb.tar.gz frameworks_av-80ec929862bcfe8582984f3a28e7a4ca5f4f27bb.tar.bz2 | |
To support for switching from a non-null surface/ surface texture to
a null one, and vice versa.
Fix for bug 5137445.
Change-Id: Ifca2997f8ad27a843abbdaa7e89a56329bc40fde
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 67f6c79..9c9bc2d 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -1157,6 +1157,8 @@ void AwesomePlayer::setSurfaceTexture(const sp<ISurfaceTexture> &surfaceTexture) mSurface.clear(); if (surfaceTexture != NULL) { setNativeWindow_l(new SurfaceTextureClient(surfaceTexture)); + } else { + setNativeWindow_l(NULL); } } @@ -1769,7 +1771,8 @@ void AwesomePlayer::onVideoEvent() { } } - if (mVideoRendererIsPreview || mVideoRenderer == NULL) { + if ((mNativeWindow != NULL) + && (mVideoRendererIsPreview || mVideoRenderer == NULL)) { mVideoRendererIsPreview = false; initRenderer_l(); |