diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2014-09-05 14:14:44 -0700 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2014-09-08 09:24:39 -0700 |
| commit | 3ea3fcd0822b2f43d87f1d8f67d7bf145864b201 (patch) | |
| tree | ea68ff08df4bdcea47bd42b6a33f36140c9e8a5b /services/camera/libcameraservice/device3/Camera3Stream.cpp | |
| parent | e7494680914c384dc6e93ae85f4337b06b300468 (diff) | |
| download | frameworks_av-3ea3fcd0822b2f43d87f1d8f67d7bf145864b201.zip frameworks_av-3ea3fcd0822b2f43d87f1d8f67d7bf145864b201.tar.gz frameworks_av-3ea3fcd0822b2f43d87f1d8f67d7bf145864b201.tar.bz2 | |
Camera2: reconfigure video snapshot size if needed
When recording fails to start due to stream configuration failed,
try configure stream again by setting jpeg stream to video size.
Bug: 16162133
Change-Id: Ib20271e787ae07719ce419f0b15c7f86434f7ebb
Diffstat (limited to 'services/camera/libcameraservice/device3/Camera3Stream.cpp')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Stream.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Stream.cpp b/services/camera/libcameraservice/device3/Camera3Stream.cpp index 29ce38c..3c0e908 100644 --- a/services/camera/libcameraservice/device3/Camera3Stream.cpp +++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp @@ -233,8 +233,7 @@ status_t Camera3Stream::cancelConfiguration() { camera3_stream::usage = oldUsage; camera3_stream::max_buffers = oldMaxBuffers; - mState = STATE_CONSTRUCTED; - + mState = (mState == STATE_IN_RECONFIG) ? STATE_CONFIGURED : STATE_CONSTRUCTED; return OK; } |