sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fill_frame_data: remove unused paramater cnt (#19936)

Browse Source
pull/19938/head
Dean Lee 4 years ago committed by GitHub
parent 12a1121131
commit 80799c7272
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      selfdrive/camerad/cameras/camera_common.cc
  2. 2
      selfdrive/camerad/cameras/camera_common.h
  3. 2
      selfdrive/camerad/cameras/camera_qcom.cc
  4. 2
      selfdrive/camerad/cameras/camera_qcom2.cc
  5. 4
      selfdrive/camerad/cameras/camera_webcam.cc

4
selfdrive/camerad/cameras/camera_common.cc
Unescape View File

@ -202,7 +202,7 @@ void CameraBuf::queue(size_t buf_idx){
// common functions // 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.setFrameId(frame_data.frame_id);
framed.setTimestampEof(frame_data.timestamp_eof); framed.setTimestampEof(frame_data.timestamp_eof);
framed.setTimestampSof(frame_data.timestamp_sof); framed.setTimestampSof(frame_data.timestamp_sof);
@ -407,7 +407,7 @@ void common_camera_process_front(SubMaster *sm, PubMaster *pm, CameraState *c, i
MessageBuilder msg; MessageBuilder msg;
auto framed = msg.initEvent().initFrontFrame(); auto framed = msg.initEvent().initFrontFrame();
framed.setFrameType(cereal::FrameData::FrameType::FRONT); 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) { if (env_send_front) {
framed.setImage(get_frame_image(b)); framed.setImage(get_frame_image(b));
} }

2
selfdrive/camerad/cameras/camera_common.h
Unescape View File

@ -131,7 +131,7 @@ public:
typedef void (*process_thread_cb)(MultiCameraState *s, CameraState *c, int cnt); 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<uint8_t> get_frame_image(const CameraBuf *b); kj::Array<uint8_t> 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); 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, std::thread start_process_thread(MultiCameraState *cameras, const char *tname,

2
selfdrive/camerad/cameras/camera_qcom.cc
Unescape View File

@ -1656,7 +1656,7 @@ void camera_process_frame(MultiCameraState *s, CameraState *c, int cnt) {
MessageBuilder msg; MessageBuilder msg;
auto framed = msg.initEvent().initFrame(); 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) { if (env_send_rear) {
framed.setImage(get_frame_image(b)); framed.setImage(get_frame_image(b));
} }

2
selfdrive/camerad/cameras/camera_qcom2.cc
Unescape View File

@ -1101,7 +1101,7 @@ void camera_process_frame(MultiCameraState *s, CameraState *c, int cnt) {
MessageBuilder msg; MessageBuilder msg;
auto framed = c == &s->rear ? msg.initEvent().initFrame() : msg.initEvent().initWideFrame(); 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)) { if ((c == &s->rear && env_send_rear) || (c == &s->wide && env_send_wide)) {
framed.setImage(get_frame_image(b)); framed.setImage(get_frame_image(b));
} }

4
selfdrive/camerad/cameras/camera_webcam.cc
Unescape View File

@ -249,7 +249,7 @@ void camera_process_front(MultiCameraState *s, CameraState *c, int cnt) {
MessageBuilder msg; MessageBuilder msg;
auto framed = msg.initEvent().initFrontFrame(); auto framed = msg.initEvent().initFrontFrame();
framed.setFrameType(cereal::FrameData::FrameType::FRONT); 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); s->pm->send("frontFrame", msg);
} }
@ -257,7 +257,7 @@ void camera_process_rear(MultiCameraState *s, CameraState *c, int cnt) {
const CameraBuf *b = &c->buf; const CameraBuf *b = &c->buf;
MessageBuilder msg; MessageBuilder msg;
auto framed = msg.initEvent().initFrame(); 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.setImage(kj::arrayPtr((const uint8_t *)b->cur_yuv_buf->addr, b->cur_yuv_buf->len));
framed.setTransform(b->yuv_transform.v); framed.setTransform(b->yuv_transform.v);
s->pm->send("frame", msg); s->pm->send("frame", msg);

Write Preview
Loading…
Cancel
Save