[FFmpeg-devel] [PATCH 2/2] avfilter/src_movie: add option to set decoding thread type

[Paul B Mahol]

Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
 doc/filters.texi        |  3 +++
 libavfilter/src_movie.c | 11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 1d56d24819..af332041e8 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -28790,6 +28790,9 @@ timestamps.
 @item dec_threads
 Specifies the number of threads for decoding
 
+ at item dec_thread_type
+Specifies the thread type for decoding.
+
 @item format_opts
 Specify format options for the opened file. Format options can be specified
 as a list of @var{key}=@var{value} pairs separated by ':'. The following example
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index 8c7ea5686a..b4592d0390 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -72,6 +72,7 @@ typedef struct MovieContext {
     int64_t discontinuity_threshold;
     int64_t ts_offset;
     int dec_threads;
+    int thread_type;
     int got_eagain;
     int got_wanted;
 
@@ -99,6 +100,10 @@ static const AVOption movie_options[]= {
     { "loop",         "set loop count",          OFFSET(loop_count),   AV_OPT_TYPE_INT,    {.i64 =  1},  0,        INT_MAX, FLAGS },
     { "discontinuity", "set discontinuity threshold", OFFSET(discontinuity_threshold), AV_OPT_TYPE_DURATION, {.i64 = 0}, 0, INT64_MAX, FLAGS },
     { "dec_threads",  "set the number of threads for decoding", OFFSET(dec_threads), AV_OPT_TYPE_INT, {.i64 =  0}, 0, INT_MAX, FLAGS },
+    { "dec_thread_type","set the type of threads for decoding", OFFSET(thread_type), AV_OPT_TYPE_INT, {.i64 =  0}, 0, 2, FLAGS, .unit = "thread_type" },
+    { "auto",         "auto",                        0, AV_OPT_TYPE_CONST, {.i64 = 0}, 0, 0, FLAGS, .unit = "thread_type" },
+    { "frame",        "more than one frame at once", 0, AV_OPT_TYPE_CONST, {.i64 = 1}, 0, 0, FLAGS, .unit = "thread_type" },
+    { "slice",        "more than one part of single frame at once", 0, AV_OPT_TYPE_CONST, {.i64 = 2}, 0, 0, FLAGS, .unit = "thread_type" },
     { "format_opts",  "set format options for the opened file", OFFSET(format_opts), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, FLAGS},
     { NULL },
 };
@@ -159,7 +164,7 @@ static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec)
     return found;
 }
 
-static int open_stream(AVFilterContext *ctx, MovieStream *st, int dec_threads)
+static int open_stream(AVFilterContext *ctx, MovieStream *st, int dec_threads, int thread_type)
 {
     const AVCodec *codec;
     int ret;
@@ -181,6 +186,8 @@ static int open_stream(AVFilterContext *ctx, MovieStream *st, int dec_threads)
     if (!dec_threads)
         dec_threads = ff_filter_get_nb_threads(ctx);
     st->codec_ctx->thread_count = dec_threads;
+    if (thread_type)
+        st->codec_ctx->thread_type = thread_type;
 
     if ((ret = avcodec_open2(st->codec_ctx, codec, NULL)) < 0) {
         av_log(ctx, AV_LOG_ERROR, "Failed to open codec\n");
@@ -325,7 +332,7 @@ static av_cold int movie_common_init(AVFilterContext *ctx)
             if (ret < 0)
                 return ret;
         }
-        ret = open_stream(ctx, &movie->st[i], movie->dec_threads);
+        ret = open_stream(ctx, &movie->st[i], movie->dec_threads, movie->thread_type);
         if (ret < 0)
             return ret;
     }
-- 
2.35.1