From patchwork Thu Jun 22 21:28:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 4083 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp252865vsw; Thu, 22 Jun 2017 14:28:55 -0700 (PDT) X-Received: by 10.28.105.216 with SMTP id z85mr3202962wmh.52.1498166935768; Thu, 22 Jun 2017 14:28:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498166935; cv=none; d=google.com; s=arc-20160816; b=JWQZloRfRvlOtlHoADT+7Dkh/ZgJ4oY4rPIh4QIsWu0/AoMTWHciQ6SP2j5/MlxoK2 pee0nqbElsFK2c/Xa1AXKFFuEYB6ak9E7pxF2jHl55cXOQIk4hluQJwNl2hnjJcQNpUv 0AdQMQNJ/Rp8CcQJnyZbh+tQbGL9WCWlwdCvM7RqaMonHq6kuxjlOW1CQN/3TOSLpEOj vd1U5WH6xYloGH61C46yp/aZNK+8hB3l2WsQwHwrxeVYCzaiVSDofnkz7HTIdsoc3ZUp 4yZmJ09pKg1h/ViOHjvCJqlTwbp3ieuwENyJ8YzR80JgWFx7tqywZNDn8CsYElBwgwg/ jktQ== 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=cVF9ZKop/py9FDBmO94aL3rZzgbHYIb8352juUeN6yw=; b=LTJAMgeYsqp82ZSujMB92Tzumgs1rv1RPmCi4MsW8OTf9rNCNT7wf8vIYub32M0fW5 RBvNvNcW5aMS7T1v+nNwjAoY4dhtyVJUip4/buXdXrrpi5kgvyJI/B08/xlc1wdOewq+ sDwmIonDTshDqinRNF+irz65jxLpNF1zljUwWDTFOsByiOWfko+kx0lQWkpjgDUzMH3n V13HsjnM9+pQGGdKw9rtmDsm1XPyXGFBpd9nEcVwF4XU/OmGNcKHrjf4bd53QgkWm72+ wXFNgU4G/RKAN49wjt+d3+gP2TE+K2TcqrOH4jSZmxAVKRA8bDad4eaxYxF2LKSx1E5j /Onw== 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 i67si2251897wmc.34.2017.06.22.14.28.54; Thu, 22 Jun 2017 14:28:55 -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 0D9FC68A3C4; Fri, 23 Jun 2017 00:28:52 +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 661AD68A160 for ; Fri, 23 Jun 2017 00:28:45 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id E78641032B7; Thu, 22 Jun 2017 23:28:44 +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 8blrvfLJ2fGi; Thu, 22 Jun 2017 23:28:43 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 71648100C5B; Thu, 22 Jun 2017 23:28:43 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Jun 2017 23:28:00 +0200 Message-Id: <20170622212800.26616-1-cus@passwd.hu> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170621235330.GM4727@nb4> References: <20170621235330.GM4727@nb4> Subject: [FFmpeg-devel] [PATCHv3 3/4] avformat: make flush_packets a tri-state and set it to -1 (auto) by 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" If flushing is not disabled, then mux.c will signal the end of the packets with an AVIO_DATA_MARKER_FLUSH_POINT, and aviobuf will be able to decide to flush or not based on the preferred minimum packet size set by the used protocol. Signed-off-by: Marton Balint --- doc/formats.texi | 7 ++++--- libavformat/mux.c | 19 +++++++++++++------ libavformat/options_table.h | 4 ++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/doc/formats.texi b/doc/formats.texi index c51d4086db..ddd7743548 100644 --- a/doc/formats.texi +++ b/doc/formats.texi @@ -182,9 +182,10 @@ Default is 0. Correct single timestamp overflows if set to 1. Default is 1. @item flush_packets @var{integer} (@emph{output}) -Flush the underlying I/O stream after each packet. Default 1 enables it, and -has the effect of reducing the latency; 0 disables it and may slightly -increase performance in some cases. +Flush the underlying I/O stream after each packet. Default is -1 (auto), which +means that the underlying protocol will decide, 1 enables it, and has the +effect of reducing the latency, 0 disables it and may increase IO throughput in +some cases. @item output_ts_offset @var{offset} (@emph{output}) Set the output time offset. diff --git a/libavformat/mux.c b/libavformat/mux.c index e1e49a81be..53ad46df42 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -468,6 +468,16 @@ static int init_pts(AVFormatContext *s) return 0; } +static void flush_if_needed(AVFormatContext *s) +{ + if (s->pb && s->pb->error >= 0) { + if (s->flush_packets == 1 || s->flags & AVFMT_FLAG_FLUSH_PACKETS) + avio_flush(s->pb); + else if (s->flush_packets && !(s->oformat->flags & AVFMT_NOFILE)) + avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_FLUSH_POINT); + } +} + static int write_header_internal(AVFormatContext *s) { if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb) @@ -479,8 +489,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) - avio_flush(s->pb); + flush_if_needed(s); } s->internal->header_written = 1; if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb) @@ -772,8 +781,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } if (s->pb && ret >= 0) { - if (s->flush_packets && s->flags & AVFMT_FLAG_FLUSH_PACKETS) - avio_flush(s->pb); + flush_if_needed(s); if (s->pb->error < 0) ret = s->pb->error; } @@ -932,8 +940,7 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) return ret; } ret = s->oformat->write_packet(s, NULL); - if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS) - avio_flush(s->pb); + flush_if_needed(s); if (ret >= 0 && s->pb && s->pb->error < 0) ret = s->pb->error; return ret; diff --git a/libavformat/options_table.h b/libavformat/options_table.h index 0c1915d6d4..118086df66 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_INT, {.i64 = -1}, -1, 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 },