From patchwork Thu Feb 9 16:05:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: s-ol X-Patchwork-Id: 2464 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp59102vsb; Thu, 9 Feb 2017 08:14:06 -0800 (PST) X-Received: by 10.28.0.73 with SMTP id 70mr21873940wma.109.1486656846788; Thu, 09 Feb 2017 08:14:06 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 1si13399198wre.62.2017.02.09.08.14.05; Thu, 09 Feb 2017 08:14:06 -0800 (PST) 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=@rise-tech.20150623.gappssmtp.com; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A06BB689D58; Thu, 9 Feb 2017 18:13:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E008D68096F for ; Thu, 9 Feb 2017 18:13:53 +0200 (EET) Received: by mail-wm0-f48.google.com with SMTP id v186so85933303wmd.0 for ; Thu, 09 Feb 2017 08:13:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rise-tech.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=a11a/KEFMOWdkezbuQi2byBy7IWQhxIi1JVYK/R3XE0=; b=iIKKM9MsudTdhT1fi7IgeHCopJ+9eMX2xwfEp/6Y/tLno5Y1X4tPVv25OdMzSkje9t TOiy8vITO1B0CT87AD2lw8FWwr9HPuvsBMvpq3/rE3FoGvue3f3OrebX1YDUwIz6EHHc 6l/06D1o/YwwblfEaO7MWE6kPTPIouNvlcC8LqT1kE4gIMwQfOTD6vY8gMmdYD1Pwo11 w+LlyLYwuoOzqdkiBoDtGZ3EboQ8PhWl/1vCg95E/uoHOkjMH36ClTozebc7NsHv2rfR Rq9EuwsbtGeo9j5zTUiEpG1uTbrzRUsscikwRuDcKS+QDMm9mefPIEINgvQIfo99MCxO H8Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=a11a/KEFMOWdkezbuQi2byBy7IWQhxIi1JVYK/R3XE0=; b=mhz119pZ4al/V/BPRgGp13eChGmM0XMRvO6CuxX92XK2WqTD0QcGr0Ld1NxxI63BX/ O9BhhwdJAAe8swGRXjI6VZcgWP3YdWRMJYQxAW3FXmU8PNZKd7rCos+e8oJNGeXoBACb zmdMKwEEsIxGmuH9pVNktY1QO7NbBwS3H8OLlpvff+yaa8gvfj+JtCtAeVLhbZL3Dgte /YyrFtsV+agc8ttjhfUcxWzY1d33M2ZNHMGbnAf1frqxP7pSE3+6TwV0T0lTEcaVyLbE kiTun48ZfIfg1wusPv7MeNcmh3zeObjlfYIK+rMpnSYySlcajSa0gInacQicvEIdiadf P1eg== X-Gm-Message-State: AMke39mnG9F1k0+/S7KLaNPa+h+kALuCUszOc8zPM+vWSdrM4fFwRbq6+mNoDbdJOUY8Ew== X-Received: by 10.28.20.144 with SMTP id 138mr21772104wmu.41.1486656351358; Thu, 09 Feb 2017 08:05:51 -0800 (PST) Received: from angie.fritz.box.fritz.box (static-212-117-93-126.netcologne.de. [212.117.93.126]) by smtp.googlemail.com with ESMTPSA id v128sm9530638wmv.2.2017.02.09.08.05.50 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 09 Feb 2017 08:05:50 -0800 (PST) From: s-ol To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Feb 2017 17:05:46 +0100 Message-Id: <20170209160547.71865-1-sol.bekic@rise.tech> X-Mailer: git-send-email 2.9.3 (Apple Git-75) Subject: [FFmpeg-devel] [PATCH 1/2] dashenc: properly determine 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: s-ol MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" based on ligverds patch from https://ffmpeg.org/pipermail/ffmpeg-devel/2016-September/199183.html --- libavformat/dashenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 534fa75..18c39c5 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -498,17 +498,15 @@ static int write_manifest(AVFormatContext *s, int final) OutputStream *os = &c->streams[0]; int start_index = FFMAX(os->nb_segments - c->window_size, 0); int64_t start_time = av_rescale_q(os->segments[start_index]->time, s->streams[0]->time_base, AV_TIME_BASE_Q); - avio_printf(out, "\t\n"); } else { - avio_printf(out, "\t\n"); + avio_printf(out, "\t\n",final?"":" id=\"0\""); } if (c->has_video) { avio_printf(out, "\t\tmax_frame_rate.num && !c->ambiguous_frame_rate) - avio_printf(out, " %s=\"%d/%d\"", (av_cmp_q(c->min_frame_rate, c->max_frame_rate) < 0) ? "maxFrameRate" : "frameRate", c->max_frame_rate.num, c->max_frame_rate.den); avio_printf(out, ">\n"); for (i = 0; i < s->nb_streams; i++) { @@ -594,11 +592,13 @@ static int dash_init(AVFormatContext *s) AVDictionary *opts = NULL; char filename[1024]; - os->bit_rate = s->streams[i]->codecpar->bit_rate; + os->bit_rate = s->streams[i]->codecpar->bit_rate ? s->streams[i]->codecpar->bit_rate : s->bit_rate; if (os->bit_rate) { snprintf(os->bandwidth_str, sizeof(os->bandwidth_str), " bandwidth=\"%d\"", os->bit_rate); } else { + snprintf(os->bandwidth_str, sizeof(os->bandwidth_str), + " bandwidth=\"%d\"", 0); int level = s->strict_std_compliance >= FF_COMPLIANCE_STRICT ? AV_LOG_ERROR : AV_LOG_WARNING; av_log(s, level, "No bit rate set for stream %d\n", i);