Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21165 from utibenkei:fix_android_ndk_camera_order_of_u_and_v

Browse Source
pull/21180/head
Alexander Alekhin 3 years ago
parent d206350738 68667d6057
commit f61883b227
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      modules/videoio/src/cap_android_camera.cpp

4
modules/videoio/src/cap_android_camera.cpp
Unescape View File

@ -313,7 +313,7 @@ public:
if (fourCC == FOURCC_UNKNOWN) { if (fourCC == FOURCC_UNKNOWN) {
fourCC = FOURCC_NV21; fourCC = FOURCC_NV21;
} }
} else if ( (uvPixelStride == 1) && (vPixel == uPixel + uLen) && (yLen == frameWidth * frameHeight) && (uLen == yLen / 4) && (vLen == uLen) ) { } else if ( (uvPixelStride == 1) && (uPixel == vPixel + vLen) && (yLen == frameWidth * frameHeight) && (uLen == yLen / 4) && (vLen == uLen) ) {
colorFormat = COLOR_FormatYUV420Planar; colorFormat = COLOR_FormatYUV420Planar;
if (fourCC == FOURCC_UNKNOWN) { if (fourCC == FOURCC_UNKNOWN) {
fourCC = FOURCC_YV12; fourCC = FOURCC_YV12;
@ -327,7 +327,7 @@ public:
buffer.clear(); buffer.clear();
buffer.insert(buffer.end(), yPixel, yPixel + yLen); buffer.insert(buffer.end(), yPixel, yPixel + yLen);
buffer.insert(buffer.end(), uPixel, uPixel + yLen / 2); buffer.insert(buffer.end(), vPixel, vPixel + yLen / 2);
return true; return true;
} }

Write Preview
Loading…
Cancel
Save