[FFmpeg-cvslog] pthreads: Generic progress lubrication support.

Michael Niedermayer git at videolan.org
Mon Jan 23 19:50:26 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 23 06:34:30 2012 +0100| [cf7c7f13cdad07a174110625f8452c8e3444717b] | committer: Michael Niedermayer

pthreads: Generic progress lubrication support.

Fixes bug118, bug120 and bug125 at least

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf7c7f13cdad07a174110625f8452c8e3444717b
---

 libavcodec/pthread.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 070dbff..6ae763d 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -366,6 +366,7 @@ static attribute_align_arg void *frame_worker_thread(void *arg)
     AVCodec *codec = avctx->codec;
 
     while (1) {
+        int i;
         if (p->state == STATE_INPUT_READY && !fctx->die) {
             pthread_mutex_lock(&p->mutex);
             while (p->state == STATE_INPUT_READY && !fctx->die)
@@ -388,6 +389,12 @@ static attribute_align_arg void *frame_worker_thread(void *arg)
         p->state = STATE_INPUT_READY;
 
         pthread_mutex_lock(&p->progress_mutex);
+        for (i = 0; i < MAX_BUFFERS; i++)
+            if (p->progress_used[i]) {
+                p->progress[i][0] = INT_MAX;
+                p->progress[i][1] = INT_MAX;
+            }
+        pthread_cond_broadcast(&p->progress_cond);
         pthread_cond_signal(&p->output_cond);
         pthread_mutex_unlock(&p->progress_mutex);
 



More information about the ffmpeg-cvslog mailing list