diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2014-07-17 16:05:23 -0700 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2014-07-18 15:45:09 -0700 |
| commit | 28d0327bc80e1e424c3db34c62e8f73cd5ffab1e (patch) | |
| tree | b5e6f1598faa883b5d7a188ab7a698426c659555 /services/camera | |
| parent | f6ef963fecde3b63696028fadce4bcfb5b998db0 (diff) | |
| download | frameworks_av-28d0327bc80e1e424c3db34c62e8f73cd5ffab1e.zip frameworks_av-28d0327bc80e1e424c3db34c62e8f73cd5ffab1e.tar.gz frameworks_av-28d0327bc80e1e424c3db34c62e8f73cd5ffab1e.tar.bz2 | |
cameraservice: remove record stream in stopPreview
Remove recording stream every time stopPreview is called.
Change-Id: Iabb783a75418aa41ddc2693cfdfd5a2131109070
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/api1/Camera2Client.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp index 1642896..9721e13 100644 --- a/services/camera/libcameraservice/api1/Camera2Client.cpp +++ b/services/camera/libcameraservice/api1/Camera2Client.cpp @@ -906,6 +906,13 @@ void Camera2Client::stopPreviewL() { ALOGE("%s: Camera %d: Waiting to stop streaming failed: %s (%d)", __FUNCTION__, mCameraId, strerror(-res), res); } + // Clean up recording stream + res = mStreamingProcessor->deleteRecordingStream(); + if (res != OK) { + ALOGE("%s: Camera %d: Unable to delete recording stream before " + "stop preview: %s (%d)", + __FUNCTION__, mCameraId, strerror(-res), res); + } // no break case Parameters::WAITING_FOR_PREVIEW_WINDOW: { SharedParameters::Lock l(mParameters); |