From patchwork Wed Apr 4 08:37:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 8318 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp4619585jad; Wed, 4 Apr 2018 01:38:13 -0700 (PDT) X-Google-Smtp-Source: AIpwx49WMPyaZgQI1zklnaG8oXt6tJ8K+jFlJcwARnr3rEMs8mMNzqfAzFvFpLc/b5rNtyPJoMpA X-Received: by 10.28.217.67 with SMTP id q64mr6323243wmg.12.1522831093591; Wed, 04 Apr 2018 01:38:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522831093; cv=none; d=google.com; s=arc-20160816; b=EWdBvbq9erhwbkOlrPjkg6SVLL96/+6CILTdrZWA2UGJVJ3K06pCqULo0tD8rJdxwY dFZOZ40Sr/yiUV7/OvKuA2nPigN7nT8TMu730XcaPzZ+vKVkat41KlSI092rUcRCQn42 lhpjywzZvCLQrqVtwgUX3I5FWRh1RdcKOoBQjeSQK/0vOTkGZYL4kK3pAyLunVfbYC9X bR0kwnFwklt0ATC+rXy5t39cSidU/Q794Rmuo7hBJmyaz5LKDmRUytLbIq9IEpfFZoV3 q65Thq+BVzfGKllCLz4gqt0zy3nYtOZAq9DKcyAp7Vy40WcXvt4LwXiNf1Ed7PknawWo wmFg== 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=DT2HHXOfrrhmp4MTP3ows4ZCXeiu48+NY/U6gG0yu1c=; b=z327yYLyNkdx1CjKHWtCvh8LnThQ7v2alGIkH2o+sjnq+okBEUB0tTOL3Jmjww5KQ4 KHqUKcR34SPk+UcbpUDZSd/UN6yc2qQKZDBpEo9migdO46ch+S94VtyenJpNbHtmS7L2 mV4Zp98AgM5UOGLIQopTx+DtEAFr+N5qB9BL64iF+MT27ZoCB+ebGyITYRYlZUna1Ubq HbLB/PCE4fbXmV+wbWF9WcDS7Qvlzfbi6RqjSLyR5e6lqANTQY5sCczvL5ZK8+dsreXc WkmYdYjfghSgMzAeLd/NBGRmhnAae1p+4i5L3ILmhLMDScEY48P4ythp9vdYKE9zskto zJEQ== 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=Td9T/kFM; 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 t65si1886779wmg.101.2018.04.04.01.38.13; Wed, 04 Apr 2018 01:38:13 -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=Td9T/kFM; 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 94470689C5B; Wed, 4 Apr 2018 11:37:48 +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 31168689C27 for ; Wed, 4 Apr 2018 11:37:42 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1522831988; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=FXK4L6eZHohBMNF8spbFkNkPwMeojpIyaU9rgNRnHYg=; b=Td9T/kFM 5l9wZYH6Q6aWW4JLJGEhaNNTwjyYm71k6sacUhbxBjUInQibOdbJiupXlSf3GHMl/UUFfuTvGlIKp MmD4eP2tCrTkPQc2gQUB+XBqF/TFOqMMJm3RR8BkWLUYvcpw7ofQyhq5Zbuq9y+lQodkDg6XMnVwL aEhAxrj1gTZavLXzd/WoOEzcYSp06tYvaJenJPKf0kDwfOkWAILmGXJ60frQ/mLXfCLpAU0+ZRe0K eqD54i4Omo4HIpYmygCiHHXYoKqQsI+iGb1FxzLrQylPN2rQ6zrpSCVO0YklOK1llrE0B/+CZDXSD 9bmVcoywGHMo8YXISe9WJl9ZfQ==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Apr 2018 14:07:56 +0530 Message-Id: <1522831076-7426-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1521782845-27068-1-git-send-email-vdixit@akamai.com> References: <1521782845-27068-1-git-send-email-vdixit@akamai.com> X-Smtpcorp-Track: 1f3dvPNmF9vQ0Q.xu7XkLM4j Feedback-ID: 337386m:337386asVRLGB:337386sGcE5SzqdJ:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH v2 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 0fff91f..72431b7 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -825,20 +825,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;