Get U/V planes instead of V/U, and encode RGBA instead of BGRA.

android · Jun 16, 2022 · 305346f · 305346f
1 parent 7a8ff4c
commit 305346f
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/camera/basic/src/main/cpp/image_reader.cpp b/camera/basic/src/main/cpp/image_reader.cpp
@@ -190,7 +190,7 @@ static inline uint32_t YUV2RGB(int nY, int nU, int nV) {
   nG = (nG >> 10) & 0xff;
   nB = (nB >> 10) & 0xff;
 
-  return 0xff000000 | (nR << 16) | (nG << 8) | nB;
+  return 0xff000000 | (nB << 16) | (nG << 8) | nR;
 }
 
 /**
@@ -254,8 +254,8 @@ void ImageReader::PresentImage(ANativeWindow_Buffer *buf, AImage *image) {
   AImage_getPlaneRowStride(image, 0, &yStride);
   AImage_getPlaneRowStride(image, 1, &uvStride);
   AImage_getPlaneData(image, 0, &yPixel, &yLen);
-  AImage_getPlaneData(image, 1, &vPixel, &vLen);
-  AImage_getPlaneData(image, 2, &uPixel, &uLen);
+  AImage_getPlaneData(image, 1, &uPixel, &uLen);
+  AImage_getPlaneData(image, 2, &vPixel, &vLen);
   int32_t uvPixelStride;
   AImage_getPlanePixelStride(image, 1, &uvPixelStride);
 
@@ -293,8 +293,8 @@ void ImageReader::PresentImage90(ANativeWindow_Buffer *buf, AImage *image) {
   AImage_getPlaneRowStride(image, 0, &yStride);
   AImage_getPlaneRowStride(image, 1, &uvStride);
   AImage_getPlaneData(image, 0, &yPixel, &yLen);
-  AImage_getPlaneData(image, 1, &vPixel, &vLen);
-  AImage_getPlaneData(image, 2, &uPixel, &uLen);
+  AImage_getPlaneData(image, 1, &uPixel, &uLen);
+  AImage_getPlaneData(image, 2, &vPixel, &vLen);
   int32_t uvPixelStride;
   AImage_getPlanePixelStride(image, 1, &uvPixelStride);
 
@@ -334,8 +334,8 @@ void ImageReader::PresentImage180(ANativeWindow_Buffer *buf, AImage *image) {
   AImage_getPlaneRowStride(image, 0, &yStride);
   AImage_getPlaneRowStride(image, 1, &uvStride);
   AImage_getPlaneData(image, 0, &yPixel, &yLen);
-  AImage_getPlaneData(image, 1, &vPixel, &vLen);
-  AImage_getPlaneData(image, 2, &uPixel, &uLen);
+  AImage_getPlaneData(image, 1, &uPixel, &uLen);
+  AImage_getPlaneData(image, 2, &vPixel, &vLen);
   int32_t uvPixelStride;
   AImage_getPlanePixelStride(image, 1, &uvPixelStride);
 
@@ -376,8 +376,8 @@ void ImageReader::PresentImage270(ANativeWindow_Buffer *buf, AImage *image) {
   AImage_getPlaneRowStride(image, 0, &yStride);
   AImage_getPlaneRowStride(image, 1, &uvStride);
   AImage_getPlaneData(image, 0, &yPixel, &yLen);
-  AImage_getPlaneData(image, 1, &vPixel, &vLen);
-  AImage_getPlaneData(image, 2, &uPixel, &uLen);
+  AImage_getPlaneData(image, 1, &uPixel, &uLen);
+  AImage_getPlaneData(image, 2, &vPixel, &vLen);
   int32_t uvPixelStride;
   AImage_getPlanePixelStride(image, 1, &uvPixelStride);