summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-12-05 14:25:34 -0800
committerJames Dong <jdong@google.com>2010-12-05 16:08:30 -0800
commit5df53fe2f038bc23f2e3c452dc8398c8bdd08d30 (patch)
treebf971ac81017ef67dc0387768f6002e420233dcb /media/libmediaplayerservice
parent933a4bb4ffccc4235e913b401d752789f58bfc06 (diff)
downloadframeworks_base-5df53fe2f038bc23f2e3c452dc8398c8bdd08d30.zip
frameworks_base-5df53fe2f038bc23f2e3c452dc8398c8bdd08d30.tar.gz
frameworks_base-5df53fe2f038bc23f2e3c452dc8398c8bdd08d30.tar.bz2
Remove check if the target video resolution is not supported by CameraSource
and clean up Camera is CameraSource could not created. bug - 3254411 Change-Id: I43497c450e7007de5ce027e2912b1421119e8887
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/StagefrightRecorder.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index cee92d2..f72d919 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -1079,7 +1079,15 @@ status_t StagefrightRecorder::setupCameraSource(
mCamera, mCameraId, videoSize, mFrameRate,
mPreviewSurface, true /*storeMetaDataInVideoBuffers*/);
}
- CHECK(*cameraSource != NULL);
+ if (*cameraSource == NULL) {
+ return UNKNOWN_ERROR;
+ }
+
+ if ((*cameraSource)->initCheck() != OK) {
+ (*cameraSource).clear();
+ *cameraSource = NULL;
+ return NO_INIT;
+ }
// When frame rate is not set, the actual frame rate will be set to
// the current frame rate being used.