Le septidi 7 ventôse, an CCXXIII, Michael Niedermayer a écrit : > without pthreads, this seems to fail to build
Forgot to test that, sorry. Fixed. By the way, what are the remaining supported cases where threads are not available? Regards, -- Nicolas George
From 16fc0adda7fa35b69053205abf9dd61a3ebe4b03 Mon Sep 17 00:00:00 2001
From: Nicolas George <geo...@nsup.org>
Date: Wed, 25 Feb 2015 11:50:44 +0100
Subject: [PATCH 2/3] ffmpeg: allow to set the thread message queue size.
Signed-off-by: Nicolas George <geo...@nsup.org>
---
doc/ffmpeg.texi | 6 ++++++
ffmpeg.c | 2 +-
ffmpeg.h | 2 ++
ffmpeg_opt.c | 6 ++++++
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 6e51c44..6772f2f 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1158,6 +1158,12 @@ This option enables or disables accurate seeking in input files with the
transcoding. Use @option{-noaccurate_seek} to disable it, which may be useful
e.g. when copying some streams and transcoding the others.
+@item -thread_message_queue @var{size} (@emph{input})
+This option sets the maximum number of queued packets when reading from the
+file or device. With low latency / high rate live streams, packets may be
+discarded if they are not read in a timely manner; raising this value can
+avoid it.
+
@item -override_ffserver (@emph{global})
Overrides the input specifications from @command{ffserver}. Using this
option you can map any input stream to @command{ffserver} and control
diff --git a/ffmpeg.c b/ffmpeg.c
index becd5df..54ba0cb 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3420,7 +3420,7 @@ static int init_input_threads(void)
strcmp(f->ctx->iformat->name, "lavfi"))
f->non_blocking = 1;
ret = av_thread_message_queue_alloc(&f->in_thread_queue,
- 8, sizeof(AVPacket));
+ f->thread_queue_size, sizeof(AVPacket));
if (ret < 0)
return ret;
diff --git a/ffmpeg.h b/ffmpeg.h
index d2e0c5c..7c0c22c 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -111,6 +111,7 @@ typedef struct OptionsContext {
int64_t input_ts_offset;
int rate_emu;
int accurate_seek;
+ int thread_queue_size;
SpecifierOpt *ts_scale;
int nb_ts_scale;
@@ -350,6 +351,7 @@ typedef struct InputFile {
pthread_t thread; /* thread reading from this file */
int non_blocking; /* reading packets from the thread should not block */
int joined; /* the thread has been joined */
+ int thread_queue_size; /* maximum number of queued packets */
#endif
} InputFile;
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 09e6e33..39c5f49 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -951,6 +951,9 @@ static int open_input_file(OptionsContext *o, const char *filename)
f->nb_streams = ic->nb_streams;
f->rate_emu = o->rate_emu;
f->accurate_seek = o->accurate_seek;
+#if HAVE_PTHREADS
+ f->thread_queue_size = o->thread_queue_size > 0 ? o->thread_queue_size : 8;
+#endif
/* check if all codec options have been used */
unused_opts = strip_specifiers(o->g->codec_opts);
@@ -2957,6 +2960,9 @@ const OptionDef options[] = {
{ "disposition", OPT_STRING | HAS_ARG | OPT_SPEC |
OPT_OUTPUT, { .off = OFFSET(disposition) },
"disposition", "" },
+ { "thread_queue_size", HAS_ARG | OPT_INT | OPT_OFFSET | OPT_EXPERT | OPT_INPUT,
+ { .off = OFFSET(thread_queue_size) },
+ "set the maximum number of queued packets from the demuxer" },
/* video options */
{ "vframes", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_video_frames },
--
2.1.4
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
