From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7664240841 for ; Sat, 2 Apr 2022 12:04:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 48EDF68B221; Sat, 2 Apr 2022 15:04:20 +0300 (EEST) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEE7E68B205 for ; Sat, 2 Apr 2022 15:04:14 +0300 (EEST) Received: by mail-ej1-f45.google.com with SMTP id i27so3788047ejd.9 for ; Sat, 02 Apr 2022 05:04:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=T3rbDhGVGIVAPrfL/QJcOC0CxW8U4Ank7VU5ss58ObU=; b=QKscGA6AzBrO7yFiKmccCveRVjrHux/fPIK19fMGXHjDl8gtIaNXOkeXb5NfGFoP7N 2XFruEM+GX7VojezNQALvQS74ctsOw3eoCg3Lhjg5EjVArKfvhL3wZPqL0Ybeiqq4i92 clvsIt5zmuKu2CUixUu5/ZFjLOMLoUeBhg8eWaxNg+gEAgkQ61ernnZFy688dcjcz6zu mt5uYyJJdrIFhXaXoSc2RJwGj8VvZvuyIOZGo9n5towRApbDIX6XE/rj8VoymF2uumdh h0to3ZgNmtQe02P9vQykD64WASDcupXB2hSXe5HttuveQJ4wMSN3dRBmM2m20P5G+R9r jVFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T3rbDhGVGIVAPrfL/QJcOC0CxW8U4Ank7VU5ss58ObU=; b=XSqRp77ugjrxbJ51PDbxZPu+MFNB03Yt0ecT5JtYtLtf/CNG399MvLJ39J+ESrYMQV HdNpepxXngZRiOTFkmg9dJFBn+GzvO4SumNZMJLgAJmbY56P9yclYv6JyYx7jfPY/GK+ 9WFvTwPHhhh8rPCn1brF8wIUFd39gP1OpqYP/NEcDrr1ehs8UAWTFH+HtQ399V5e3CUd XWRSCAGyfg8GUaTTwB44xCDKbYKPnKHwPxGmddu5wJLqXyaqew14KKoPkW9dP7cNuNqL rFNkgf0K/+M77/vYf1hknkjE4Qp+BfWsM6VP89qdJC46c8Xq3R6reiuXP2Xvlm3vfxhd lKCw== X-Gm-Message-State: AOAM532ZDH7dWQZ43bUwEDBNKiqHD7F6AUBKj+vxmDVGHKfq9fDNgILv esFC8HPPs26QFwQ6Lku77JiyUBvuiv8= X-Google-Smtp-Source: ABdhPJycVGXN0bs+YAf+QX5VX7jRL1Ghs3xneSx1yTWte6XKuFKuezDFphaZtVJTPFPkIIHP/EyL7A== X-Received: by 2002:a17:906:a4b:b0:6d0:fbdd:7cb5 with SMTP id x11-20020a1709060a4b00b006d0fbdd7cb5mr3706632ejf.152.1648901054188; Sat, 02 Apr 2022 05:04:14 -0700 (PDT) Received: from localhost.localdomain ([95.168.120.6]) by smtp.gmail.com with ESMTPSA id dd6-20020a1709069b8600b006df08710d00sm2075752ejc.85.2022.04.02.05.04.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 05:04:13 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Apr 2022 14:06:23 +0200 Message-Id: <20220402120623.142534-2-onemda@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220402120623.142534-1-onemda@gmail.com> References: <20220402120623.142534-1-onemda@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/src_movie: add option to set decoding thread type X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Paul B Mahol --- 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 636c80dbff..a13977edd8 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -29317,6 +29317,9 @@ timestamps. @item dec_threads Specifies the number of threads for decoding +@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 bc7b0d37af..08cba437bf 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 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".