From patchwork Sun Jun 4 13:35:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 3833 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp962688vsk; Sun, 4 Jun 2017 06:35:33 -0700 (PDT) X-Received: by 10.28.113.85 with SMTP id m82mr5159959wmc.21.1496583333000; Sun, 04 Jun 2017 06:35:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496583332; cv=none; d=google.com; s=arc-20160816; b=cbTZ2VqaLNU83AEs2yzqA8z4A8kOA9yz8wad8ciG/6pckIM7/JyUs4IB/NzMD9cnGo ENy0nhoqPdUDUtqddomF5c0ySF5fFI1uVR6sGobF1CH+aMOH9CxuldDpvSgO55Uth0Aq /y4cgCCXyf6F9hs5+jZAN6zVl76UR4lAnaddu2/49tvsFg4h7/sZm08m2gX9T/yS62f/ FUMByqeUh+f9tMqj0nHfvi3KDiPU/deKpmBvE8XyGRgLEREx4miWtMX5XifwvJauW2eU fvI6HPq+2xCuKBHGUU20QtkG1FHP5JedtyDw478XMjfR7QmIFi1spV0ptTOaUFDEG1qg cYbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=m9rQz5QfSz5HC7Q9kZ+P0WbqsFW4EHkQqQgA+RoWkdQ=; b=w8yF/P/fkAI9fwVBnwR6kYxqmwUoeT9XCCNwsr2o3pRWPxBGzBSXWXyxiXSTfPvgzk P+MYy2SxdHugru+nVaxVpu0vyLncuHI2Xz5EmsjiARvxgKiMJ83eqYXMGqHvVsiqUCP2 Y925j/Tui5isXZDQSmdhjSyYdmvRiMaR9dcfDmxz6Xr80meuiqMpVlysZsdFP8U/YnDV kxbn5XEMYHhmhK/cZlBb2oQrBs2lmKfNOiyi3Jva/T3uoXuINooK2FYPOA67gz3If8nG gCS02wpYFk6iHZVQpwrkIpjTFsfX1lbsdtqZCSIN2/C7/MR8XfqH200ejg+JBhv7P7PR FrRA== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y16si22873827wrb.0.2017.06.04.06.35.32; Sun, 04 Jun 2017 06:35:32 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A9287689D9D; Sun, 4 Jun 2017 16:35:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B6416689D50 for ; Sun, 4 Jun 2017 16:35:08 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 28673102CC9; Sun, 4 Jun 2017 15:35:15 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PggOy2dLnIvL; Sun, 4 Jun 2017 15:35:14 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 5D4611031B9; Sun, 4 Jun 2017 15:35:13 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Jun 2017 15:35:06 +0200 Message-Id: <20170604133507.20614-2-cus@passwd.hu> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170604133507.20614-1-cus@passwd.hu> References: <20170604133507.20614-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 2/3] avformat/options: disable flush_packets as default 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It is a huge performance improvement for encoding files with small packets (e.g. wav) over SMB/CIFS. Signed-off-by: Marton Balint --- libavformat/mux.c | 4 ++-- libavformat/options_table.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index e1e49a81be..540ac56c3f 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -479,7 +479,7 @@ static int write_header_internal(AVFormatContext *s) s->internal->write_header_ret = ret; if (ret < 0) return ret; - if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS) + if ((s->flush_packets || s->flags & AVFMT_FLAG_FLUSH_PACKETS) && s->pb && s->pb->error >= 0) avio_flush(s->pb); } s->internal->header_written = 1; @@ -772,7 +772,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } if (s->pb && ret >= 0) { - if (s->flush_packets && s->flags & AVFMT_FLAG_FLUSH_PACKETS) + if (s->flush_packets || s->flags & AVFMT_FLAG_FLUSH_PACKETS) avio_flush(s->pb); if (s->pb->error < 0) ret = s->pb->error; diff --git a/libavformat/options_table.h b/libavformat/options_table.h index 0c1915d6d4..b72f72b845 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -39,7 +39,7 @@ static const AVOption avformat_options[] = { {"probesize", "set probing size", OFFSET(probesize), AV_OPT_TYPE_INT64, {.i64 = 5000000 }, 32, INT64_MAX, D}, {"formatprobesize", "number of bytes to probe file format", OFFSET(format_probesize), AV_OPT_TYPE_INT, {.i64 = PROBE_BUF_MAX}, 0, INT_MAX-1, D}, {"packetsize", "set packet size", OFFSET(packet_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, E}, -{"fflags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = AVFMT_FLAG_FLUSH_PACKETS | AVFMT_FLAG_AUTO_BSF }, INT_MIN, INT_MAX, D|E, "fflags"}, +{"fflags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = AVFMT_FLAG_AUTO_BSF }, INT_MIN, INT_MAX, D|E, "fflags"}, {"flush_packets", "reduce the latency by flushing out packets immediately", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_FLUSH_PACKETS }, INT_MIN, INT_MAX, E, "fflags"}, {"ignidx", "ignore index", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_IGNIDX }, INT_MIN, INT_MAX, D, "fflags"}, {"genpts", "generate pts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_GENPTS }, INT_MIN, INT_MAX, D, "fflags"}, @@ -85,7 +85,7 @@ static const AVOption avformat_options[] = { {"use_wallclock_as_timestamps", "use wallclock as timestamps", OFFSET(use_wallclock_as_timestamps), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, D}, {"skip_initial_bytes", "set number of bytes to skip before reading header and frames", OFFSET(skip_initial_bytes), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX-1, D}, {"correct_ts_overflow", "correct single timestamp overflows", OFFSET(correct_ts_overflow), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, D}, -{"flush_packets", "enable flushing of the I/O context after each packet", OFFSET(flush_packets), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, E}, +{"flush_packets", "enable flushing of the I/O context after each packet", OFFSET(flush_packets), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, E}, {"metadata_header_padding", "set number of bytes to be written as padding in a metadata header", OFFSET(metadata_header_padding), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, E}, {"output_ts_offset", "set output timestamp offset", OFFSET(output_ts_offset), AV_OPT_TYPE_DURATION, {.i64 = 0}, -INT64_MAX, INT64_MAX, E}, {"max_interleave_delta", "maximum buffering duration for interleaving", OFFSET(max_interleave_delta), AV_OPT_TYPE_INT64, { .i64 = 10000000 }, 0, INT64_MAX, E },