diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-09-09 11:31:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-09 11:31:29 -0700 |
| commit | 0b8bbf4218f6cc26167275c8f5f57f67a9037f36 (patch) | |
| tree | 00148fea19bd81e15d5663cdf6e3ab3439cba409 | |
| parent | 42e7cfa648fa233e7e1cc5f11a0fefb244be08ef (diff) | |
| parent | e8122dff1ef2de4d41835265a59d8960e7800fae (diff) | |
| download | android_device_generic_goldfish-0b8bbf4218f6cc26167275c8f5f57f67a9037f36.tar.gz android_device_generic_goldfish-0b8bbf4218f6cc26167275c8f5f57f67a9037f36.tar.bz2 android_device_generic_goldfish-0b8bbf4218f6cc26167275c8f5f57f67a9037f36.zip | |
am e8122dff: camera3: Fix stream id types
* commit 'e8122dff1ef2de4d41835265a59d8960e7800fae':
camera3: Fix stream id types
| -rw-r--r-- | camera/EmulatedFakeCamera2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/camera/EmulatedFakeCamera2.cpp b/camera/EmulatedFakeCamera2.cpp index 62f4e9f..f007a86 100644 --- a/camera/EmulatedFakeCamera2.cpp +++ b/camera/EmulatedFakeCamera2.cpp @@ -911,7 +911,7 @@ bool EmulatedFakeCamera2::ConfigureThread::setupCapture() { mNextNeedsJpeg = false; ALOGV("Configure: Setting up buffers for capture"); for (size_t i = 0; i < streams.count; i++) { - int streamId = streams.data.u8[i]; + int streamId = streams.data.i32[i]; const Stream &s = mParent->getStreamInfo(streamId); if (s.format == HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED) { ALOGE("%s: Stream %d does not have a concrete pixel format, but " @@ -1041,7 +1041,7 @@ bool EmulatedFakeCamera2::ConfigureThread::setupReprocess() { ALOGV("Configure: Setting up input buffers for reprocess"); for (size_t i = 0; i < reprocessStreams.count; i++) { - int streamId = reprocessStreams.data.u8[i]; + int streamId = reprocessStreams.data.i32[i]; const ReprocessStream &s = mParent->getReprocessStreamInfo(streamId); if (s.format != HAL_PIXEL_FORMAT_RGB_888) { ALOGE("%s: Only ZSL reprocessing supported!", @@ -1070,7 +1070,7 @@ bool EmulatedFakeCamera2::ConfigureThread::setupReprocess() { ALOGV("Configure: Setting up output buffers for reprocess"); for (size_t i = 0; i < streams.count; i++) { - int streamId = streams.data.u8[i]; + int streamId = streams.data.i32[i]; const Stream &s = mParent->getStreamInfo(streamId); if (s.format != HAL_PIXEL_FORMAT_BLOB) { // TODO: Support reprocess to YUV |