diff options
| author | Robert Shih <robertshih@google.com> | 2013-11-22 12:58:43 -0800 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2013-11-22 17:29:02 -0800 |
| commit | 9bb976e1c78048081cf9df4d8a1db67311413e5b (patch) | |
| tree | 90f633078dd96d51cf05b28c3bf8d69b3ca0bda9 /media/libstagefright/CameraSourceTimeLapse.cpp | |
| parent | 0f3984ed3271484e223826e8a2e5f70c4111e08f (diff) | |
| download | frameworks_av-9bb976e1c78048081cf9df4d8a1db67311413e5b.zip frameworks_av-9bb976e1c78048081cf9df4d8a1db67311413e5b.tar.gz frameworks_av-9bb976e1c78048081cf9df4d8a1db67311413e5b.tar.bz2 | |
Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initialization
failed in the parent class ctor CameraSource::CameraSource.
Bug: 11636771
Change-Id: I5e6bffc1ebeeb1c2b84d6ed2049b2b3676ac046a
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 20214e8..07f0271 100644 --- a/media/libstagefright/CameraSourceTimeLapse.cpp +++ b/media/libstagefright/CameraSourceTimeLapse.cpp @@ -81,7 +81,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; } |