From patchwork Wed Apr 11 07:02:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 8394 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp369777jad; Wed, 11 Apr 2018 00:02:23 -0700 (PDT) X-Google-Smtp-Source: AIpwx48YAMpIxjxKy1PgVnbtnJ5w0AKDJkZfVS3KjxoaUzqfUV6sy+AdeZ4uJh5D9qyZvD74n/3P X-Received: by 10.28.147.8 with SMTP id v8mr1795687wmd.13.1523430143706; Wed, 11 Apr 2018 00:02:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523430143; cv=none; d=google.com; s=arc-20160816; b=mxq9TiiGedGcrzby3+EZpq7hSbBicRLVrChOnBqVtBeml93GHbJtJLD3KmPojOxxO+ LEpX3z8YSZC5TH5QdeZD4VXfVyHyqlE8mqhPTxkruWa4cxfrjugB5w68rpPh1drSP1g2 DhNF1F/OYzOPbiDlQUcB7gOoztB9Tn2FGR1IXg6iJEqfzUp4iYvUJd3ROqudUBR+Ex9f i1vnbO4p8/oJ3nGhgL5pAZQMm0uR5qfczBHe2ZkTIuihkeWXoxdsTiLFHJ4JXZff0ZZw dmyxqYiL/5QSFisxAjvKoG+GYsKqx0sR5RhcpaqDkOUn9YcGfFucm+uOzVXrQFYorBQG 9PSw== 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=pHWwd2RCKYOuBhd5ZG06H9ydlX+cvRB41jdaFzMlVyI=; b=kuMsGlo/suvgFP9TzarhHR7SAP2k7MWUXb62Agyka6NDZrN0E1DJsFU9ERESNQJ/U/ 6uk0WOXA7d6IvZYckIl64UEZff33r7Qv8zCwu2Vn7ZotVt7f1HnD6opAsvzTsTRB0aLD wsP5ai//FuOjdora5PQdSKLL96tBYzebAnAJgCza2qMMRDM9M+GkBMBbsKvcA3si/hVA y/YPFY+652UIiM9Al+TkZhsYnViaijC55GT8BmxXBhn7jUVuh7LTqINHMBthMFQjXVm5 fsOOa1M7yFy7WCcC52HVXC4Jm2/K4nq2pP+mLbcON0kL2YytmqT53QwwlSeYCtWRGK7p bRgw== 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=oaKrajiP; 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 u102si381501wrb.287.2018.04.11.00.02.23; Wed, 11 Apr 2018 00:02:23 -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=oaKrajiP; 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 0EFF668A267; Wed, 11 Apr 2018 10:01:47 +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 303D168A262 for ; Wed, 11 Apr 2018 10:01:45 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1523431029; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=9PAS31RA7JEPRNitfmZLWAmOw/v1IjW/i4/FMaoKLh0=; b=oaKrajiP CpRCgSxROHqCS/1piyxVykYuX4RmcsBmKj/mTr0THZu1gIv0Tc9QUisE9sqWTz0IZKpYJPQBIKl6s mgKEQQThZbwZBQDwX5v8foI+XOwn5eiKOPEI2598AnDxJob4i2XaAljL6jPwFvZpdvfqbjeS36DTt nNz7pWMS9+FxSURgklc00DbfD1Ae2EQHz9Xy6/vVPQdwTV2yWVchDNW98x4FMcp+rpDV+7aevBJoc P31sMYDSU3CO6OdLPuEtAhsP9P6H/VdFN3eKVT6nUaI4j+2eja7sCXMFCfHMAcv605iXkcFVlTamW ZDtg8I9J2W+XtAbFeOuE+oRWMA==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Apr 2018 12:32:03 +0530 Message-Id: <1523430123-17407-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1522831076-7426-1-git-send-email-vdixit@akamai.com> References: <1522831076-7426-1-git-send-email-vdixit@akamai.com> X-Smtpcorp-Track: 1f69_-4ba9yI1u.zfLvNs9oU Feedback-ID: 337386m:337386asVRLGB:337386s0MzikoAQM:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH v3 08/11] avformat/dashenc: addition of muxer overhead in master playlist's bandwidth 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 --- libavformat/dashenc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 9c29c05..1d34bb9 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -827,20 +827,23 @@ static int write_manifest(AVFormatContext *s, int final) for (i = 0; i < s->nb_streams; i++) { char playlist_file[64]; AVStream *st = s->streams[i]; + OutputStream *os = &c->streams[i]; if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) continue; get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i); ff_hls_write_audio_rendition(out, (char *)audio_group, playlist_file, i, is_default); - max_audio_bitrate = FFMAX(st->codecpar->bit_rate, max_audio_bitrate); + max_audio_bitrate = FFMAX(st->codecpar->bit_rate + + os->muxer_overhead, max_audio_bitrate); is_default = 0; } for (i = 0; i < s->nb_streams; i++) { char playlist_file[64]; AVStream *st = s->streams[i]; + OutputStream *os = &c->streams[i]; char *agroup = NULL; - int stream_bitrate = st->codecpar->bit_rate; + int stream_bitrate = st->codecpar->bit_rate + os->muxer_overhead; if ((st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && max_audio_bitrate) { agroup = (char *)audio_group; stream_bitrate += max_audio_bitrate;