Display and control your Android device
Relax v4l2_sink lock constraints
Romain Vimont28bce48d479b
diff --git a/app/src/v4l2_sink.c b/app/src/v4l2_sink.cindex 5ee9c8eb..7904b450 100644--- a/app/src/v4l2_sink.c+++ b/app/src/v4l2_sink.c@@ -121,11 +121,11 @@ run_v4l2_sink(void *data) {break;}- video_buffer_consume(&vs->vb, vs->frame);vs->has_frame = false;-sc_mutex_unlock(&vs->mutex);+ video_buffer_consume(&vs->vb, vs->frame);+bool ok = encode_and_write_frame(vs, vs->frame);av_frame_unref(vs->frame);if (!ok) {@@ -303,17 +303,18 @@ sc_v4l2_sink_close(struct sc_v4l2_sink *vs) {static boolsc_v4l2_sink_push(struct sc_v4l2_sink *vs, const AVFrame *frame) {- sc_mutex_lock(&vs->mutex);-- bool ok = video_buffer_push(&vs->vb, frame, NULL);+ bool previous_skipped;+ bool ok = video_buffer_push(&vs->vb, frame, &previous_skipped);if (!ok) {return false;}- vs->has_frame = true;- sc_cond_signal(&vs->cond);-- sc_mutex_unlock(&vs->mutex);+ if (!previous_skipped) {+ sc_mutex_lock(&vs->mutex);+ vs->has_frame = true;+ sc_cond_signal(&vs->cond);+ sc_mutex_unlock(&vs->mutex);+ }return true;}