mawei
/
sunnypilot
mirror of https://github.com/sunnypilot/sunnypilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

camerad: update frame msg related variable types to uint64_t for consistency (#33113) 

Update frame_msg related variable types to uint64_t for  type safety
This commit is contained in:
Dean Lee 2024-08-03 03:57:29 +08:00 committed by GitHub
parent 19dec54f65
commit c40d129f70
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
system/camerad/cameras/camera_qcom2.cc
View File

@ -345,7 +345,7 @@ void CameraState::config_isp(int io_mem_handle, int fence, int request_id, int b
void CameraState::enqueue_buffer(int i, bool dp) {
int ret;
int request_id = request_ids[i];
uint64_t request_id = request_ids[i];
if (buf_handle[i] && sync_objs[i]) {
// wait
@ -386,7 +386,7 @@ void CameraState::enqueue_buffer(int i, bool dp) {
req_mgr_sched_request.req_id = request_id;
ret = do_cam_control(multi_cam_state->video0_fd, CAM_REQ_MGR_SCHED_REQ, &req_mgr_sched_request, sizeof(req_mgr_sched_request));
if (ret != 0) {
LOGE("failed to schedule cam mgr request: %d %d", ret, request_id);
LOGE("failed to schedule cam mgr request: %d %lu", ret, request_id);
}
// poke sensor, must happen after schedule
@ -396,8 +396,8 @@ void CameraState::enqueue_buffer(int i, bool dp) {
config_isp(buf_handle[i], sync_objs[i], request_id, buf0_handle, 65632*(i+1));
}
void CameraState::enqueue_req_multi(int start, int n, bool dp) {
for (int i=start; i<start+n; ++i) {
void CameraState::enqueue_req_multi(uint64_t start, int n, bool dp) {
for (uint64_t i = start; i < start + n; ++i) {
request_ids[(i - 1) % FRAME_BUF_COUNT] = i;
enqueue_buffer((i - 1) % FRAME_BUF_COUNT, dp);
}
@ -780,8 +780,8 @@ void CameraState::handle_camera_event(void *evdat) {
assert(event_data->u.frame_msg.link_hdl == link_handle);
uint64_t timestamp = event_data->u.frame_msg.timestamp;
int main_id = event_data->u.frame_msg.frame_id;
int real_id = event_data->u.frame_msg.request_id;
uint64_t main_id = event_data->u.frame_msg.frame_id;
uint64_t real_id = event_data->u.frame_msg.request_id;
if (real_id != 0) { // next ready
if (real_id == 1) {idx_offset = main_id;}
@ -799,7 +799,7 @@ void CameraState::handle_camera_event(void *evdat) {
// check for dropped requests
if (real_id > request_id_last + 1) {
LOGE("camera %d dropped requests %d %d", camera_num, real_id, request_id_last);
LOGE("camera %d dropped requests %ld %ld", camera_num, real_id, request_id_last);
enqueue_req_multi(request_id_last + 1 + FRAME_BUF_COUNT, real_id - (request_id_last + 1), 0);
}

10
system/camerad/cameras/camera_qcom2.h
View File

@ -105,17 +105,17 @@ public:
int buf0_handle = 0;
int buf_handle[FRAME_BUF_COUNT] = {};
int sync_objs[FRAME_BUF_COUNT] = {};
int request_ids[FRAME_BUF_COUNT] = {};
int request_id_last = 0;
int frame_id_last = 0;
int idx_offset = 0;
uint64_t request_ids[FRAME_BUF_COUNT] = {};
uint64_t request_id_last = 0;
uint64_t frame_id_last = 0;
uint64_t idx_offset = 0;
bool skipped = true;
CameraBuf buf;
MemoryManager mm;
void config_isp(int io_mem_handle, int fence, int request_id, int buf0_mem_handle, int buf0_offset);
void enqueue_req_multi(int start, int n, bool dp);
void enqueue_req_multi(uint64_t start, int n, bool dp);
void enqueue_buffer(int i, bool dp);
int clear_req_queue();