From 0c5aeec9d23b62d45c62e736341ede29b53b95d4 Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Fri, 6 Sep 2013 17:52:02 -0700 Subject: libcamera2: Fix stream id types Bug: 10604704 Change-Id: Ie336eaf06693a33179625fc93defc7e878f630f7 --- libcamera2/MetadataConverter.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libcamera2/MetadataConverter.cpp b/libcamera2/MetadataConverter.cpp index 386c62a..a235461 100644 --- a/libcamera2/MetadataConverter.cpp +++ b/libcamera2/MetadataConverter.cpp @@ -331,22 +331,22 @@ status_t MetadataConverter::ToInternalShot(camera_metadata_t * request, struct c break; case ANDROID_REQUEST_OUTPUT_STREAMS: - if (NO_ERROR != CheckEntryTypeMismatch(&curr_entry, TYPE_BYTE)) + if (NO_ERROR != CheckEntryTypeMismatch(&curr_entry, TYPE_INT32)) break; dst->ctl.request.outputStreams[0] = 0; for (i=0 ; ictl.request.outputStreams[0] |= (1 << curr_entry.data.u8[i]); + ALOGV("DEBUG(%s): OUTPUT_STREAM[%d] = %d ", __FUNCTION__, i, curr_entry.data.i32[i]); + dst->ctl.request.outputStreams[0] |= (1 << curr_entry.data.i32[i]); } break; case ANDROID_REQUEST_INPUT_STREAMS: - if (NO_ERROR != CheckEntryTypeMismatch(&curr_entry, TYPE_BYTE)) + if (NO_ERROR != CheckEntryTypeMismatch(&curr_entry, TYPE_INT32)) break; for (i=0 ; ireprocessInput = curr_entry.data.u8[0]; + dst_ext->reprocessInput = curr_entry.data.i32[0]; ALOGV("DEBUG(%s): ANDROID_REQUEST_INPUT_STREAMS[%d] = %d ", __FUNCTION__, i, dst_ext->reprocessInput); } break; -- cgit v1.2.3