retropilot
/
openpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move duplicate function declarations to camera_common.h (#20176)

albatross
Dean Lee 2021-02-27 12:35:21 +08:00 committed by GitHub
parent 839a4a3aa3
commit 468dc3f5a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
selfdrive/camerad/cameras/camera_common.h
View File

@ -131,3 +131,9 @@ kj::Array<uint8_t> get_frame_image(const CameraBuf *b);
void set_exposure_target(CameraState *c, 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, CameraState *cs, process_thread_cb callback);
void common_process_driver_camera(SubMaster *sm, PubMaster *pm, CameraState *c, int cnt);
void cameras_init(VisionIpcServer *v, MultiCameraState *s, cl_device_id device_id, cl_context ctx);
void cameras_open(MultiCameraState *s);
void cameras_run(MultiCameraState *s);
void cameras_close(MultiCameraState *s);
void camera_autoexposure(CameraState *s, float grey_frac);

6
selfdrive/camerad/cameras/camera_frame_stream.h
View File

@ -34,9 +34,3 @@ typedef struct MultiCameraState {
SubMaster *sm;
PubMaster *pm;
} MultiCameraState;
void cameras_init(VisionIpcServer * v, MultiCameraState *s, cl_device_id device_id, cl_context ctx);
void cameras_open(MultiCameraState *s);
void cameras_run(MultiCameraState *s);
void cameras_close(MultiCameraState *s);
void camera_autoexposure(CameraState *s, float grey_frac);

6
selfdrive/camerad/cameras/camera_qcom.h
View File

@ -135,11 +135,5 @@ typedef struct MultiCameraState {
} MultiCameraState;
void cameras_init(VisionIpcServer *v, MultiCameraState *s, cl_device_id device_id, cl_context ctx);
void cameras_open(MultiCameraState *s);
void cameras_run(MultiCameraState *s);
void cameras_close(MultiCameraState *s);
void camera_autoexposure(CameraState *s, float grey_frac);
void actuator_move(CameraState *s, uint16_t target);
int sensor_write_regs(CameraState *s, struct msm_camera_i2c_reg_array* arr, size_t size, int data_type);

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

@ -905,7 +905,7 @@ static void camera_close(CameraState *s) {
LOGD("destroyed session: %d", ret);
}
static void cameras_close(MultiCameraState *s) {
void cameras_close(MultiCameraState *s) {
camera_close(&s->road_cam);
camera_close(&s->wide_road_cam);
camera_close(&s->driver_cam);

5
selfdrive/camerad/cameras/camera_qcom2.h
View File

@ -83,8 +83,3 @@ typedef struct MultiCameraState {
SubMaster *sm;
PubMaster *pm;
} MultiCameraState;
void cameras_init(VisionIpcServer *v, MultiCameraState *s, cl_device_id device_id, cl_context ctx);
void cameras_open(MultiCameraState *s);
void cameras_run(MultiCameraState *s);
void camera_autoexposure(CameraState *s, float grey_frac);

6
selfdrive/camerad/cameras/camera_webcam.h
View File

@ -28,9 +28,3 @@ typedef struct MultiCameraState {
SubMaster *sm;
PubMaster *pm;
} MultiCameraState;
void cameras_init(VisionIpcServer *v, MultiCameraState *s, cl_device_id device_id, cl_context ctx);
void cameras_open(MultiCameraState *s);
void cameras_run(MultiCameraState *s);
void cameras_close(MultiCameraState *s);
void camera_autoexposure(CameraState *s, float grey_frac);