From patchwork Sun Aug 25 16:27:05 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: 14705 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 73211448C4C for ; Sun, 25 Aug 2019 19:27:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4824768AC62; Sun, 25 Aug 2019 19:27:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29A4A68ABB3 for ; Sun, 25 Aug 2019 19:27:18 +0300 (EEST) Received: by mail-io1-f48.google.com with SMTP id p12so31636367iog.5 for ; Sun, 25 Aug 2019 09:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=5UdxCIAdd3QC4mXwI8eAUMXdJq3LdSgHuhbEp2dF7hc=; b=Dea1BL9cdTDtBZCllnfU692mv3R0ggtyjNQca6oma0h69lTneyptsadRLakvcYfgw0 Vro0k0iNAkjXZRN+kfgUsNfxBDGAJTMBzseT8oBgTKTcVDDJzPS77OiGGN33R9yAUmQs 2Eyzwz6VrOBKLWFDW/44+sHvuCZmKHqWrA1lKamBKSXCK/zEa2x7Wwa3f9mz51gaHebj 2QmTK08FCwZOxXI6qdW6FJDMbokCi0PDeEg7p6Mt0aEmyMqg5osktyBW6biLQ1vZt22K qH7cB9g6DywxuRKYlXHnuXtN1CsnToXBAqVVV8lLZpFlxmkcpK1uitiX4/4qT+kojVn5 KsyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=5UdxCIAdd3QC4mXwI8eAUMXdJq3LdSgHuhbEp2dF7hc=; b=Sb/770vv9GmSSIpaIwGG4wkkFtal70fHKjgAzob68+IH1GJfhjwW0CBflJoxT7mXbw 7U/PRt3wqK8e242joejUqZtNeokYFUn1w1eI6dZioZtcJgqIkzJdc9ipCVQOnuDlDAqw hXk8LXGiA/LK1oY1Ehkjnm9XTc895aetWfmaeu4f2uWlIFOSyf/LAaeavuzGA+wb+JmW VaUhd1II77QoghCJU5wHGH3JQnaOYVT0Ml4+72QzFTiDceX6X1rT6BUZdxDObg2YcHYt IZ4O++41EzmHAPfChAvq3LBA+vOW+J97exddheG9aVzz2RDgCMUqzgo8Go6ax3nuKIVc ns5g== X-Gm-Message-State: APjAAAVrkR1LYgtPfE3f6Pb5rXo9MHM2E23mk++2rP2S83jaEINvXRXS tYHLshIb385kLGmh5JSumOYq2EjpNAO3QUaJKKUngg== X-Google-Smtp-Source: APXvYqyJepX+Y/auAvljuvJU0I5ggj+wpwQRnZd7Sq/lyjNrZCBXxYEVjHwR/vVgwMLGSUxAsZp+6ZVTECimqXuf8l4= X-Received: by 2002:a6b:6e0e:: with SMTP id d14mr16499190ioh.18.1566750436842; Sun, 25 Aug 2019 09:27:16 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Sun, 25 Aug 2019 18:27:05 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [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" Hi! Attached patch should fix ticket #7542. Please comment, Carl Eugen 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) { AVCodec *codec; int ret; @@ -173,6 +173,7 @@ 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"); -- 2.22.1