fix potential runaway buffer usage

pthread_cond_timedwait can wake early.  under certain system load conditions, this
happens often.  I was going ahead and adding buffers whenever it woke, regardless
of whether the condition had actually been met. so the fifo depth would
increase until memory ran out.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3030 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 16 insertions, 2 deletions

diff --git a/libhb/work.c b/libhb/work.c
index 05bf6a1f3..7a923a192 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -944,7 +944,14 @@ static void do_job( hb_job_t * job, int cpu_count )
         }
         if( buf_out )
         {
-            hb_fifo_push_wait( w->fifo_out, buf_out );
+            while ( !*job->die )
+            {
+                if ( hb_fifo_full_wait( w->fifo_out ) )
+                {
+                    hb_fifo_push( w->fifo_out, buf_out );
+                    break;
+                }
+            }
         }
     }
     hb_list_rem( job->list_work, w );
@@ -1160,7 +1167,14 @@ static void work_loop( void * _w )
         }
         if( buf_out )
         {
-            hb_fifo_push_wait( w->fifo_out, buf_out );
+            while ( !*w->done )
+            {
+                if ( hb_fifo_full_wait( w->fifo_out ) )
+                {
+                    hb_fifo_push( w->fifo_out, buf_out );
+                    break;
+                }
+            }
         }
     }
 }