summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2013-09-06 15:46:42 -0700
committerZhijun He <zhijunhe@google.com>2013-09-06 15:46:42 -0700
commite8122dff1ef2de4d41835265a59d8960e7800fae (patch)
treef6090fb592bf64c37e966179871b13976084a592 /camera
parent3ad13188d4e7e873947040ec22a35d73efb76812 (diff)
downloadandroid_device_generic_goldfish-e8122dff1ef2de4d41835265a59d8960e7800fae.tar.gz
android_device_generic_goldfish-e8122dff1ef2de4d41835265a59d8960e7800fae.tar.bz2
android_device_generic_goldfish-e8122dff1ef2de4d41835265a59d8960e7800fae.zip
camera3: Fix stream id types
Bug: 10604704 Change-Id: I93b7b932f13e7d90d843e74ec8c4e6bae3a2987b
Diffstat (limited to 'camera')
-rw-r--r--camera/EmulatedFakeCamera2.cpp6
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