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 | |
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."
-rw-r--r-- | include/media/stagefright/CameraSource.h | 3 | ||||
-rw-r--r-- | media/libstagefright/CameraSourceTimeLapse.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h index a829916..69cfbd0 100644 --- a/include/media/stagefright/CameraSource.h +++ b/include/media/stagefright/CameraSource.h @@ -185,6 +185,8 @@ protected: virtual void dataCallbackTimestamp(int64_t timestampUs, int32_t msgType, const sp<IMemory> &data); + void releaseCamera(); + private: friend class CameraSourceListener; @@ -233,7 +235,6 @@ private: int32_t frameRate); void stopCameraRecording(); - void releaseCamera(); status_t reset(); CameraSource(const CameraSource &); 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; } |