diff options
| -rw-r--r-- | media/java/android/media/MediaRecorder.java | 8 | ||||
| -rwxr-xr-x | media/libstagefright/CameraSource.cpp | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 6319630..31b9143 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -124,9 +124,15 @@ public class MediaRecorder /** * Sets a Surface to show a preview of recorded media (video). Calls this * before prepare() to make sure that the desirable preview display is - * set. + * set. If {@link #setCamera(Camera)} is used and the surface has been + * already set to the camera, application do not need to call this. If + * this is called with non-null surface, the preview surface of the camera + * will be replaced by the new surface. If this method is called with null + * surface or not called at all, media recorder will not change the preview + * surface of the camera. * * @param sv the Surface to use for the preview + * @see android.hardware.Camera#setPreviewDisplay(android.view.SurfaceHolder) */ public void setPreviewDisplay(Surface sv) { mSurface = sv; diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp index 2df5528..3ddad93 100755 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -515,9 +515,13 @@ status_t CameraSource::initWithCameraAccess( return err; } - // This CHECK is good, since we just passed the lock/unlock - // check earlier by calling mCamera->setParameters(). - CHECK_EQ((status_t)OK, mCamera->setPreviewDisplay(mSurface)); + // Set the preview display. Skip this if mSurface is null because + // applications may already set a surface to the camera. + if (mSurface != NULL) { + // This CHECK is good, since we just passed the lock/unlock + // check earlier by calling mCamera->setParameters(). + CHECK_EQ((status_t)OK, mCamera->setPreviewDisplay(mSurface)); + } // By default, do not store metadata in video buffers mIsMetaDataStoredInVideoBuffers = false; |