diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-09-06 15:00:01 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2013-09-08 09:58:11 -0700 |
| commit | d1d6467d3bcbc1305eeba0176a2edf04925c368e (patch) | |
| tree | b79d4ac9bc0293a29ce391f3fb611d7ea8f30eb3 /services/camera/libcameraservice/device3 | |
| parent | 84b7fb0c88ddd05ed7c148c82fe1691040a9404d (diff) | |
| download | frameworks_av-d1d6467d3bcbc1305eeba0176a2edf04925c368e.zip frameworks_av-d1d6467d3bcbc1305eeba0176a2edf04925c368e.tar.gz frameworks_av-d1d6467d3bcbc1305eeba0176a2edf04925c368e.tar.bz2 | |
Camera: Correct stream id types
Bug: 10604704
Change-Id: I223ac5d200eb6439c08955fb7ad586592099fbae
Diffstat (limited to 'services/camera/libcameraservice/device3')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Device.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index 47321e0..44ea739 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -978,7 +978,7 @@ sp<Camera3Device::CaptureRequest> Camera3Device::createCaptureRequest( newRequest->mSettings.find(ANDROID_REQUEST_INPUT_STREAMS); if (inputStreams.count > 0) { if (mInputStream == NULL || - mInputStream->getId() != inputStreams.data.u8[0]) { + mInputStream->getId() != inputStreams.data.i32[0]) { CLOGE("Request references unknown input stream %d", inputStreams.data.u8[0]); return NULL; @@ -1007,7 +1007,7 @@ sp<Camera3Device::CaptureRequest> Camera3Device::createCaptureRequest( } for (size_t i = 0; i < streams.count; i++) { - int idx = mOutputStreams.indexOfKey(streams.data.u8[i]); + int idx = mOutputStreams.indexOfKey(streams.data.i32[i]); if (idx == NAME_NOT_FOUND) { CLOGE("Request references unknown stream %d", streams.data.u8[i]); |