virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity

ffmpeg: notify when the thread message queue blocks.

Browse Source 
This can help finding the source of A-V desync with live input.
This commit is contained in:
Nicolas George 2015-02-16 21:53:27 +01:00
parent 508d6a23b4
commit d92c6d82c0
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ffmpeg.c
View File

@ -3356,6 +3356,7 @@ static int check_keyboard_interaction(int64_t cur_time)
static void *input_thread(void *arg) static void *input_thread(void *arg)
{ {
InputFile *f = arg; InputFile *f = arg;
unsigned flags = f->non_blocking ? AV_THREAD_MESSAGE_NONBLOCK : 0;
int ret = 0; int ret = 0;
while (1) { while (1) {
@ -3371,7 +3372,15 @@ static void *input_thread(void *arg)
break; break;
} }
av_dup_packet(&pkt); av_dup_packet(&pkt);
ret = av_thread_message_queue_send(f->in_thread_queue, &pkt, 0); ret = av_thread_message_queue_send(f->in_thread_queue, &pkt, flags);
if (flags && ret == AVERROR(EAGAIN)) {
flags = 0;
ret = av_thread_message_queue_send(f->in_thread_queue, &pkt, flags);
av_log(f->ctx, AV_LOG_WARNING,
"Thread message queue blocking; consider raising the "
"thread_queue_size option (current value: %d)\n",
f->thread_queue_size);
}
if (ret < 0) { if (ret < 0) {
if (ret != AVERROR_EOF) if (ret != AVERROR_EOF)
av_log(f->ctx, AV_LOG_ERROR, av_log(f->ctx, AV_LOG_ERROR,