[FFmpeg-cvslog] pthread: Immediately release all frames in ff_thread_flush()
Alexander Strange
git at videolan.org
Sun Mar 25 23:42:50 CEST 2012
ffmpeg | branch: master | Alexander Strange <astrange at ithinksw.com> | Sat Mar 24 18:25:15 2012 -0400| [147ee4cf065a20bbba10292b496a037e6573cd6e] | committer: Ronald S. Bultje
pthread: Immediately release all frames in ff_thread_flush()
Before this, they were only added to the delayed release queue and not
freed until later. This could lead to unnecessary memory use or buffer
exhaustion.
Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=147ee4cf065a20bbba10292b496a037e6573cd6e
---
libavcodec/pthread.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 2a11195..ee7bdb5 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -880,9 +880,13 @@ void ff_thread_flush(AVCodecContext *avctx)
fctx->next_decoding = fctx->next_finished = 0;
fctx->delaying = 1;
fctx->prev_thread = NULL;
- // Make sure decode flush calls with size=0 won't return old frames
- for (int i = 0; i < avctx->thread_count; i++)
- fctx->threads[i].got_frame = 0;
+ for (int i = 0; i < avctx->thread_count; i++) {
+ PerThreadContext *p = &fctx->threads[i];
+ // Make sure decode flush calls with size=0 won't return old frames
+ p->got_frame = 0;
+
+ release_delayed_buffers(p);
+ }
}
static int *allocate_progress(PerThreadContext *p)
More information about the ffmpeg-cvslog
mailing list