| author | shanghai engineers <yuxi.sun@droid09.amlogic.com> | 2014-11-03 06:40:39 (GMT) |
|---|---|---|
| committer | shanghai engineers <yuxi.sun@droid09.amlogic.com> | 2014-11-03 06:51:12 (GMT) |
| commit | 72316f95575b7c0520a036c0a3253bddeacf1a4c (patch) | |
| tree | f9de539adb024c2573509292910dc785e61cd65e | |
| parent | 65708576822ecae70d4ac0d4626b362db9a3db3b (diff) | |
| download | camera-72316f95575b7c0520a036c0a3253bddeacf1a4c.zip camera-72316f95575b7c0520a036c0a3253bddeacf1a4c.tar.gz camera-72316f95575b7c0520a036c0a3253bddeacf1a4c.tar.bz2 | |
Add USB camera support for V3.2
Change-Id: I96e6e07cebaeea103603936130c81f9cfe0435a1
Signed-off-by: shanghai engineers <yuxi.sun@droid09.amlogic.com>
| -rwxr-xr-x | v3/fake-pipeline2/Sensor.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/v3/fake-pipeline2/Sensor.cpp b/v3/fake-pipeline2/Sensor.cpp index e06d7ae..1d36850 100755 --- a/v3/fake-pipeline2/Sensor.cpp +++ b/v3/fake-pipeline2/Sensor.cpp @@ -983,10 +983,11 @@ int Sensor::getStreamConfigurations(int32_t picSizes[], const int32_t kAvailable memset(&frmsize,0,sizeof(frmsize)); for (size_t f = 0;f < sizeof(kAvailableFormats)/sizeof(kAvailableFormats[0]);f++) { - - frmsize.pixel_format = getOutputFormat(kAvailableFormats[f]); + frmsize.pixel_format = getOutputFormat(kAvailableFormats[f]); + if (frmsize.pixel_format == V4L2_PIX_FMT_MJPEG) + break; //USB camera must be MJPEG } - + START = 0; for(i=0;;i++, count+=4){ frmsize.index = i; @@ -1012,6 +1013,8 @@ int Sensor::getStreamConfigurations(int32_t picSizes[], const int32_t kAvailable picSizes[count+2] = frmsize.discrete.height; picSizes[count+3] = ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT; + DBG_LOGB("get output width=%d, height=%d, format=%d\n", + frmsize.discrete.width, frmsize.discrete.height, frmsize.pixel_format); if (0 == i) continue; @@ -1056,6 +1059,9 @@ int Sensor::getStreamConfigurations(int32_t picSizes[], const int32_t kAvailable picSizes[count+2] = frmsize.discrete.height; picSizes[count+3] = ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT; + DBG_LOGB("get output width=%d, height=%d, format =\ + HAL_PIXEL_FORMAT_YCbCr_420_888\n", frmsize.discrete.width, + frmsize.discrete.height); if (0 == i) continue; @@ -1154,7 +1160,7 @@ int Sensor::getStreamConfigurationDurations(int32_t picSizes[], int64_t duration V4L2_PIX_FMT_YVU420, V4L2_PIX_FMT_NV21, V4L2_PIX_FMT_RGB24, - // V4L2_PIX_FMT_MJPEG, + V4L2_PIX_FMT_MJPEG, // V4L2_PIX_FMT_YUYV, // V4L2_PIX_FMT_YVU420 }; |