camerad/CameraBuf: remove deprecated rgb_stride (commaai#30758)

deanlee · Dec 16, 2023 · ea7e701 · ea7e701
1 parent f9ee7bf
commit ea7e701
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/system/camerad/cameras/camera_common.cc b/system/camerad/cameras/camera_common.cc
@@ -32,10 +32,10 @@ class Debayer {
  snprintf(args, sizeof(args),
  "-cl-fast-relaxed-math -cl-denorms-are-zero "
  "-DFRAME_WIDTH=%d -DFRAME_HEIGHT=%d -DFRAME_STRIDE=%d -DFRAME_OFFSET=%d "
- "-DRGB_WIDTH=%d -DRGB_HEIGHT=%d -DRGB_STRIDE=%d -DYUV_STRIDE=%d -DUV_OFFSET=%d "
+ "-DRGB_WIDTH=%d -DRGB_HEIGHT=%d -DYUV_STRIDE=%d -DUV_OFFSET=%d "
  "-DIS_OX=%d -DCAM_NUM=%d%s",
  ci->frame_width, ci->frame_height, ci->frame_stride, ci->frame_offset,
- b->rgb_width, b->rgb_height, b->rgb_stride, buf_width, uv_offset,
+ b->rgb_width, b->rgb_height, buf_width, uv_offset,
  ci->image_sensor == cereal::FrameData::ImageSensor::OX03C10, s->camera_num, s->camera_num==1 ? " -DVIGNETTING" : "");
  const char *cl_file = "cameras/real_debayer.cl";
  cl_program prg_debayer = cl_program_from_file(context, device_id, cl_file, args);

diff --git a/system/camerad/cameras/camera_common.h b/system/camerad/cameras/camera_common.h
@@ -67,7 +67,7 @@ class CameraBuf {
  VisionBuf *cur_camera_buf;
  std::unique_ptr<VisionBuf[]> camera_bufs;
  std::unique_ptr<FrameMetadata[]> camera_bufs_metadata;
- int rgb_width, rgb_height, rgb_stride;
+ int rgb_width, rgb_height;
 
  CameraBuf() = default;
  ~CameraBuf();