From patchwork Wed Feb 15 09:24:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 2558 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1866788vsb; Wed, 15 Feb 2017 01:25:19 -0800 (PST) X-Received: by 10.223.133.164 with SMTP id 33mr29680782wrt.39.1487150719479; Wed, 15 Feb 2017 01:25:19 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l45si4311354wrc.12.2017.02.15.01.25.19; Wed, 15 Feb 2017 01:25:19 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABD99689A9F; Wed, 15 Feb 2017 11:24:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 624D7689A37 for ; Wed, 15 Feb 2017 11:24:19 +0200 (EET) Received: by mail-wr0-f194.google.com with SMTP id k90so30315063wrc.3 for ; Wed, 15 Feb 2017 01:24:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HZCljqHPQRm2cP5YOEQPgOYnXU5BgxIDMTDQW8Guf9w=; b=MVCE2WV2+02y1ZGO1pEcsf8b66bJzDiqKp1lS+x5ti5YUrHdrhSzpMWdmn/9Z/jefI 61IX+lycTdYEBRTnFtqC4h0EwycYcp+1W2ReTGEsn7h8pQw3Ykr2t8VEr++/nykM7/ZG d2HHAMKU1y4prCA6xer8MoeNVWuSWYV6vgb6XC98gkLutsBP1uiE5Ajt/ACRk2E6UjAA aCNhI31ckUl0reC9Wk9ZBYYZVEp0aj8vBngqbQyJuxAT0pH+Hbyi/qsz996CR0KHX2fB xXsstraDQLQeqjFIej/1hVWQMtn4yN9krG61rNmxj7AvpmxnERWUQ0rVuIY3l2sxU6w5 buzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HZCljqHPQRm2cP5YOEQPgOYnXU5BgxIDMTDQW8Guf9w=; b=g2ZcB8MViDqJHqOskbxLGLHjpJfI5llJSXyvnB5+MSR3ODor2K1438qO16lZTCLYAo SHMZgPjfTD05Rr1TZCgvweT+zNvDxQeL8/OC+Fxjvsa2yhwmUltg0m7h2R2oLV5/A/7z BrCvg+roP82zFSzQ7FQ1YEhLwccbjwEaKLaGtdCnCaICENykDaOpkToRz2vFbjQjWk4z HD++gI3eOrVJ6CZ0ZL5CzMm+KjPCgehdx2ZBIXaC7lpxppdjLQrEy74EuXhzgyO4/RG+ HAFw8YxPKyVpM1WDzJDSvDCGcu8rd9SD3EK4Ejnb5yMKY6dLRHjYAXN4NTzPQef4R3LB /WQg== X-Gm-Message-State: AMke39nBi/j3rBszrzFJplNGojiCcon6twuVFqQffxXtlty+jW754EDenxZYkh/bjtD85w== X-Received: by 10.223.165.138 with SMTP id g10mr30504513wrc.105.1487150664847; Wed, 15 Feb 2017 01:24:24 -0800 (PST) Received: from localhost.localdomain (p4FF0242F.dip0.t-ipconnect.de. [79.240.36.47]) by smtp.googlemail.com with ESMTPSA id u189sm6787730wmu.1.2017.02.15.01.24.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Feb 2017 01:24:24 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Feb 2017 10:24:20 +0100 Message-Id: <20170215092423.5358-6-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170215092423.5358-1-nfxjfg@googlemail.com> References: <20170210123541.32375-1-nfxjfg@googlemail.com> <20170215092423.5358-1-nfxjfg@googlemail.com> Subject: [FFmpeg-devel] [PATCH v2 5/8] ffmpeg: move flushing the queued frames to configure_filtergraph() 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 Cc: wm4 , Anton Khirnov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Anton Khirnov This is a more appropriate place for it, and will also be useful in the following commit. This merges Libav commit d2e56cf. It was previously skipped. Signed-off-by: wm4 --- ffmpeg.c | 11 ----------- ffmpeg_filter.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 5ef4eee7ad..83088e5195 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2182,17 +2182,6 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame) av_log(NULL, AV_LOG_ERROR, "Error reinitializing filters!\n"); return ret; } - - for (i = 0; i < fg->nb_inputs; i++) { - while (av_fifo_size(fg->inputs[i]->frame_queue)) { - AVFrame *tmp; - av_fifo_generic_read(fg->inputs[i]->frame_queue, &tmp, sizeof(tmp), NULL); - ret = av_buffersrc_add_frame(fg->inputs[i]->filter, tmp); - av_frame_free(&tmp); - if (ret < 0) - return ret; - } - } } ret = av_buffersrc_add_frame_flags(ifilter->filter, frame, AV_BUFFERSRC_FLAG_PUSH); diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index f21a8c85f8..4d9a4e2eb8 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -1117,6 +1117,17 @@ int configure_filtergraph(FilterGraph *fg) ost->enc_ctx->frame_size); } + for (i = 0; i < fg->nb_inputs; i++) { + while (av_fifo_size(fg->inputs[i]->frame_queue)) { + AVFrame *tmp; + av_fifo_generic_read(fg->inputs[i]->frame_queue, &tmp, sizeof(tmp), NULL); + ret = av_buffersrc_add_frame(fg->inputs[i]->filter, tmp); + av_frame_free(&tmp); + if (ret < 0) + return ret; + } + } + return 0; }