diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-19 16:47:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-19 16:47:32 -0700 |
| commit | 11eb0d9b627a4d153c9e023968f73f65b415c0a8 (patch) | |
| tree | 9763bcde239c3a359fa7da3b4c6d887ce8f15011 /services | |
| parent | c45ba052e2068591ece2f03c73b7b6b0e3bdb746 (diff) | |
| parent | c0fdb98b87bdd88c643a630e18838ddcdd5ab964 (diff) | |
| download | frameworks_av-11eb0d9b627a4d153c9e023968f73f65b415c0a8.zip frameworks_av-11eb0d9b627a4d153c9e023968f73f65b415c0a8.tar.gz frameworks_av-11eb0d9b627a4d153c9e023968f73f65b415c0a8.tar.bz2 | |
Merge "Camera2: Fix potential deadlock" into jb-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index 98332f9..0675400 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp @@ -529,15 +529,19 @@ status_t Camera2Client::setPreviewWindowL(const sp<IBinder>& binder, return NO_ERROR; } - SharedParameters::Lock l(mParameters); - switch (l.mParameters.state) { + Parameters::State state; + { + SharedParameters::Lock l(mParameters); + state = l.mParameters.state; + } + switch (state) { case Parameters::DISCONNECTED: case Parameters::RECORD: case Parameters::STILL_CAPTURE: case Parameters::VIDEO_SNAPSHOT: ALOGE("%s: Camera %d: Cannot set preview display while in state %s", __FUNCTION__, mCameraId, - Parameters::getStateName(l.mParameters.state)); + Parameters::getStateName(state)); return INVALID_OPERATION; case Parameters::STOPPED: case Parameters::WAITING_FOR_PREVIEW_WINDOW: @@ -545,10 +549,8 @@ status_t Camera2Client::setPreviewWindowL(const sp<IBinder>& binder, break; case Parameters::PREVIEW: // Already running preview - need to stop and create a new stream - // TODO: Optimize this so that we don't wait for old stream to drain - // before spinning up new stream mStreamingProcessor->stopStream(); - l.mParameters.state = Parameters::WAITING_FOR_PREVIEW_WINDOW; + state = Parameters::WAITING_FOR_PREVIEW_WINDOW; break; } @@ -560,7 +562,9 @@ status_t Camera2Client::setPreviewWindowL(const sp<IBinder>& binder, return res; } - if (l.mParameters.state == Parameters::WAITING_FOR_PREVIEW_WINDOW) { + if (state == Parameters::WAITING_FOR_PREVIEW_WINDOW) { + SharedParameters::Lock l(mParameters); + l.mParameters.state = state; return startPreviewL(l.mParameters, false); } |