diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2019-02-14 01:00:21 +0000 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2019-02-14 01:00:21 +0000 |
| commit | 1e7e3d31892abe7c948d276eb0cb3022e4c22370 (patch) | |
| tree | af5e3c39e2487e3f29ac2220a849cf43ce5fbb07 /camera | |
| parent | 71e1cc652cae25e9943bb3811d172abc8816c4d9 (diff) | |
| download | marlin-1e7e3d31892abe7c948d276eb0cb3022e4c22370.tar.gz | |
Revert "Camera: adapt to camera3.h update"
This reverts commit 71e1cc652cae25e9943bb3811d172abc8816c4d9.
Reason for revert: camera3.h header change reverted
Change-Id: I95ae8d37c9069d57c5022e6d9d4e3dbaf3e83e67
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/QCamera2/HAL3/QCamera3HWI.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp index 138b996d..24a8728b 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -8690,8 +8690,7 @@ int QCamera3HardwareInterface::isStreamCombinationSupported(uint32_t cameraId, } camera3_stream_configuration_t streamList = {comb->num_streams, /*streams*/ nullptr, - comb->operation_mode, /*session_parameters*/ nullptr, - /*stream_configuration_counter*/0}; + comb->operation_mode, /*session_parameters*/ nullptr}; streamList.streams = new camera3_stream_t * [comb->num_streams]; camera3_stream_t *streamBuffer = new camera3_stream_t[comb->num_streams]; for (size_t i = 0; i < comb->num_streams; i++) { |