diff options
| author | Robert Shih <robertshih@google.com> | 2013-11-26 06:03:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-26 06:03:21 +0000 |
| commit | 7e3c19fbead7af39b3c0ca3d170406a98f97dbd0 (patch) | |
| tree | c27b504b5ea16bd1d895c9ae4379b850640cba49 /media/libstagefright/CameraSourceTimeLapse.cpp | |
| parent | 87b009dec36f8dea6e804ae7dee9d6fc0c661af6 (diff) | |
| parent | 9bb976e1c78048081cf9df4d8a1db67311413e5b (diff) | |
| download | frameworks_av-7e3c19fbead7af39b3c0ca3d170406a98f97dbd0.zip frameworks_av-7e3c19fbead7af39b3c0ca3d170406a98f97dbd0.tar.gz frameworks_av-7e3c19fbead7af39b3c0ca3d170406a98f97dbd0.tar.bz2 | |
Merge "Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initialization failed in the parent class ctor CameraSource::CameraSource."
Diffstat (limited to 'media/libstagefright/CameraSourceTimeLapse.cpp')
| -rw-r--r-- | media/libstagefright/CameraSourceTimeLapse.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/CameraSourceTimeLapse.cpp b/media/libstagefright/CameraSourceTimeLapse.cpp index 5772316..86844b8 100644 --- a/media/libstagefright/CameraSourceTimeLapse.cpp +++ b/media/libstagefright/CameraSourceTimeLapse.cpp @@ -85,7 +85,8 @@ CameraSourceTimeLapse::CameraSourceTimeLapse( mVideoWidth = videoSize.width; mVideoHeight = videoSize.height; - if (!trySettingVideoSize(videoSize.width, videoSize.height)) { + if (OK == mInitCheck && !trySettingVideoSize(videoSize.width, videoSize.height)) { + releaseCamera(); mInitCheck = NO_INIT; } |