colin/Megapixels
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix various compile errors

Browse Source
This commit is contained in:
Kristian Vos
2024-06-29 18:04:42 +02:00
parent cd3266466e
commit e41dc80a71
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/camera.c
View File

@@ -729,7 +729,7 @@ control_impl_int32(libmegapixels_camera *camera,
} }
pid_t pid_t
mp_camera_control_set_int32_bg(libmegapixels_camera *camera, uint32_t id, int32_t v) mp_camera_control_set_int32_bg(MPCamera *camera, uint32_t id, int32_t v)
{ {
struct v4l2_ext_control ctrl = {}; struct v4l2_ext_control ctrl = {};
ctrl.id = id; ctrl.id = id;
@@ -742,7 +742,7 @@ mp_camera_control_set_int32_bg(libmegapixels_camera *camera, uint32_t id, int32_
.controls = &ctrl, .controls = &ctrl,
}; };
int fd = camera->sensor_fd; int fd = camera->camera->sensor_fd;
// fork only after all the memory has been read // fork only after all the memory has been read
pid_t pid = fork(); pid_t pid = fork();
@@ -805,7 +805,7 @@ mp_camera_control_get_bool(libmegapixels_camera *camera, uint32_t id)
} }
pid_t pid_t
mp_camera_control_set_bool_bg(libmegapixels_camera *camera, uint32_t id, bool v) mp_camera_control_set_bool_bg(MPCamera *camera, uint32_t id, bool v)
{ {
int32_t value = v; int32_t value = v;
return mp_camera_control_set_int32_bg(camera, id, value); return mp_camera_control_set_int32_bg(camera, id, value);

4
src/camera.h
View File

@@ -66,10 +66,10 @@ bool mp_camera_control_try_int32(libmegapixels_camera *camera, uint32_t id, int3
bool mp_camera_control_set_int32(libmegapixels_camera *camera, uint32_t id, int32_t v); bool mp_camera_control_set_int32(libmegapixels_camera *camera, uint32_t id, int32_t v);
int32_t mp_camera_control_get_int32(libmegapixels_camera *camera, uint32_t id); int32_t mp_camera_control_get_int32(libmegapixels_camera *camera, uint32_t id);
// set the value in the background, discards result // set the value in the background, discards result
pid_t mp_camera_control_set_int32_bg(libmegapixels_camera *camera, uint32_t id, int32_t v); pid_t mp_camera_control_set_int32_bg(MPCamera *camera, uint32_t id, int32_t v);
bool mp_camera_control_try_bool(libmegapixels_camera *camera, uint32_t id, bool *v); bool mp_camera_control_try_bool(libmegapixels_camera *camera, uint32_t id, bool *v);
bool mp_camera_control_set_bool(libmegapixels_camera *camera, uint32_t id, bool v); bool mp_camera_control_set_bool(libmegapixels_camera *camera, uint32_t id, bool v);
bool mp_camera_control_get_bool(libmegapixels_camera *camera, uint32_t id); bool mp_camera_control_get_bool(libmegapixels_camera *camera, uint32_t id);
// set the value in the background, discards result // set the value in the background, discards result
pid_t mp_camera_control_set_bool_bg(libmegapixels_camera *camera, uint32_t id, bool v); pid_t mp_camera_control_set_bool_bg(MPCamera *camera, uint32_t id, bool v);

23
src/io_pipeline.c
View File

@@ -131,9 +131,10 @@ mp_io_pipeline_focus()
} }
static void static void
set_control_int32(MPPipeline *pipeline, const invoke_set_control *data) set_control_int32(MPPipeline *pipeline, const void *data)
{ {
mp_camera_control_set_int32(state_io.camera, data->control, data->int_value); const invoke_set_control *control_data = (const invoke_set_control *)data;
mp_camera_control_set_int32(state_io.camera, control_data->control, control_data->int_value);
} }
void void
@@ -222,10 +223,10 @@ start_focus()
if (state_io.focus.control) { if (state_io.focus.control) {
focus_continuous_task = mp_camera_control_set_bool_bg( focus_continuous_task = mp_camera_control_set_bool_bg(
state_io.camera, state_io.focus.control, 1); mpcamera, state_io.focus.control, 1);
} else if (state_io.can_af_trigger) { } else if (state_io.can_af_trigger) {
start_focus_task = mp_camera_control_set_bool_bg( start_focus_task = mp_camera_control_set_bool_bg(
state_io.camera, V4L2_CID_AUTO_FOCUS_START, 1); mpcamera, V4L2_CID_AUTO_FOCUS_START, 1);
} }
} }
@@ -244,7 +245,7 @@ update_controls()
} }
if (state_io.gain.manual != state_io.gain.manual_req) { if (state_io.gain.manual != state_io.gain.manual_req) {
mp_camera_control_set_bool_bg(state_io.camera, mp_camera_control_set_bool_bg(mpcamera,
V4L2_CID_AUTOGAIN, V4L2_CID_AUTOGAIN,
!state_io.gain.manual_req); !state_io.gain.manual_req);
state_io.gain.manual = state_io.gain.manual_req; state_io.gain.manual = state_io.gain.manual_req;
@@ -254,7 +255,7 @@ update_controls()
if ((state_io.gain.manual || if ((state_io.gain.manual ||
(!state_io.gain.manual && state_io.gain.auto_control == 0)) && (!state_io.gain.manual && state_io.gain.auto_control == 0)) &&
state_io.gain.value != state_io.gain.value_req) { state_io.gain.value != state_io.gain.value_req) {
mp_camera_control_set_int32_bg(state_io.camera, mp_camera_control_set_int32_bg(mpcamera,
state_io.gain.control, state_io.gain.control,
state_io.gain.value_req); state_io.gain.value_req);
state_io.gain.value = state_io.gain.value_req; state_io.gain.value = state_io.gain.value_req;
@@ -262,7 +263,7 @@ update_controls()
} }
if (state_io.exposure.manual != state_io.exposure.manual_req) { if (state_io.exposure.manual != state_io.exposure.manual_req) {
mp_camera_control_set_bool_bg(state_io.camera, mp_camera_control_set_bool_bg(mpcamera,
V4L2_CID_EXPOSURE_AUTO, V4L2_CID_EXPOSURE_AUTO,
state_io.exposure.manual_req ? state_io.exposure.manual_req ?
V4L2_EXPOSURE_MANUAL : V4L2_EXPOSURE_MANUAL :
@@ -273,7 +274,7 @@ update_controls()
if (state_io.exposure.manual && if (state_io.exposure.manual &&
state_io.exposure.value != state_io.exposure.value_req) { state_io.exposure.value != state_io.exposure.value_req) {
mp_camera_control_set_int32_bg(state_io.camera, mp_camera_control_set_int32_bg(mpcamera,
state_io.exposure.control, state_io.exposure.control,
state_io.exposure.value_req); state_io.exposure.value_req);
state_io.exposure.value = state_io.exposure.value_req; state_io.exposure.value = state_io.exposure.value_req;
@@ -383,14 +384,14 @@ on_frame(MPBuffer buffer, void *_data)
// Restore the auto exposure and gain if needed // Restore the auto exposure and gain if needed
if (!state_io.exposure.manual) { if (!state_io.exposure.manual) {
mp_camera_control_set_int32_bg( mp_camera_control_set_int32_bg(
state_io.camera, mpcamera,
V4L2_CID_EXPOSURE_AUTO, V4L2_CID_EXPOSURE_AUTO,
V4L2_EXPOSURE_AUTO); V4L2_EXPOSURE_AUTO);
} }
if (!state_io.gain.manual) { if (!state_io.gain.manual) {
mp_camera_control_set_bool_bg( mp_camera_control_set_bool_bg(
state_io.camera, V4L2_CID_AUTOGAIN, true); mpcamera, V4L2_CID_AUTOGAIN, true);
} }
// Go back to preview mode // Go back to preview mode
@@ -428,7 +429,7 @@ init_controls()
if (mp_camera_query_control(state_io.camera, V4L2_CID_FOCUS_AUTO, NULL)) { if (mp_camera_query_control(state_io.camera, V4L2_CID_FOCUS_AUTO, NULL)) {
mp_camera_control_set_bool_bg( mp_camera_control_set_bool_bg(
state_io.camera, V4L2_CID_FOCUS_AUTO, true); mpcamera, V4L2_CID_FOCUS_AUTO, true);
state_io.focus.auto_control = V4L2_CID_FOCUS_AUTO; state_io.focus.auto_control = V4L2_CID_FOCUS_AUTO;
} else { } else {
state_io.focus.auto_control = 0; state_io.focus.auto_control = 0;

2
src/main.h
View File

@@ -36,4 +36,6 @@ int remap(int value, int input_min, int input_max, int output_min, int output_ma
bool check_window_active(); bool check_window_active();
void notify_movie_progress(void);
void notify_movie_message(gchar *msg); void notify_movie_message(gchar *msg);