Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

lavu/threadmessage: add av_thread_message_queue_nb_elems()

Browse source
This commit is contained in:
Clément Bœsch 2018-04-21 21:42:19 +02:00
parent 02e4970bc9
commit 71fa82bed6
5 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/APIchanges
View file

@ -15,6 +15,9 @@ libavutil: 2017-10-21
API changes, most recent first: API changes, most recent first:
2018-04-xx - xxxxxxxxxx - lavu 56.16.100 - threadmessage.h
Add av_thread_message_queue_nb_elems().
-------- 8< --------- FFmpeg 4.0 was cut here -------- 8< --------- -------- 8< --------- FFmpeg 4.0 was cut here -------- 8< ---------
2018-04-03 - d6fc031caf - lavu 56.13.100 - pixdesc.h 2018-04-03 - d6fc031caf - lavu 56.13.100 - pixdesc.h

13
libavutil/threadmessage.c
View file

@ -102,6 +102,19 @@ void av_thread_message_queue_free(AVThreadMessageQueue **mq)
#endif #endif
} }
int av_thread_message_queue_nb_elems(AVThreadMessageQueue *mq)
{
#if HAVE_THREADS
int ret;
pthread_mutex_lock(&mq->lock);
ret = av_fifo_size(mq->fifo);
pthread_mutex_unlock(&mq->lock);
return ret / mq->elsize;
#else
return AVERROR(ENOSYS);
#endif
}
#if HAVE_THREADS #if HAVE_THREADS
static int av_thread_message_queue_send_locked(AVThreadMessageQueue *mq, static int av_thread_message_queue_send_locked(AVThreadMessageQueue *mq,

8
libavutil/threadmessage.h
View file

@ -95,6 +95,14 @@ void av_thread_message_queue_set_err_recv(AVThreadMessageQueue *mq,
void av_thread_message_queue_set_free_func(AVThreadMessageQueue *mq, void av_thread_message_queue_set_free_func(AVThreadMessageQueue *mq,
void (*free_func)(void *msg)); void (*free_func)(void *msg));
/**
* Return the current number of messages in the queue.
*
* @return the current number of messages or AVERROR(ENOSYS) if lavu was built
* without thread support
*/
int av_thread_message_queue_nb_elems(AVThreadMessageQueue *mq);
/** /**
* Flush the message queue * Flush the message queue
* *

2
libavutil/version.h
View file

@ -79,7 +79,7 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 56 #define LIBAVUTIL_VERSION_MAJOR 56
#define LIBAVUTIL_VERSION_MINOR 15 #define LIBAVUTIL_VERSION_MINOR 16
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

4
tests/api/api-threadmessage-test.c
View file

@ -130,7 +130,9 @@ static void *receiver_thread(void *arg)
for (i = 0; i < rd->workload; i++) { for (i = 0; i < rd->workload; i++) {
if (rand() % rd->workload < rd->workload / 10) { if (rand() % rd->workload < rd->workload / 10) {
av_log(NULL, AV_LOG_INFO, "receiver #%d: flushing the queue\n", rd->id); av_log(NULL, AV_LOG_INFO, "receiver #%d: flushing the queue, "
"discarding %d message(s)\n", rd->id,
av_thread_message_queue_nb_elems(rd->queue));
av_thread_message_flush(rd->queue); av_thread_message_flush(rd->queue);
} else { } else {
struct message msg; struct message msg;