diff --git a/selfdrive/camerad/cameras/camera_common.cc b/selfdrive/camerad/cameras/camera_common.cc index 8f1ae4e6a3..ed707408bc 100644 --- a/selfdrive/camerad/cameras/camera_common.cc +++ b/selfdrive/camerad/cameras/camera_common.cc @@ -202,7 +202,7 @@ void CameraBuf::queue(size_t buf_idx){ // common functions -void fill_frame_data(cereal::FrameData::Builder &framed, const FrameMetadata &frame_data, uint32_t cnt) { +void fill_frame_data(cereal::FrameData::Builder &framed, const FrameMetadata &frame_data) { framed.setFrameId(frame_data.frame_id); framed.setTimestampEof(frame_data.timestamp_eof); framed.setTimestampSof(frame_data.timestamp_sof); @@ -407,7 +407,7 @@ void common_camera_process_front(SubMaster *sm, PubMaster *pm, CameraState *c, i MessageBuilder msg; auto framed = msg.initEvent().initFrontFrame(); framed.setFrameType(cereal::FrameData::FrameType::FRONT); - fill_frame_data(framed, b->cur_frame_data, cnt); + fill_frame_data(framed, b->cur_frame_data); if (env_send_front) { framed.setImage(get_frame_image(b)); } diff --git a/selfdrive/camerad/cameras/camera_common.h b/selfdrive/camerad/cameras/camera_common.h index 85226e19bd..9582ca5395 100644 --- a/selfdrive/camerad/cameras/camera_common.h +++ b/selfdrive/camerad/cameras/camera_common.h @@ -131,7 +131,7 @@ public: typedef void (*process_thread_cb)(MultiCameraState *s, CameraState *c, int cnt); -void fill_frame_data(cereal::FrameData::Builder &framed, const FrameMetadata &frame_data, uint32_t cnt); +void fill_frame_data(cereal::FrameData::Builder &framed, const FrameMetadata &frame_data); kj::Array get_frame_image(const CameraBuf *b); void set_exposure_target(CameraState *c, const uint8_t *pix_ptr, int x_start, int x_end, int x_skip, int y_start, int y_end, int y_skip); std::thread start_process_thread(MultiCameraState *cameras, const char *tname, diff --git a/selfdrive/camerad/cameras/camera_qcom.cc b/selfdrive/camerad/cameras/camera_qcom.cc index f98d3e1dcd..4ee9b9a73d 100644 --- a/selfdrive/camerad/cameras/camera_qcom.cc +++ b/selfdrive/camerad/cameras/camera_qcom.cc @@ -1656,7 +1656,7 @@ void camera_process_frame(MultiCameraState *s, CameraState *c, int cnt) { MessageBuilder msg; auto framed = msg.initEvent().initFrame(); - fill_frame_data(framed, b->cur_frame_data, cnt); + fill_frame_data(framed, b->cur_frame_data); if (env_send_rear) { framed.setImage(get_frame_image(b)); } diff --git a/selfdrive/camerad/cameras/camera_qcom2.cc b/selfdrive/camerad/cameras/camera_qcom2.cc index b0718808b7..346403c486 100644 --- a/selfdrive/camerad/cameras/camera_qcom2.cc +++ b/selfdrive/camerad/cameras/camera_qcom2.cc @@ -1101,7 +1101,7 @@ void camera_process_frame(MultiCameraState *s, CameraState *c, int cnt) { MessageBuilder msg; auto framed = c == &s->rear ? msg.initEvent().initFrame() : msg.initEvent().initWideFrame(); - fill_frame_data(framed, b->cur_frame_data, cnt); + fill_frame_data(framed, b->cur_frame_data); if ((c == &s->rear && env_send_rear) || (c == &s->wide && env_send_wide)) { framed.setImage(get_frame_image(b)); } diff --git a/selfdrive/camerad/cameras/camera_webcam.cc b/selfdrive/camerad/cameras/camera_webcam.cc index 25e0e3a166..fa54f7964f 100644 --- a/selfdrive/camerad/cameras/camera_webcam.cc +++ b/selfdrive/camerad/cameras/camera_webcam.cc @@ -249,7 +249,7 @@ void camera_process_front(MultiCameraState *s, CameraState *c, int cnt) { MessageBuilder msg; auto framed = msg.initEvent().initFrontFrame(); framed.setFrameType(cereal::FrameData::FrameType::FRONT); - fill_frame_data(framed, c->buf.cur_frame_data, cnt); + fill_frame_data(framed, c->buf.cur_frame_data); s->pm->send("frontFrame", msg); } @@ -257,7 +257,7 @@ void camera_process_rear(MultiCameraState *s, CameraState *c, int cnt) { const CameraBuf *b = &c->buf; MessageBuilder msg; auto framed = msg.initEvent().initFrame(); - fill_frame_data(framed, b->cur_frame_data, cnt); + fill_frame_data(framed, b->cur_frame_data); framed.setImage(kj::arrayPtr((const uint8_t *)b->cur_yuv_buf->addr, b->cur_yuv_buf->len)); framed.setTransform(b->yuv_transform.v); s->pm->send("frame", msg);