Display and control your Android device
Rename "stop" to "interrupt"
Romain Vimont84270e2d1811
diff --git a/app/src/decoder.c b/app/src/decoder.cindex adc59a30..a4a5beca 100644--- a/app/src/decoder.c+++ b/app/src/decoder.c@@ -317,7 +317,7 @@ SDL_bool decoder_start(struct decoder *decoder) {}void decoder_stop(struct decoder *decoder) {- video_buffer_stop(decoder->video_buffer);+ video_buffer_interrupt(decoder->video_buffer);}void decoder_join(struct decoder *decoder) {diff --git a/app/src/video_buffer.c b/app/src/video_buffer.cindex f2a288d4..248b450a 100644--- a/app/src/video_buffer.c+++ b/app/src/video_buffer.c@@ -27,7 +27,7 @@ SDL_bool video_buffer_init(struct video_buffer *vb) {SDL_DestroyMutex(vb->mutex);goto error_2;}- vb->stopped = SDL_FALSE;+ vb->interrupted = SDL_FALSE;#endif// there is initially no rendering frame, so consider it has already been@@ -65,7 +65,7 @@ SDL_bool video_buffer_offer_decoded_frame(struct video_buffer *vb) {#ifndef SKIP_FRAMES// if SKIP_FRAMES is disabled, then the decoder must wait for the current// frame to be consumed- while (!vb->rendering_frame_consumed && !vb->stopped) {+ while (!vb->rendering_frame_consumed && !vb->interrupted) {cond_wait(vb->rendering_frame_consumed_cond, vb->mutex);}#else@@ -97,12 +97,12 @@ const AVFrame *video_buffer_consume_rendered_frame(struct video_buffer *vb) {return vb->rendering_frame;}-void video_buffer_stop(struct video_buffer *vb) {+void video_buffer_interrupt(struct video_buffer *vb) {#ifdef SKIP_FRAMES(void) vb; // unused#elsemutex_lock(vb->mutex);- vb->stopped = SDL_TRUE;+ vb->interrupted = SDL_TRUE;mutex_unlock(vb->mutex);// wake up blocking waitcond_signal(vb->rendering_frame_consumed_cond);diff --git a/app/src/video_buffer.h b/app/src/video_buffer.hindex 5c19557d..4ad422f8 100644--- a/app/src/video_buffer.h+++ b/app/src/video_buffer.h@@ -15,7 +15,7 @@ struct video_buffer {AVFrame *rendering_frame;SDL_mutex *mutex;#ifndef SKIP_FRAMES- SDL_bool stopped;+ SDL_bool interrupted;SDL_cond *rendering_frame_consumed_cond;#endifSDL_bool rendering_frame_consumed;@@ -37,6 +37,6 @@ SDL_bool video_buffer_offer_decoded_frame(struct video_buffer *vb);const AVFrame *video_buffer_consume_rendered_frame(struct video_buffer *vb);// wake up and avoid any blocking call-void video_buffer_stop(struct video_buffer *vb);+void video_buffer_interrupt(struct video_buffer *vb);#endif