diff options
author | Clément Bœsch <clement@stupeflix.com> | 2015-11-30 20:18:42 +0300 |
---|---|---|
committer | Clément Bœsch <clement@stupeflix.com> | 2015-12-07 13:39:28 +0300 |
commit | f98abe0ee778880408863aff8371f4749f1f9b49 (patch) | |
tree | e879f40b79f011c9fae9d5abca1415b447082aa1 /libavutil/threadmessage.c | |
parent | 6596c6fca7e8d94cca1eec21c692c8dd83aaf9cd (diff) |
avutil/threadmessage: add av_thread_message_flush()
Diffstat (limited to 'libavutil/threadmessage.c')
-rw-r--r-- | libavutil/threadmessage.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/libavutil/threadmessage.c b/libavutil/threadmessage.c index b7fcbe28c0..b7d7dadb5a 100644 --- a/libavutil/threadmessage.c +++ b/libavutil/threadmessage.c @@ -40,6 +40,7 @@ struct AVThreadMessageQueue { int err_send; int err_recv; unsigned elsize; + void (*free_func)(void *msg); #else int dummy; #endif @@ -81,10 +82,17 @@ int av_thread_message_queue_alloc(AVThreadMessageQueue **mq, #endif /* HAVE_THREADS */ } +void av_thread_message_queue_set_free_func(AVThreadMessageQueue *mq, + void (*free_func)(void *msg)) +{ + mq->free_func = free_func; +} + void av_thread_message_queue_free(AVThreadMessageQueue **mq) { #if HAVE_THREADS if (*mq) { + av_thread_message_flush(*mq); av_fifo_freep(&(*mq)->fifo); pthread_cond_destroy(&(*mq)->cond); pthread_mutex_destroy(&(*mq)->lock); @@ -182,3 +190,26 @@ void av_thread_message_queue_set_err_recv(AVThreadMessageQueue *mq, pthread_mutex_unlock(&mq->lock); #endif /* HAVE_THREADS */ } + +static void free_func_wrap(void *arg, void *msg, int size) +{ + AVThreadMessageQueue *mq = arg; + mq->free_func(msg); +} + +void av_thread_message_flush(AVThreadMessageQueue *mq) +{ +#if HAVE_THREADS + int used, off; + void *free_func = mq->free_func; + + pthread_mutex_lock(&mq->lock); + used = av_fifo_size(mq->fifo); + if (free_func) + for (off = 0; off < used; off += mq->elsize) + av_fifo_generic_peek_at(mq->fifo, mq, off, mq->elsize, free_func_wrap); + av_fifo_drain(mq->fifo, used); + pthread_cond_broadcast(&mq->cond); + pthread_mutex_unlock(&mq->lock); +#endif /* HAVE_THREADS */ +} |