encode: fix encoder flushing

'quit' changed meaning to 'immediately quit' during a past
commit, causing encoders to not be flushed.

Author: cyanreg

src/cyanrip_encode.c

@@ -578,14 +578,26 @@ int cyanrip_send_pcm_to_encoders(cyanrip_ctx *ctx, cyanrip_enc_ctx **enc_ctx,
     return ret;
 }
 
+void cyanrip_immediate_stop_encoding(cyanrip_ctx *ctx, cyanrip_track *t)
+{
+    for (int i = 0; i < ctx->settings.outputs_num; i++) {
+        cyanrip_enc_ctx *s = t->enc_ctx[i];
+        if (s)
+            atomic_store(&s->quit, 1);
+    }
+}
+
 int cyanrip_reset_encoding(cyanrip_ctx *ctx, cyanrip_track *t)
 {
+    cyanrip_immediate_stop_encoding(ctx, t);
+
     for (int i = 0; i < ctx->settings.outputs_num; i++) {
         cyanrip_enc_ctx *s = t->enc_ctx[i];
 
-        atomic_store(&s->quit, 1);
-        pthread_mutex_unlock(&s->lock);
-        s->mutex_held = 0;
+        if (s->mutex_held) {
+            pthread_mutex_unlock(&s->lock);
+            s->mutex_held = 0;
+        }
     }
 
     for (int i = 0; i < ctx->settings.outputs_num; i++)
@@ -808,13 +820,12 @@ int cyanrip_end_track_encoding(cyanrip_enc_ctx **s)
 
     ctx = *s;
 
-    atomic_store(&ctx->quit, 1);
-
     if (ctx->mutex_held) {
         pthread_mutex_unlock(&ctx->lock);
         ctx->mutex_held = 0;
     }
 
+    /* Send EOF, needed in case we haven't sent it yet and the user cancels. */
     cr_frame_fifo_push(ctx->fifo, NULL);
     pthread_join(ctx->thread, NULL);
     pthread_mutex_destroy(&ctx->lock);
@@ -831,6 +842,8 @@ int cyanrip_end_track_encoding(cyanrip_enc_ctx **s)
     av_buffer_unref(&ctx->packet_fifo);
     av_packet_free(&ctx->cover_art_pkt);
 
+    atomic_store(&ctx->quit, 0);
+
     int status = ctx->status;
     av_freep(s);
     return status;

src/cyanrip_encode.h

@@ -37,6 +37,7 @@ int cyanrip_send_pcm_to_encoders(cyanrip_ctx *ctx, cyanrip_enc_ctx **enc_ctx,
                                  const uint8_t *data, int bytes,
                                  int calc_global_peak);
 
+void cyanrip_immediate_stop_encoding(cyanrip_ctx *ctx, cyanrip_track *t);
 int cyanrip_reset_encoding(cyanrip_ctx *ctx, cyanrip_track *t);
 int cyanrip_finalize_encoding(cyanrip_ctx *ctx, cyanrip_track *t);
 

src/cyanrip_main.c

@@ -58,6 +58,9 @@ const cyanrip_out_fmt crip_fmt_info[] = {
 
 static void free_track(cyanrip_ctx *ctx, cyanrip_track *t)
 {
+    if (quit_now)
+        cyanrip_immediate_stop_encoding(ctx, t);
+
     for (int i = 0; i < ctx->settings.outputs_num; i++)
         cyanrip_end_track_encoding(&t->enc_ctx[i]);
 
@@ -818,7 +821,7 @@ repeat_ripping:;
     av_free(last_checksums);
 
     t->total_repeats = total_repeats;
-    if (!ret) {
+    if (!quit_now && !ret) {
         cyanrip_finalize_encoding(ctx, t);
         if (ctx->settings.enable_replaygain)
             crip_replaygain_meta_track(ctx, t);