diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-04-27 15:04:22 -0700 |
|---|---|---|
| committer | Chien-Yu Chen <cychen@google.com> | 2015-05-05 14:02:01 -0700 |
| commit | ed0412ed78321bf9d35537626e33115862f7c805 (patch) | |
| tree | b581ebde8b57ebf5fac45e5b9d24926f9786594f /services/camera/libcameraservice/device3 | |
| parent | 466dc8ed6ca6b7f585104806c48613dd34e608c9 (diff) | |
| download | frameworks_av-ed0412ed78321bf9d35537626e33115862f7c805.zip frameworks_av-ed0412ed78321bf9d35537626e33115862f7c805.tar.gz frameworks_av-ed0412ed78321bf9d35537626e33115862f7c805.tar.bz2 | |
Camera2: allow mixing regular/reprocess requests
Allow mixing regular and reprocess requests in a capture burst. Also
call abandon() when deleting an input stream.
Bug: 20537735
Change-Id: If8c7781038173ab21c73f5ddc32f53793cf86fd9
Diffstat (limited to 'services/camera/libcameraservice/device3')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3InputStream.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3InputStream.cpp b/services/camera/libcameraservice/device3/Camera3InputStream.cpp index 84c5754..2504bfd 100644 --- a/services/camera/libcameraservice/device3/Camera3InputStream.cpp +++ b/services/camera/libcameraservice/device3/Camera3InputStream.cpp @@ -187,6 +187,8 @@ status_t Camera3InputStream::disconnectLocked() { assert(mBuffersInFlight.size() == 0); + mConsumer->abandon(); + /** * no-op since we can't disconnect the producer from the consumer-side */ |