summaryrefslogtreecommitdiff
authorGuosong Zhou <guosong.zhou@amlogic.com>2015-08-30 12:23:38 (GMT)
committer Guosong Zhou <guosong.zhou@amlogic.com>2015-08-30 12:23:38 (GMT)
commit8031844c3121f418b93722683a3d96a09f83cee1 (patch)
treed71e5d52631a2b996b1e4ca74fd9fc642122d4a3
parent83805f317038b0c46e239f29dc72782eb6d60b37 (diff)
downloadcamera-8031844c3121f418b93722683a3d96a09f83cee1.zip
camera-8031844c3121f418b93722683a3d96a09f83cee1.tar.gz
camera-8031844c3121f418b93722683a3d96a09f83cee1.tar.bz2
PD#111858:support more preview size for usb camera
Change-Id: I75063cf03f769ee24f4ea435c00096f0da69b9d1
Diffstat
-rw-r--r--v3/fake-pipeline2/Sensor.cpp8
1 files changed, 4 insertions, 4 deletions
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;