From patchwork Fri Mar 23 05:27:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 8113 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp19766jad; Thu, 22 Mar 2018 22:27:41 -0700 (PDT) X-Google-Smtp-Source: AG47ELtcXqwKLQsG5vJEBmoguLTKrUKT3RiBUeEhsZ1REpvCVw5D4XvfBv1aoCDL/sDuhfsuzy/1 X-Received: by 10.223.226.14 with SMTP id j14mr952484wri.17.1521782861463; Thu, 22 Mar 2018 22:27:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521782861; cv=none; d=google.com; s=arc-20160816; b=Gud/nD9ST4LZwwHV7WQEBi2OjBexgs2pwRpqvmD/H6uHWXsnQkPDZ2VfoGQ9RfHHem uHZ8M/r9ENijuZSWoUO1DlnOH1JQORxDwLbgtUVbR/UkvipRu17hQPk9tTXqE66E+s2w Tf1mw667a5/jBgFzyizroVPNYSn3/75SQrsdAMZL59nKoIlX27xLKEUPqtvc6A0y0KZA 8xEcJWanfviNEEFY4T0tkWYb7PtKsippwRoAJh2Pe0z2Sp8FFabKHjX3xrLUhqJegyf0 zquQ7z4GBzHupM9//C8ZJsuOdszKbwv0OeYdAzAxeZum0gpo075RkW7HFysHRizf7wGw n9JA== 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=rQnRIuNnUnj2yT7M/us/NXJXdwEHhmlRFWMdC4+TNmc=; b=nNsq+tiuXHWdmdQmdvjk2F0v0mznqoClsVsS73jvd906Mng3R0Y//wjcpcQchEeWdc YAUFRxIynmADUFOwVbkWXyp0uLujWnYSDTm9dtPHP0bkD8fQP4woSNsbL2/ckdvq7H52 gZlEGXx6XxV5Bb5AwUmDbgetVP9A0T9/hMGL8hJNL3hI3J3B9VN/eZ12XV+9TNK2zpGo ZYBKdYn8lXuK4GldEL2Mb5IvTeeSBLNEJwh+vwSef4g1UyLQ0+gDgd3x8VxAjWRDg+V+ ay9ufX+ECG8k9M1mMHwPKsSwpHCpnZncYxsON2PPrjDiFlGoZ0e6cJqHSVl/LgQKEPmV TTSA== 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=JhCOqNCH; 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 36si6260022wro.346.2018.03.22.22.27.40; Thu, 22 Mar 2018 22:27:41 -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=JhCOqNCH; 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 28D50689925; Fri, 23 Mar 2018 07:27:23 +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 95401680224 for ; Fri, 23 Mar 2018 07:27:16 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1521783757; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=/F51XYHaUDueL93Fve7LPPAISMSwdmTiiBIlyK0ghHk=; b=JhCOqNCH 8K0tB3ASz2WWqdl8cNEjbcu1VnW78w6X/hV7SMSxG/+p0lDJmMSW++ub5UW0+J/joklFgerxHd9K6 smXDtDfQOEX5Wa9oGzyy6Qaj40J+IkhBMvlUZRUA/54cYtjJHVpS5vVT12sWy9WeXXVYtxs1XYcD9 QYyYbg5VhCaWv+hATJk51WTPEsFEfOBgzfRaO6zUHynYAafvCK0LWyorTSVYBL97vj/rcGAurUEbl gYgEzoAEUhnUQDMDhSOROu5PRHxLmRkatn3IH5jSsMTxjtRFaX32d9bUQQftSW2oNuK63aVVEXfwF 3FqMUu7x1OzRFAWhSmS0OczKGg==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Mar 2018 10:57:25 +0530 Message-Id: <1521782845-27068-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 X-Smtpcorp-Track: 1-zFEf4bajV335.tNUj_SjWs Feedback-ID: 337386m:337386asVRLGB:337386ssDJRPkwhX:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH 08/11] avformat/dashenc: addition of bitrate 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 0ba9f55..294999a 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -824,20 +824,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->bitrate_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->bitrate_overhead; if ((st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && max_audio_bitrate) { agroup = (char *)audio_group; stream_bitrate += max_audio_bitrate;