mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-07-03 20:42:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fill_frame_data: remove unused paramater cnt (#19936)

Browse Source 
old-commit-hash: 80799c7272a35d69e508d724a4f95c44b61a3ec0
This commit is contained in:
Dean Lee
2021-01-27 19:03:12 +08:00
committed by GitHub
parent 8a92d271ee
commit bed2eb58c1
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/camerad/cameras/camera_common.cc
+2 -2
View File
@@ -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));
}
selfdrive/camerad/cameras/camera_common.h
+1 -1
View File
@@ -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<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);
std::thread start_process_thread(MultiCameraState *cameras, const char *tname,
selfdrive/camerad/cameras/camera_qcom.cc
+1 -1
View File
@@ -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));
}
selfdrive/camerad/cameras/camera_qcom2.cc
+1 -1
View File
@@ -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));
}
selfdrive/camerad/cameras/camera_webcam.cc
+2 -2
View File
@@ -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);