Skip to content

Display and control your Android device

Slightly reduce lock usage

Romain Vimont02b5e87802aa
diff --git a/app/src/frame_buffer.c b/app/src/frame_buffer.c
index d177d4fa..fc5e7084 100644
--- a/app/src/frame_buffer.c
+++ b/app/src/frame_buffer.c
@@ -51,8 +51,6 @@ swap_frames(AVFrame **lhs, AVFrame **rhs) {
bool
sc_frame_buffer_push(struct sc_frame_buffer *fb, const AVFrame *frame,
bool *previous_frame_skipped) {
- sc_mutex_lock(&fb->mutex);
-
// Use a temporary frame to preserve pending_frame in case of error.
// tmp_frame is an empty frame, no need to call av_frame_unref() beforehand.
int r = av_frame_ref(fb->tmp_frame, frame);
@@ -61,6 +59,8 @@ sc_frame_buffer_push(struct sc_frame_buffer *fb, const AVFrame *frame,
return false;
}
+ sc_mutex_lock(&fb->mutex);
+
// Now that av_frame_ref() succeeded, we can replace the previous
// pending_frame
swap_frames(&fb->pending_frame, &fb->tmp_frame);