[FFmpeg-cvslog] ffmpeg: notify when the thread message queue blocks.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <george at nsup.org> | Mon Feb 16 21:53:27 2015 +0100| [d92c6d82c03b89d565f70e7a8e5b03b25f78f70c] | committer: Nicolas George

ffmpeg: notify when the thread message queue blocks.

This can help finding the source of A-V desync with live input.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d92c6d82c03b89d565f70e7a8e5b03b25f78f70c
---

 ffmpeg.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 54ba0cb..c6f3dcd 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3356,6 +3356,7 @@ static int check_keyboard_interaction(int64_t cur_time)
 static void *input_thread(void *arg)
 {
     InputFile *f = arg;
+    unsigned flags = f->non_blocking ? AV_THREAD_MESSAGE_NONBLOCK : 0;
     int ret = 0;
 
     while (1) {
@@ -3371,7 +3372,15 @@ static void *input_thread(void *arg)
             break;
         }
         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 != AVERROR_EOF)
                 av_log(f->ctx, AV_LOG_ERROR,