From patchwork Sun Aug 25 16:43:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 14706 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D9336449B40 for ; Sun, 25 Aug 2019 19:43:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B38F368AC7B; Sun, 25 Aug 2019 19:43:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F22868AC64 for ; Sun, 25 Aug 2019 19:43:42 +0300 (EEST) Received: by mail-io1-f67.google.com with SMTP id t3so31548545ioj.12 for ; Sun, 25 Aug 2019 09:43:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=G2RMoF6KGv8zBJTb/TVSVnBEpz4XGDJKGnkFC0YRUs0=; b=LhE6qxXaprh7hUSlU7P7FUuVkcMryqVxEPiMKhsjbeeSM079cHLrK/3pd5ysPECtCG higJYcKU8XplQtgFFKC8a/LxY6J1xHZUemKhDvGWE0hiF2zVF3TJOERqnfKKCykDLhgg OrhFzEwJYKxiBSj4nmg1NF6LB22czAyYQYIPM+E5fZS09uaeTdzWWKQaRo6BcxIKTTZs G18uc1gUC5ZL5B4jM1djsaNRyy15UyGaadVI8GjL2zMgkq+zTb320eyd+IBN+Vi/gXB3 Jzqo4KbnmkizWyQUI7jjvf9pGmfeanmMhGlHlZtfWi2EpXoQ1GGCnNCt1Srywzjcn1sC pKGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=G2RMoF6KGv8zBJTb/TVSVnBEpz4XGDJKGnkFC0YRUs0=; b=aoKN7Bpm/dr3Td14qxHc6lLGelzAlFb8QddkhudXUYhLuqP3IEUcqqgjwgFSnsSRPp zkBeeoA3eZrZO/9AVsvWtm3NMjE6RrQlFGhY6Yn55sX5Yy9eOlXdPcrqtZe5iK/jpR7q go+SwYfz4IPViSwqHqBKMttgx4Mc2SNkIqMYmy7Nx1FvXTuT6/8RZj4wfei0FulzUW8s b0VQ+yAIf/CHwzMJ+WK1+410oWMksvoX4B9M2D7ZrDc6CBCCQWAyaISoZIhoAFkApzQj MWyWOG2lt/IPzKM1moN9n+xdc9fHLG7G3wwqKB7io9i+UYoU0RXSH3084MdNTrvUFifE nR1g== X-Gm-Message-State: APjAAAVhHCUYNZ8fdp0vS7CE+goQb355ZSs+fQIm7N5r3vP999SM3WOc K9fBZ5DNZd7If+iNMhaAL/+5KJRtzQgSV4P4NY9KIA== X-Google-Smtp-Source: APXvYqzT+WQZLgBmYbe/nuCiG1B+VGYl9JhFANdgmkGF6OxzHDSNrCizUZSgNI8mZ8RrUawK8s1pFsKLAXZVb5mQSJg= X-Received: by 2002:a5d:9957:: with SMTP id v23mr18987414ios.117.1566751420803; Sun, 25 Aug 2019 09:43:40 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Carl Eugen Hoyos Date: Sun, 25 Aug 2019 18:43:29 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH]lavfi/movie: Use filter threads as decoding threads X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Am So., 25. Aug. 2019 um 18:38 Uhr schrieb James Almer : > > On 8/25/2019 1:27 PM, Carl Eugen Hoyos wrote: > > Hi! > > > > Attached patch should fix ticket #7542. > > > > Please comment, Carl Eugen > > > > > > 0001-lavfi-movie-Use-filter-thread-count-for-decoding-thr.patch > > > > From 21f3c281dbd9d97ac47ed611958a85881c4b7fba Mon Sep 17 00:00:00 2001 > > From: Carl Eugen Hoyos > > Date: Sun, 25 Aug 2019 18:12:30 +0200 > > Subject: [PATCH] lavfi/movie: Use filter thread count for decoding threads. > > > > Fixes ticket #7542. > > --- > > libavfilter/src_movie.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c > > index bcabfcc4c2..78c73e78a4 100644 > > --- a/libavfilter/src_movie.c > > +++ b/libavfilter/src_movie.c > > @@ -153,7 +153,7 @@ static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec) > > return found; > > } > > > > -static int open_stream(void *log, MovieStream *st) > > +static int open_stream(AVFilterContext *ctx, MovieStream *st) > > log is now undeclared. Or rather, it still is for some reason (i guess > the function parameter overloaded some global declaration), just not > pointing to what you wanted it to. New patch attached. Thank you, Carl Eugen From 9bc8ca9f3f0a7b3f688637a573c6af366b79eff1 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 25 Aug 2019 18:42:02 +0200 Subject: [PATCH] lavfi/movie: Use filter thread count for decoding threads. Fixes ticket #7542. --- libavfilter/src_movie.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index bcabfcc4c2..79423a894d 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -153,14 +153,14 @@ static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec) return found; } -static int open_stream(void *log, MovieStream *st) +static int open_stream(AVFilterContext *ctx, MovieStream *st) { AVCodec *codec; int ret; codec = avcodec_find_decoder(st->st->codecpar->codec_id); if (!codec) { - av_log(log, AV_LOG_ERROR, "Failed to find any codec\n"); + av_log(ctx, AV_LOG_ERROR, "Failed to find any codec\n"); return AVERROR(EINVAL); } @@ -173,9 +173,10 @@ static int open_stream(void *log, MovieStream *st) return ret; st->codec_ctx->refcounted_frames = 1; + st->codec_ctx->thread_count = ff_filter_get_nb_threads(ctx); if ((ret = avcodec_open2(st->codec_ctx, codec, NULL)) < 0) { - av_log(log, AV_LOG_ERROR, "Failed to open codec\n"); + av_log(ctx, AV_LOG_ERROR, "Failed to open codec\n"); return ret; } -- 2.22.1