sync: fix p-to-p hang

Fixes https://github.com/HandBrake/HandBrake/issues/673

If the end point is near the end of file and one of the streams reaches
eof before the end point is detected, the eof buffer for that stream was
not sent.  Flush all streams when end point is reached.

diff --git a/libhb/sync.c b/libhb/sync.c
index 6a068dd797a2a8487f2fddeca2db4d2f9075406b..663e2331644291ba3f87e8b0bc5c65890d34faa0 100644 (file)
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -1172,8 +1172,6 @@ static void fifo_push( hb_fifo_t * fifo, hb_buffer_t * buf )
 
 static void streamFlush( sync_stream_t * stream )
 {
-    hb_lock(stream->common->mutex);
-
     while (hb_list_count(stream->in_queue) > 0)
     {
         hb_buffer_t * buf;
@@ -1301,8 +1299,6 @@ static void streamFlush( sync_stream_t * stream )
         }
     }
     fifo_push(stream->fifo_out, hb_buffer_eof_init());
-
-    hb_unlock(stream->common->mutex);
 }
 
 static void flushStreams( sync_common_t * common )
@@ -1331,6 +1327,13 @@ static void flushStreams( sync_common_t * common )
     }
 }
 
+static void flushStreamsLock( sync_common_t * common )
+{
+    hb_lock(common->mutex);
+    flushStreams(common);
+    hb_unlock(common->mutex);
+}
+
 static void log_chapter( sync_common_t *common, int chap_num,
                          int nframes, int64_t pts )
 {
@@ -1657,6 +1660,7 @@ static void OutputBuffer( sync_common_t * common )
             out_stream->done = 1;
             fifo_push(out_stream->fifo_out, hb_buffer_eof_init());
             terminateSubtitleStreams(common);
+            flushStreams(common);
             signalBuffer(out_stream);
             continue;
         }
@@ -1670,6 +1674,7 @@ static void OutputBuffer( sync_common_t * common )
             out_stream->done = 1;
             fifo_push(out_stream->fifo_out, hb_buffer_eof_init());
             terminateSubtitleStreams(common);
+            flushStreams(common);
             signalBuffer(out_stream);
             continue;
         }
@@ -2997,7 +3002,7 @@ static int syncVideoWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
     if (in->s.flags & HB_BUF_FLAG_EOF)
     {
         pv->stream->flush = 1;
-        flushStreams(pv->common);
+        flushStreamsLock(pv->common);
         // Ideally, we would only do this subtitle scan check in
         // syncSubtitleWork, but someone might try to do a subtitle
         // scan on a source that has no subtitles :-(
@@ -3089,7 +3094,7 @@ static int syncAudioWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
     if (in->s.flags & HB_BUF_FLAG_EOF)
     {
         pv->stream->flush = 1;
-        flushStreams(pv->common);
+        flushStreamsLock(pv->common);
         return HB_WORK_DONE;
     }
 
@@ -3402,7 +3407,7 @@ static int syncSubtitleWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
         // sanitizeSubtitle requires EOF buffer to recognize that
         // it needs to flush all subtitles.
         hb_list_add(pv->stream->in_queue, hb_buffer_eof_init());
-        flushStreams(pv->common);
+        flushStreamsLock(pv->common);
         if (pv->common->job->indepth_scan)
         {
             // When doing subtitle indepth scan, the pipeline ends at sync.