| author | Guosong Zhou <guosong.zhou@amlogic.com> | 2015-01-23 12:00:50 (GMT) |
|---|---|---|
| committer | Guosong Zhou <guosong.zhou@amlogic.com> | 2015-01-27 05:42:20 (GMT) |
| commit | 71d127ed0956d4e8e9f8f03f23953a48a0eea414 (patch) | |
| tree | 42b50b746b3d464ca38f5ef81feb80bfb8532322 | |
| parent | 68f33086d4eaab077793b26ca36f9ffcc902b2d3 (diff) | |
| download | camera-71d127ed0956d4e8e9f8f03f23953a48a0eea414.zip camera-71d127ed0956d4e8e9f8f03f23953a48a0eea414.tar.gz camera-71d127ed0956d4e8e9f8f03f23953a48a0eea414.tar.bz2 | |
PD #102708: fix MID m102 camera change to front camera stop bug
Change-Id: I6d975a525b66fb1981dd72f5a8810a49f8d5541d
| -rwxr-xr-x | v3/fake-pipeline2/Sensor.cpp | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/v3/fake-pipeline2/Sensor.cpp b/v3/fake-pipeline2/Sensor.cpp index a32369f..422c26b 100755 --- a/v3/fake-pipeline2/Sensor.cpp +++ b/v3/fake-pipeline2/Sensor.cpp @@ -1199,8 +1199,10 @@ int Sensor::getStreamConfigurations(uint32_t picSizes[], const int32_t kAvailabl DBG_LOGB("get output width=%d, height=%d, format=%d\n", frmsize.discrete.width, frmsize.discrete.height, frmsize.pixel_format); - if (0 == i) + if (0 == i) { + count += 4; continue; + } for (k = count; k > START; k -= 4) { if (frmsize.discrete.width * frmsize.discrete.height > @@ -1215,7 +1217,7 @@ int Sensor::getStreamConfigurations(uint32_t picSizes[], const int32_t kAvailabl picSizes[k + 1] = frmsize.discrete.width; picSizes[k + 2] = frmsize.discrete.height; - count+=4; + count += 4; } } @@ -1247,8 +1249,10 @@ int Sensor::getStreamConfigurations(uint32_t picSizes[], const int32_t kAvailabl 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) + if (0 == i) { + count += 4; continue; + } for (k = count; k > START; k -= 4) { if (frmsize.discrete.width * frmsize.discrete.height > @@ -1263,7 +1267,7 @@ int Sensor::getStreamConfigurations(uint32_t picSizes[], const int32_t kAvailabl picSizes[k + 1] = frmsize.discrete.width; picSizes[k + 2] = frmsize.discrete.height; - count+=4; + count += 4; } } @@ -1297,8 +1301,10 @@ int Sensor::getStreamConfigurations(uint32_t picSizes[], const int32_t kAvailabl 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) + if (0 == i) { + count += 4; continue; + } for (k = count; k > START; k -= 4) { if (frmsize.discrete.width * frmsize.discrete.height > @@ -1313,7 +1319,7 @@ int Sensor::getStreamConfigurations(uint32_t picSizes[], const int32_t kAvailabl picSizes[k + 1] = frmsize.discrete.width; picSizes[k + 2] = frmsize.discrete.height; - count+=4; + count += 4; } } } @@ -1354,8 +1360,10 @@ int Sensor::getStreamConfigurations(uint32_t picSizes[], const int32_t kAvailabl picSizes[count+2] = frmsize.discrete.height; picSizes[count+3] = ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT; - if (0 == i) + if (0 == i) { + count += 4; continue; + } //TODO insert in descend order for (k = count; k > START; k -= 4) { @@ -1372,7 +1380,7 @@ int Sensor::getStreamConfigurations(uint32_t picSizes[], const int32_t kAvailabl picSizes[k + 1] = frmsize.discrete.width; picSizes[k + 2] = frmsize.discrete.height; - count+=4; + count += 4; } } @@ -1596,8 +1604,10 @@ int Sensor::getPictureSizes(int32_t picSizes[], int size, bool preview) { picSizes[count] = frmsize.discrete.width; picSizes[count+1] = frmsize.discrete.height; - if (0 == i) + if (0 == i) { + count += 2; continue; + } //TODO insert in descend order if (picSizes[count + 0] * picSizes[count + 1] > picSizes[count - 1] * picSizes[count - 2]) { |