From 8031844c3121f418b93722683a3d96a09f83cee1 Mon Sep 17 00:00:00 2001 From: Guosong Zhou Date: Sun, 30 Aug 2015 12:23:38 +0000 Subject: PD#111858:support more preview size for usb camera Change-Id: I75063cf03f769ee24f4ea435c00096f0da69b9d1 --- diff --git a/v3/fake-pipeline2/Sensor.cpp b/v3/fake-pipeline2/Sensor.cpp index b0b5fbe..bd4ab5b 100644 --- a/v3/fake-pipeline2/Sensor.cpp +++ b/v3/fake-pipeline2/Sensor.cpp @@ -1260,13 +1260,13 @@ int Sensor::getStreamConfigurations(uint32_t picSizes[], const int32_t kAvailabl if (count >= size) break; - +#if 0 if ((frmsize.pixel_format == V4L2_PIX_FMT_MJPEG) || (frmsize.pixel_format == V4L2_PIX_FMT_YUYV)) { int count = sizeof(kUsbAvailableSize)/sizeof(kUsbAvailableSize[0]); if (!IsUsbAvailableSize(kUsbAvailableSize, frmsize.discrete.width, frmsize.discrete.height,count)) continue; } - +#endif picSizes[count+0] = HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED; picSizes[count+1] = frmsize.discrete.width; picSizes[count+2] = frmsize.discrete.height; @@ -1315,13 +1315,13 @@ int Sensor::getStreamConfigurations(uint32_t picSizes[], const int32_t kAvailabl if (count >= size) break; - +#if 0 if ((frmsize.pixel_format == V4L2_PIX_FMT_MJPEG) || (frmsize.pixel_format == V4L2_PIX_FMT_YUYV)) { int count = sizeof(kUsbAvailableSize)/sizeof(kUsbAvailableSize[0]); if (!IsUsbAvailableSize(kUsbAvailableSize, frmsize.discrete.width, frmsize.discrete.height,count)) continue; } - +#endif picSizes[count+0] = HAL_PIXEL_FORMAT_YCbCr_420_888; picSizes[count+1] = frmsize.discrete.width; picSizes[count+2] = frmsize.discrete.height; -- cgit