From patchwork Thu Mar 2 08:53:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 2730 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.31.14 with SMTP id f14csp153817vsf; Thu, 2 Mar 2017 00:54:05 -0800 (PST) X-Received: by 10.28.158.193 with SMTP id h184mr6840174wme.59.1488444845042; Thu, 02 Mar 2017 00:54:05 -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 v41si9848349wrc.210.2017.03.02.00.54.04; Thu, 02 Mar 2017 00:54:05 -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 793186883A5; Thu, 2 Mar 2017 10:53:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6AD1688382 for ; Thu, 2 Mar 2017 10:53:09 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id n11so3702586wma.0 for ; Thu, 02 Mar 2017 00:53:21 -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=rq1Q7TorRQKVxynO3wsO3dZE5qoiIuFGSsy0EEbGoxU=; b=AMsKgoRyrKSh/Uy491kMAklwBJZZNt6g4JP1z0VKjYtXJHH30djVscbWrE6DP9eg33 +eCRCSO0Bbh1EbTeF+GvC7srZ/t6cWkeobKW7CBEtfBncnclUZBu0Fygd8LlxCkg0n1y FyadDzEZ52cbPHjZAwN+azIxlDfocpDdKDY6tte8274oF4bksaJgvH65aDb2vMTe+Ep4 owZvfsDTfRcK+C2u8IN4Nx/mfbWc1BessENSMfjfwsEo44c29x9oN0ir4qBn6N9skuds 0duqhJiMtRBItOkFWOftY3WY8nfflDeWSej6hIcxP2gCX6X1rZpuXc55CuKBhu7/JkQe rLXA== 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=rq1Q7TorRQKVxynO3wsO3dZE5qoiIuFGSsy0EEbGoxU=; b=h3x3xg15D+0k97vjTXQAgZntI446uD50mjHmoI0JUitJZ/JMqz9df+9lK2aSwdOqa3 QjBR74kNmNHAH5T03OBuf7kZB2xCHwXr83pKiCtjz0IR9Vxps01tY2LGIrl68xj1lBUC pplim0BHLrc5DIS5zFxW4X96zYWKCx6kJ2NdPChQiHlY3a/I29fS09fI9MyMXjgJFfZY iPCby5k9bLlfLxk/wZUD0VuDIV1Ngu4dAVwBGq2x5OpiqUwEi2wBJKGIr81jTArSWSqf /+YNXkSV9CUYJJpCmwgBWVe4kgnxtZgvdkuMDYSYamSkb/2/wdvrJbAaP7deXWNBcpv1 5Dgg== X-Gm-Message-State: AMke39lnuV5TY61gimh9BcuhKqIW56bq/i8AeKlx3zAXKLOGDnd7qp4HueOUd941jFBCiA== X-Received: by 10.28.23.66 with SMTP id 63mr7089922wmx.46.1488444800526; Thu, 02 Mar 2017 00:53:20 -0800 (PST) Received: from localhost.localdomain (p4FF003DA.dip0.t-ipconnect.de. [79.240.3.218]) by smtp.googlemail.com with ESMTPSA id s18sm26177390wmb.18.2017.03.02.00.53.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Mar 2017 00:53:19 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Mar 2017 09:53:07 +0100 Message-Id: <20170302085309.11471-6-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170302085309.11471-1-nfxjfg@googlemail.com> References: <20170210123541.32375-1-nfxjfg@googlemail.com> <20170302085309.11471-1-nfxjfg@googlemail.com> Subject: [FFmpeg-devel] [PATCH v3 5/7] 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 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 2f6eed7d78..e059b88720 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2186,17 +2186,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; }