diff options
| author | Igor Murashkin <iam@google.com> | 2013-02-20 19:29:53 -0800 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-02-22 10:50:15 -0800 |
| commit | 5835cc46a2f06dbfa5fbdab70e091896ef2fb438 (patch) | |
| tree | f303abd135f649d5beb940a238b906b4027564f5 /services | |
| parent | 76f8b43909817179b317880202360863b8f976d0 (diff) | |
| download | frameworks_av-5835cc46a2f06dbfa5fbdab70e091896ef2fb438.zip frameworks_av-5835cc46a2f06dbfa5fbdab70e091896ef2fb438.tar.gz frameworks_av-5835cc46a2f06dbfa5fbdab70e091896ef2fb438.tar.bz2 | |
Camera: ProCamera - add createStreamCpu and unit test
Change-Id: I468172dbfdd78510b273bf9d119c950cbeda7ea3
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/ProCamera2Client.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/ProCamera2Client.cpp b/services/camera/libcameraservice/ProCamera2Client.cpp index aa02f10..f850034 100644 --- a/services/camera/libcameraservice/ProCamera2Client.cpp +++ b/services/camera/libcameraservice/ProCamera2Client.cpp @@ -234,6 +234,13 @@ status_t ProCamera2Client::cancelStream(int streamId) { Mutex::Autolock icl(mIProCameraUserLock); + mDevice->clearStreamingRequest(); + + status_t code; + if ((code = mDevice->waitUntilDrained()) != OK) { + ALOGE("%s: waitUntilDrained failed with code 0x%x", __FUNCTION__, code); + } + return mDevice->deleteStream(streamId); } |