From patchwork Fri Mar 23 05:20:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 8109 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp15760jad; Thu, 22 Mar 2018 22:21:21 -0700 (PDT) X-Google-Smtp-Source: AG47ELsePuUIs3nMH9lZ4pIw/phm5ODKCVtQYzFLajSGGhcDDBHYJ7J6h03VbatXxPdHhdHeKqma X-Received: by 10.28.45.209 with SMTP id t200mr7429401wmt.90.1521782480931; Thu, 22 Mar 2018 22:21:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521782480; cv=none; d=google.com; s=arc-20160816; b=sQitNGsUAd8uJ9dsXmm9Tcir4ezix/S7nA+ufuaGA8VP8V9KG2SCl1gZpXOPR7Mo6R GNIqs64Gmnuc4dWo0FetVMq8iXFuyi+d9m3u40LttWVcwo2B1UniqJEFjNKehSufEzBO rg2t6QggpmDv3QkodyH97dNwfV81uZ6ocOAEVIJZAGhqy+GL7iY50Y7vzOWWsWYi6BCQ Lw1hzQnsRUmN9Z+8beRZFgaFpzkwGwL9/E1nFFHK9rwFBsA4WHgAx9/+WR3RuMkWq+3A RlPbzPjwZMnJPMS78uNLAN5ht/WRNmQMjVk8leWwGQYZ0nzrYZBOYNBEzR8C666zhE3p L5fw== 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:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=sx/oNf7MP7ThKNm2POl9+bile8EFqLKe1DvyL3CMtZI=; b=TQjLExIV4Ers39nr1MgQbHEvMp+UjXqsbei1seUa1Z18vUGzNOjUqFzAAUGZmCS66H Ad7uMvjJoqyxGMge2fIC8FN0lc+rjUOHQi2ykruibNQTkhOMR064mjYGe1Y0agG7eCiX oZ23cCmjiGuuqZgbEdcICXeuOaz6UtS3nPK1X9rqJ25f7TGHxSMFOFfzeXVZjYVCjm20 zQAK5UTPPTG0gi9GVvZA/6vkU1G4kO+Qki2d6+huRl62YxsH3rTHSkgRmPsn3j27izQV tvqTroA4XC42XjZZdc2F++LYOkBDlXnNS/+m3M/QcB6Kaeapo0i9t9imvXxjncanln07 W/PQ== 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=wYUp96+y; 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 s17si5749850wrs.321.2018.03.22.22.21.19; Thu, 22 Mar 2018 22:21:20 -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=wYUp96+y; 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 972B3689253; Fri, 23 Mar 2018 07:21:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a2i831.smtp2go.com (a2i831.smtp2go.com [103.47.207.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9BE76803BD for ; Fri, 23 Mar 2018 07:20:54 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1521783375; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=Md9W0j+txeR8aN7aDCOayJOkk7aXuS82uAO2ZCJeU18=; b=wYUp96+y VPJUV/cFz4FiAd3QC2Ye0XfztIEY8nRa8pnZoT0oPSteYEog/vLKHc9tTuMb+yaKOk8r05J6Y9sWV ZMnkZXryy3RTOoZknytMbPmTjxBpXqEnSXwYKjOyCirrA5MDxTzhMVgEkMAXPTBg0d2ugMljVx2zR Nh3qcQssPZo/N/2S92m1/9VpkLayik9USYBU45niJBtthbiN6SdluHA3gj3RHv9yRK9Qsw4rzPF2H S0wX1cGFbX058Lf8hwF/c3gGpa0KFl51cLSgHZ8UU7fUxddQGMNQOFRjR6s2T0pnh+L7tST/dWN9y WqzsNI1owPOGZKTAsxik0o2+ng==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Mar 2018 10:50:58 +0530 Message-Id: <1521782458-21205-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 X-Smtpcorp-Track: 1-zF8TNmF8Ki3X.tu7jUZf0g Feedback-ID: 337386m:337386asVRLGB:337386sm_cnnk1NX:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH 01/11] avformat/dashenc: renamed 'min_seg_duration' to '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 | 2 +- libavformat/dashenc.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index cb75c26..65eec92 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -225,7 +225,7 @@ ffmpeg -re -i -map 0 -map 0 -c:a libfdk_aac -c:v libx264 @end example @table @option -@item -min_seg_duration @var{microseconds} +@item -seg_duration @var{microseconds} Set the segment length in microseconds. @item -window_size @var{size} Set the maximum number of segments kept in the manifest. diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index bdf8c8d..bdd5b56 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -94,7 +94,7 @@ typedef struct DASHContext { int nb_as; int window_size; int extra_window_size; - int min_seg_duration; + int seg_duration; int remove_at_exit; int use_template; int use_timeline; @@ -974,7 +974,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,7 +1020,7 @@ static int dash_init(AVFormatContext *s) os->segment_index = 1; } - if (!c->has_video && c->min_seg_duration <= 0) { + if (!c->has_video && c->seg_duration <= 0) { av_log(s, AV_LOG_WARNING, "no video stream and no min seg duration set\n"); return AVERROR(EINVAL); } @@ -1287,7 +1287,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 +1427,7 @@ 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 }, + { "seg_duration", "minimum segment duration (in microseconds)", OFFSET(seg_duration), AV_OPT_TYPE_INT, { .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 },