From patchwork Wed Apr 11 07:00:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 8389 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp368041jad; Wed, 11 Apr 2018 00:00:28 -0700 (PDT) X-Google-Smtp-Source: AIpwx49aQlQkC9MmCQ2jVkV2qTcO9VTSndsRNOXpegYMV3bBxqzZ4U2p4govvEb0JtWbsraD2Jd6 X-Received: by 10.223.196.8 with SMTP id v8mr791296wrf.164.1523430028760; Wed, 11 Apr 2018 00:00:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523430028; cv=none; d=google.com; s=arc-20160816; b=TsmywcD5MG/x8j7bX/iIvcZnnBC8h1wPZVEi3Yhldm3c3YYG03NRaQTx9TkS10Vy8p O/HnDTMeG/1q/2vdkih2CBcHNgWIdMSakkJRrANvoP7dKCPQVC6Uk3sjCTW7G7ZpnA26 jQPBgmGflVV1rymV6hgw8qUqoRjD77a5jYVAM4yR4a3LgXXderfMiwVlc42P6SLZt28s V+kc5y/npV+q/VbsHKmAXVbbWRiOkOrMJ719e6zGn8Z4o2m3hDemAmAfWxmMo9+XrCnh 4hzLNKyRyhreIPe5VgJDQYx3vebz235RLkLDiQkWAtTPhIb17qq5maDJaSjbyAuG3Kkw nASw== 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:feedback-id:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=WVSionY4oTCdQ3LhVEZQXF9cELqS96x/WMeOMYp3SrE=; b=zZcF2SBbx5B7FgipSmzLKGe8J7YqwrWA6M/Hedk7GwUdToYi+t08XW3DBWSRmEVC/l RL7K0SDh0gQ/04G15t4CvHFlf2gIhK0wzQjew9m5M7wiM5vh1MLVVEqhvh/cmmIBnb74 AymN0OZOnikq9+F4k837xmrBZ2L7WqD+tbn+RTb/waheE+CnxgqpuH0D9EpPxHaapoBt v3uYlRpewJCY9IULGupL9vh9e1jGfYwCIbtkELBrPKwwrZPtLG+M0JVN7qLkeqgqMvd/ TBRdmcWcFGDNpJGsvMgXuuWrnTwANRwTXSUObyBQVSJAhbx58yOcYlcNttMc9qKXdABO cZqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=dAq4/cwB; 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=NONE dis=NONE) header.from=akamai.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r74si487041wme.180.2018.04.11.00.00.27; Wed, 11 Apr 2018 00:00:28 -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; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=dAq4/cwB; 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=NONE dis=NONE) header.from=akamai.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8029E68A1EA; Wed, 11 Apr 2018 10:00:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a1i318.smtp2go.com (a1i318.smtp2go.com [43.228.185.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC475689F16 for ; Wed, 11 Apr 2018 09:59:55 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1523430925; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=KQ3utZKxPSvsbFtzFquD9nzAVH7KLHNXHsa0MhNWJWM=; b=dAq4/cwB bNlDnQkEHMy9PystV1xcvQJCvSsqzrUEYZGmAWTJx0ReHAzMjMxOPbQEGSI9tlOyQ8xAOlvMXkS/3 g/9CaTry0IfNUWC0xzuw3heYEdobnKUJuQ2c6CbzrfasgQKdKwuGKArM/PunBxF6EN+okdWTAXiPd DrP2aQ9BUy7cRtFQuMflg9i8JLw3AvLLqgHF3bOjeiMbwkOyhjgul+O6FIXxDknH9IkMlwaisAyY6 pwBWY+xG8SLWu91UmezHgbTCbPdWACcTuNGAfHGedYcbBPBhQyjGIQtf2GFkPfez1euQUSOXEDcsc 6X/ELQoXv5zSZPtPRB0iuzPAsg==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Apr 2018 12:30:06 +0530 Message-Id: <1523430006-16738-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1522830988-6811-1-git-send-email-vdixit@akamai.com> References: <1522830988-6811-1-git-send-email-vdixit@akamai.com> X-Smtpcorp-Track: 1f69MqRyIK3tUd.zfJBrrt-1 Feedback-ID: 337386m:337386asVRLGB:337386sKuz7gygA2:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH v3 01/11] avformat/dashenc: replacing 'min_seg_duration' with 'seg_duration' 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: Vishwanath Dixit MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Vishwanath Dixit --- doc/muxers.texi | 4 +++- libavformat/dashenc.c | 23 ++++++++++++++++++----- libavformat/version.h | 3 +++ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index cb75c26..8dbfede 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -226,7 +226,9 @@ ffmpeg -re -i -map 0 -map 0 -c:a libfdk_aac -c:v libx264 @table @option @item -min_seg_duration @var{microseconds} -Set the segment length in microseconds. +This is a deprecated option to set the segment length in microseconds, use @var{seg_duration} instead. +@item -seg_duration @var{duration} +Set the segment length in seconds (fractional value can be set). @item -window_size @var{size} Set the maximum number of segments kept in the manifest. @item -extra_window_size @var{size} diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index bdf8c8d..7169e11 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -94,7 +94,10 @@ typedef struct DASHContext { int nb_as; int window_size; int extra_window_size; +#if FF_API_DASH_MIN_SEG_DURATION int min_seg_duration; +#endif + int64_t seg_duration; int remove_at_exit; int use_template; int use_timeline; @@ -871,6 +874,13 @@ static int dash_init(AVFormatContext *s) if (c->single_file) c->use_template = 0; +#if FF_API_DASH_MIN_SEG_DURATION + if (c->min_seg_duration != 5000000) { + av_log(s, AV_LOG_WARNING, "The min_seg_duration option is deprecated and will be removed. Please use the -seg_duration\n"); + c->seg_duration = c->min_seg_duration; + } +#endif + av_strlcpy(c->dirname, s->url, sizeof(c->dirname)); ptr = strrchr(c->dirname, '/'); if (ptr) { @@ -974,7 +984,7 @@ static int dash_init(AVFormatContext *s) else av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0); } else { - av_dict_set_int(&opts, "cluster_time_limit", c->min_seg_duration / 1000, 0); + av_dict_set_int(&opts, "cluster_time_limit", c->seg_duration / 1000, 0); av_dict_set_int(&opts, "cluster_size_limit", 5 * 1024 * 1024, 0); // set a large cluster size limit av_dict_set_int(&opts, "dash", 1, 0); av_dict_set_int(&opts, "dash_track_number", i + 1, 0); @@ -1020,8 +1030,8 @@ static int dash_init(AVFormatContext *s) os->segment_index = 1; } - if (!c->has_video && c->min_seg_duration <= 0) { - av_log(s, AV_LOG_WARNING, "no video stream and no min seg duration set\n"); + if (!c->has_video && c->seg_duration <= 0) { + av_log(s, AV_LOG_WARNING, "no video stream and no seg duration set\n"); return AVERROR(EINVAL); } return 0; @@ -1287,7 +1297,7 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt) if ((!c->has_video || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && pkt->flags & AV_PKT_FLAG_KEY && os->packets_written && av_compare_ts(pkt->pts - os->start_pts, st->time_base, - c->min_seg_duration, AV_TIME_BASE_Q) >= 0) { + c->seg_duration, AV_TIME_BASE_Q) >= 0) { int64_t prev_duration = c->last_duration; c->last_duration = av_rescale_q(pkt->pts - os->start_pts, @@ -1427,7 +1437,10 @@ static const AVOption options[] = { { "adaptation_sets", "Adaptation sets. Syntax: id=0,streams=0,1,2 id=1,streams=3,4 and so on", OFFSET(adaptation_sets), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, { "window_size", "number of segments kept in the manifest", OFFSET(window_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, E }, { "extra_window_size", "number of segments kept outside of the manifest before removing from disk", OFFSET(extra_window_size), AV_OPT_TYPE_INT, { .i64 = 5 }, 0, INT_MAX, E }, - { "min_seg_duration", "minimum segment duration (in microseconds)", OFFSET(min_seg_duration), AV_OPT_TYPE_INT, { .i64 = 5000000 }, 0, INT_MAX, E }, +#if FF_API_DASH_MIN_SEG_DURATION + { "min_seg_duration", "minimum segment duration (in microseconds) (will be deprecated)", OFFSET(min_seg_duration), AV_OPT_TYPE_INT, { .i64 = 5000000 }, 0, INT_MAX, E }, +#endif + { "seg_duration", "segment duration (in seconds, fractional value can be set)", OFFSET(seg_duration), AV_OPT_TYPE_DURATION, { .i64 = 5000000 }, 0, INT_MAX, E }, { "remove_at_exit", "remove all segments when finished", OFFSET(remove_at_exit), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E }, { "use_template", "Use SegmentTemplate instead of SegmentList", OFFSET(use_template), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, E }, { "use_timeline", "Use SegmentTimeline in SegmentTemplate", OFFSET(use_timeline), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, E }, diff --git a/libavformat/version.h b/libavformat/version.h index a96e13b..d02e17e 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -94,6 +94,9 @@ #ifndef FF_API_NEXT #define FF_API_NEXT (LIBAVFORMAT_VERSION_MAJOR < 59) #endif +#ifndef FF_API_DASH_MIN_SEG_DURATION +#define FF_API_DASH_MIN_SEG_DURATION (LIBAVFORMAT_VERSION_MAJOR < 59) +#endif #ifndef FF_API_R_FRAME_RATE