diff --git a/src/process_pipeline.c b/src/process_pipeline.c index 6ae7b69..3fc4429 100644 --- a/src/process_pipeline.c +++ b/src/process_pipeline.c @@ -176,8 +176,7 @@ setup(MPPipeline *pipeline, const void *data) state_proc.mode_focus = AAA_DISABLED; if (!mp_process_find_processor(movie_script, "movie.sh")) { - printf("movie.sh not found\n"); - exit(1); + fprintf(stderr,"movie.sh not found, video pipeline disabled\n"); } setup_capture(); } @@ -410,7 +409,7 @@ auto_focus_step(const struct focus_stats *stats) static const int debug = 1; if (focus_phase >= PH_DONE) { - if (debug>1) printf("Phase %d, sharp %d best %d ", focus_phase, (int)(stats->sharp / 10000), (int)(best_sharp/ 10000)); + if (debug>1) printf("Phase %d, sharp %d best %d ", focus_phase, (int)(stats->sharp / 10000), (int)(best_sharp/ 10000)); focus_phase++; if (stats->sharp > (best_sharp * 2)) { if (debug>1) printf("Improved on its own.\n"); @@ -473,9 +472,9 @@ focus_stats(struct focus_stats *stats, const unsigned int *frame, const int widt unsigned int g = (frame[p] >> 8) & 0xff; unsigned int b = (frame[p] >> 16) & 0xff; unsigned int y = (r + g + b) / 3; - + sharp += (y-last_y) * (y-last_y); - + last_y = y; } stats->sharp = sharp; @@ -511,7 +510,7 @@ summarize() char buf[2048]; time = state_proc.exposure.value * sec_per_line(); - + /* Gain */ gain = state_proc.gain.value / ((float) state_proc.gain.min); /* dgain */ @@ -829,7 +828,7 @@ static void on_read_complete(GObject *source_object, GAsyncResult *res, gpointer g_error_free(error); g_object_unref(stream); return; - } + } //g_print("Got buffer: %.*s", (int)bytes_read, stdout_buf); stdout_buf[bytes_read] = 0; @@ -885,8 +884,8 @@ spawn_movie(char *cmd) return; } - - GInputStream *stdout_stream; + + GInputStream *stdout_stream; // Get the stdout stream of the subprocess stdout_stream = g_subprocess_get_stdout_pipe(proc); @@ -1086,7 +1085,7 @@ save_dng(const uint8_t *image, char *fname, int count) } libdng_set_color_matrix_1( - &dng, + &dng, state_proc.calibration.color_matrix_1[0], state_proc.calibration.color_matrix_1[1], state_proc.calibration.color_matrix_1[2], @@ -1099,7 +1098,7 @@ save_dng(const uint8_t *image, char *fname, int count) ); libdng_set_color_matrix_2( - &dng, + &dng, state_proc.calibration.color_matrix_2[0], state_proc.calibration.color_matrix_2[1], state_proc.calibration.color_matrix_2[2], @@ -1112,7 +1111,7 @@ save_dng(const uint8_t *image, char *fname, int count) ); libdng_set_forward_matrix_1( - &dng, + &dng, state_proc.calibration.forward_matrix_1[0], state_proc.calibration.forward_matrix_1[1], state_proc.calibration.forward_matrix_1[2], @@ -1125,7 +1124,7 @@ save_dng(const uint8_t *image, char *fname, int count) ); libdng_set_forward_matrix_2( - &dng, + &dng, state_proc.calibration.forward_matrix_2[0], state_proc.calibration.forward_matrix_2[1], state_proc.calibration.forward_matrix_2[2],