diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-23 06:34:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-23 19:47:49 +0100 |
| commit | cf7c7f13cdad07a174110625f8452c8e3444717b (patch) | |
| tree | e8f2dc233728088c979a6f01aa646a25b385be06 | |
| parent | 575d494de561049f36f9c5492e05c7d83dd78e75 (diff) | |
| download | ffmpeg-cf7c7f13cdad07a174110625f8452c8e3444717b.tar.gz | |
pthreads: Generic progress lubrication support.
Fixes bug118, bug120 and bug125 at least
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/pthread.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 070dbffc1f..6ae763da80 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); |