diff --git a/selfdrive/camerad/cameras/camera_common.h b/selfdrive/camerad/cameras/camera_common.h index f55bbd840..20c00c5b5 100644 --- a/selfdrive/camerad/cameras/camera_common.h +++ b/selfdrive/camerad/cameras/camera_common.h @@ -30,7 +30,6 @@ const int UI_BUF_COUNT = 4; const int YUV_BUFFER_COUNT = Hardware::EON() ? 100 : 40; - enum CameraType { RoadCam = 0, DriverCam, @@ -52,23 +51,6 @@ typedef struct CameraInfo { bool hdr; } CameraInfo; -typedef struct LogCameraInfo { - CameraType type; - const char* filename; - const char* frame_packet_name; - const char* encode_idx_name; - VisionStreamType stream_type; - int frame_width, frame_height; - int fps; - int bitrate; - bool is_h265; - bool downscale; - bool has_qcamera; - bool trigger_rotate; - bool enable; - bool record; -} LogCameraInfo; - typedef struct FrameMetadata { uint32_t frame_id; unsigned int frame_length; diff --git a/selfdrive/loggerd/loggerd.h b/selfdrive/loggerd/loggerd.h index 977e03b8d..170f37049 100644 --- a/selfdrive/loggerd/loggerd.h +++ b/selfdrive/loggerd/loggerd.h @@ -41,6 +41,23 @@ const int DCAM_BITRATE = Hardware::TICI() ? MAIN_BITRATE : 2500000; const bool LOGGERD_TEST = getenv("LOGGERD_TEST"); const int SEGMENT_LENGTH = LOGGERD_TEST ? atoi(getenv("LOGGERD_SEGMENT_LENGTH")) : 60; +struct LogCameraInfo { + CameraType type; + const char *filename; + const char *frame_packet_name; + const char *encode_idx_name; + VisionStreamType stream_type; + int frame_width, frame_height; + int fps; + int bitrate; + bool is_h265; + bool downscale; + bool has_qcamera; + bool trigger_rotate; + bool enable; + bool record; +}; + const LogCameraInfo cameras_logged[] = { { .type = RoadCam,