From patchwork Mon Mar 2 04:44:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17998 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 0CF63449CCD for ; Mon, 2 Mar 2020 06:45:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E43A268B4AC; Mon, 2 Mar 2020 06:45:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7AC4C68B112 for ; Mon, 2 Mar 2020 06:45:01 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id e10so9326164wrr.10 for ; Sun, 01 Mar 2020 20:45:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y0BNFkDtQ5d7MJL3bLXR3KAzi78QeRWkbAdjssyhwU8=; b=UerW32grfB/VZUauISUKsWPxhMR69zrB5r0/YjrkEyy7uPD1qPz2FIa+9u5gRKW7uc awPQB9rrtN+HcYIMMPOoz0+4elAKLWrADbAuEkY4hwLy1Wn7UfhDjTM1JmK/xTOxxpkY 2746OYlnAgYr0wQmo38czRMLpHUpvnrWaappFG60xnU5oIDC4SeHsjkZObKohzrcbfUW 3vhXelxTCMo5JWnyT8CFx6wZ8CfBm+flh3ICcPJqfjdIxmCYDnPgdWj1q5yUUO3DOT3p oCWDuind53QpMjkn/5a3IFJNR2TP4X8g3OhPK5kJ4PmJlaYT5mU6+YBgxhDqJrlgjdjn HnEA== 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:mime-version:content-transfer-encoding; bh=y0BNFkDtQ5d7MJL3bLXR3KAzi78QeRWkbAdjssyhwU8=; b=JP/kU7154tT4/NO1751rYlGo+5g53acdJxqGCm9sSeseIL/WDxYycEdcqL5OXkODgY FMpxQKdCHQBh2CESsbYxrZorYZ1s9GmkdzGqOtDiIFUHD0TOLL8A8nlxn85JmGWCR4et NQoMAIQXeUyfJn1SlB8d8kue4NNP6/ysp970VbGcc+3HjE7xL+sb0JjvjfNfoEBdAQ3h yAuk/1jxzzsY3n15KZP8v2vfjG1n3PfAWUye5P8IYaRYvjruNLlhZrPPLnpkxJkLZ5nF YUWXEAkkwGLxHR1ahrfZHDhL4UcSJyFwRkR8obkt5tdNz0+P0oeZhfNYpQ9+gyUvZCF6 jSHw== X-Gm-Message-State: APjAAAX+BorlqgIyy4cxyRb1YSkGhvlP8sXl9nVVD6soXkUYTL4k+QmI rR4MVz8XGC7oPRJIfZjEhEyMrRUW X-Google-Smtp-Source: APXvYqyg7dc61HWDN5BtpkZd02qkACoeaNPS6xPGY2fYgE8EZKagyTYb9X70mgTZJ5E1EVuVA/6AWw== X-Received: by 2002:a5d:5286:: with SMTP id c6mr13409230wrv.418.1583124300654; Sun, 01 Mar 2020 20:45:00 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id s22sm13130229wmc.16.2020.03.01.20.44.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2020 20:45:00 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Mar 2020 05:44:38 +0100 Message-Id: <20200302044445.14842-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302043520.14165-1-andreas.rheinhardt@gmail.com> References: <20200302043520.14165-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/17] avformat/webm_chunk: Avoid unnecessary flushes 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The webm_chunk muxer caches its output to a dynamic buffer and when it outputs anything, it explicitly flushes it. So set the flags indicating that flushing after each packet should not be done automatically (basically avoiding avio_write_marker() to be called by flush_if_needed() in libavformat/mux.c). Signed-off-by: Andreas Rheinhardt --- libavformat/webm_chunk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index 3c00c562e5..3beb267458 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -72,10 +72,12 @@ static int chunk_mux_init(AVFormatContext *s) oc->interrupt_callback = s->interrupt_callback; oc->max_delay = s->max_delay; - oc->flags = s->flags; + oc->flags = s->flags & ~AVFMT_FLAG_FLUSH_PACKETS; oc->strict_std_compliance = s->strict_std_compliance; oc->avoid_negative_ts = s->avoid_negative_ts; + oc->flush_packets = 0; + av_dict_copy(&oc->metadata, s->metadata, 0); if (!(st = avformat_new_stream(oc, NULL)))