Add Bayer8 BGGR Pixel Format in VRS

Summary: Recent RGB Camera (Alberta) generates raw image in BGGR format, hence the change.

Differential Revision: D97062899

fbshipit-source-id: 11522e2ab9603330fe8dd3368997911b1ad6a9d7

Author: Mayank Jain

vrs/RecordFormat.cpp

@@ -84,11 +84,11 @@ static_assert(static_cast<int>(ImageFormat::JXL) == 5, "ImageFormat enum values
 
 // These text names may NEVER BE CHANGED, as they are used in data layout definitions!!
 string_view sPixelFormatNames[] = {
-    "undefined",        "grey8",        "bgr8",         "depth32f",    "rgb8",
-    "yuv_i420_split",   "rgba8",        "rgb10",        "rgb12",       "grey10",
-    "grey12",           "grey16",       "rgb32F",       "scalar64F",   "yuy2",
-    "rgb_ir_4x4",       "rgba32F",      "bayer8_rggb",  "raw10",       "raw10_bayer_rggb",
-    "raw10_bayer_bggr", "yuv_420_nv21", "yuv_420_nv12", "grey10packed"};
+    "undefined",        "grey8",        "bgr8",         "depth32f",     "rgb8",
+    "yuv_i420_split",   "rgba8",        "rgb10",        "rgb12",        "grey10",
+    "grey12",           "grey16",       "rgb32F",       "scalar64F",    "yuy2",
+    "rgb_ir_4x4",       "rgba32F",      "bayer8_rggb",  "raw10",        "raw10_bayer_rggb",
+    "raw10_bayer_bggr", "yuv_420_nv21", "yuv_420_nv12", "grey10packed", "bayer8_bggr"};
 ENUM_STRING_CONVERTER(PixelFormat, sPixelFormatNames, PixelFormat::UNDEFINED);
 
 // Enum values may NEVER BE CHANGED, as they are used in data layout definitions!!
@@ -476,6 +476,7 @@ uint8_t ImageContentBlockSpec::getChannelCountPerPixel(PixelFormat pixel) {
     case PixelFormat::DEPTH32F:
     case PixelFormat::SCALAR64F:
     case PixelFormat::BAYER8_RGGB:
+    case PixelFormat::BAYER8_BGGR:
     case PixelFormat::RAW10_BAYER_RGGB:
     case PixelFormat::RAW10_BAYER_BGGR:
     case PixelFormat::RAW10:
@@ -511,6 +512,7 @@ size_t ImageContentBlockSpec::getBytesPerPixel(PixelFormat pixel) {
     case PixelFormat::GREY8:
     case PixelFormat::RGB_IR_RAW_4X4:
     case PixelFormat::BAYER8_RGGB:
+    case PixelFormat::BAYER8_BGGR:
       return 1;
     case PixelFormat::GREY10:
     case PixelFormat::GREY12:

vrs/RecordFormat.h

@@ -88,6 +88,7 @@ enum class PixelFormat : uint8_t {
   YUV_420_NV21, ///< Y plane + half width/half height chroma plane with weaved V and U values.
   YUV_420_NV12, ///< Y plane + half width/half height chroma plane with weaved U and V values.
   GREY10PACKED, ///< 10 bit per pixel, packed in successive little-endian bits, in 40 bits blocks.
+  BAYER8_BGGR, ///< 8 bit per pixel, BGGR bayer pattern.
 
   COUNT, ///< Count of values in this enum type. @internal
 };

vrs/oss/test_data/VRS_Files/sample_raw_pixel_formats.vrs

@@ -455,7 +455,7 @@ PixelFormat PixelFrame::getNormalizedPixelFormat(
       sourcePixelFormat == PixelFormat::GREY16) {
     format = PixelFormat::RGB8;
 #if IS_VRS_FB_INTERNAL()
-  } else if (format == PixelFormat::BAYER8_RGGB) {
+  } else if (format == PixelFormat::BAYER8_RGGB || format == PixelFormat::BAYER8_BGGR) {
     format = PixelFormat::RGB8;
 #endif
   } else {
@@ -668,6 +668,7 @@ bool PixelFrame::normalizeFrame(
     case PixelFormat::DEPTH32F:
     case PixelFormat::SCALAR64F:
     case PixelFormat::BAYER8_RGGB:
+    case PixelFormat::BAYER8_BGGR:
       format = PixelFormat::GREY8;
       componentCount = 1;
       break;
@@ -724,7 +725,7 @@ bool PixelFrame::normalizeFrame(
   } else if (srcFormat == PixelFormat::SCALAR64F) {
     // normalize double pixels to grey8
     normalizeBuffer<double>(rdata(), outNormalizedFrame.wdata(), getWidth() * getHeight());
-  } else if (srcFormat == PixelFormat::BAYER8_RGGB) {
+  } else if (srcFormat == PixelFormat::BAYER8_RGGB || srcFormat == PixelFormat::BAYER8_BGGR) {
     // display as grey8(copy) for now
     const uint8_t* srcPtr = rdata();
     uint8_t* outPtr = outNormalizedFrame.wdata();

vrs/utils/PixelFrame.cpp

@@ -115,6 +115,6 @@ TEST_F(FilteredFileReaderTest, includeExcludeStreams) {
     filters.includeStream("214");
     filters.excludeStream("100-test/synthetic/raw10");
     filteredReader.applyFilters(filters);
-    EXPECT_EQ(filteredReader.filter.streams.size(), 19);
+    EXPECT_EQ(filteredReader.filter.streams.size(), 20);
   }
 }