diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-04-15 13:50:13 -0700 |
|---|---|---|
| committer | Chien-Yu Chen <cychen@google.com> | 2015-04-15 13:59:05 -0700 |
| commit | 90746f4203989fceb0f2131163435644040218d3 (patch) | |
| tree | a5a482af51247342f20e349dec7d44bcb2e9bac3 /services | |
| parent | 2f33dbc6ca08d45efea2df775c158e2a11e07ab6 (diff) | |
| download | frameworks_av-90746f4203989fceb0f2131163435644040218d3.zip frameworks_av-90746f4203989fceb0f2131163435644040218d3.tar.gz frameworks_av-90746f4203989fceb0f2131163435644040218d3.tar.bz2 | |
Camera3: allow reconfiguring the input stream
Change-Id: Ia9d0db1f3378264fc9173bfc8706c8f955b79182
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Stream.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Stream.cpp b/services/camera/libcameraservice/device3/Camera3Stream.cpp index d3c5cc3..02727a3 100644 --- a/services/camera/libcameraservice/device3/Camera3Stream.cpp +++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp @@ -109,11 +109,7 @@ camera3_stream* Camera3Stream::startConfiguration() { // oldUsage/oldMaxBuffers return this; case STATE_CONFIGURED: - if (stream_type == CAMERA3_STREAM_INPUT) { - ALOGE("%s: Cannot configure an input stream twice", - __FUNCTION__); - return NULL; - } else if (hasOutstandingBuffersLocked()) { + if (hasOutstandingBuffersLocked()) { ALOGE("%s: Cannot configure stream; has outstanding buffers", __FUNCTION__); return NULL; |