gone is is_bggr

system/camerad/cameras/camera_common.cc

@@ -27,14 +27,14 @@ public:
              "-cl-fast-relaxed-math -cl-denorms-are-zero -Isensors "
              "-DFRAME_WIDTH=%d -DFRAME_HEIGHT=%d -DFRAME_STRIDE=%d -DFRAME_OFFSET=%d "
              "-DRGB_WIDTH=%d -DRGB_HEIGHT=%d -DYUV_STRIDE=%d -DUV_OFFSET=%d "
-             "-DIS_AR=%d -DIS_OX=%d -DIS_OS=%d -DIS_10BIT=%d -DIS_HDR=%d -DHDR_OFFSET=%d -DIS_BGGR=%d -DVIGNETTING=%d ",
+             "-DIS_AR=%d -DIS_OX=%d -DIS_OS=%d -DIS_10BIT=%d -DIS_HDR=%d -DHDR_OFFSET=%d -DVIGNETTING=%d ",
              ci->frame_width, ci->frame_height, ci->hdr_offset > 0 ? ci->frame_stride * 2 : ci->frame_stride, ci->frame_offset,
              b->rgb_width, b->rgb_height, buf_width, uv_offset,
              ci->image_sensor == cereal::FrameData::ImageSensor::AR0231,
              ci->image_sensor == cereal::FrameData::ImageSensor::OX03C10,
              ci->image_sensor == cereal::FrameData::ImageSensor::OS04C10,
              ci->mipi_format == CAM_FORMAT_MIPI_RAW_10,
-             ci->hdr_offset > 0, ci->hdr_offset, ci->bggr,
+             ci->hdr_offset > 0, ci->hdr_offset,
              s->camera_num == 1);
     const char *cl_file = "cameras/process_raw.cl";
     cl_program prg_imgproc = cl_program_from_file(context, device_id, cl_file, args);

system/camerad/cameras/process_raw.cl

@@ -129,7 +129,7 @@ __kernel void process_raw(const __global uchar * in, __global uchar * out, int e
   float3 rgb;
   uchar3 rgb_out[4];
 
-  #if IS_BGGR
+  #if BGGR
     constant int row_read_order[] = {3, 2, 1, 0};
     constant int rgb_write_order[] = {2, 3, 0, 1};
   #else

system/camerad/sensors/ar0231.cc

@@ -83,7 +83,6 @@ float ar0231_parse_temp_sensor(uint16_t calib1, uint16_t calib2, uint16_t data_r
 
 AR0231::AR0231() {
   image_sensor = cereal::FrameData::ImageSensor::AR0231;
-  bggr = false;
   data_word = true;
   frame_width = 1928;
   frame_height = 1208;

system/camerad/sensors/os04c10.cc

@@ -24,7 +24,6 @@ const int os04c10_driver_ae_xywh[] = {44, 180, 2600, 1340};
 
 OS04C10::OS04C10() {
   image_sensor = cereal::FrameData::ImageSensor::OS04C10;
-  bggr = true;
   data_word = false;
 
   hdr_offset = 64 * 2 + 8; // stagger

system/camerad/sensors/os04c10_cl.h

@@ -1,5 +1,7 @@
 #if IS_OS
 
+#define BGGR
+
 float3 color_correct(float3 rgb) {
   float3 corrected = rgb.x * (float3)(1.55361989, -0.268894615, -0.000593219);
   corrected += rgb.y * (float3)(-0.421217301, 1.51883144, -0.69760146);

system/camerad/sensors/ox03c10.cc

@@ -27,7 +27,6 @@ const uint32_t VS_TIME_MAX_OX03C10 = 34;  // vs < 35
 
 OX03C10::OX03C10() {
   image_sensor = cereal::FrameData::ImageSensor::OX03C10;
-  bggr = false;
   data_word = false;
   frame_width = 1928;
   frame_height = 1208;

system/camerad/sensors/sensor.h

@@ -29,7 +29,6 @@ public:
   int registers_offset = -1;
   int stats_offset = -1;
   int hdr_offset = -1;
-  bool bggr;
 
   int exposure_time_min;
   int exposure_time_max;