From patchwork Thu Oct 26 15:58:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Peter_Gro=C3=9Fe?= X-Patchwork-Id: 5697 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp976447jah; Thu, 26 Oct 2017 09:00:00 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SMdGHntVqA9e2SRBz49AMEy020yvANFZ+Xcz+w6nCNNgPQy54yqE2Z5R7+wos6731K4+7i X-Received: by 10.28.183.8 with SMTP id h8mr1858817wmf.2.1509033600247; Thu, 26 Oct 2017 09:00:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509033600; cv=none; d=google.com; s=arc-20160816; b=pzcUS8uoKZAm1KzYWKi5BN9hp5UsCFieIHI3vI6AUD3XaA5U2C3Wc8alpQ9g7zk/fT 3UlinLEISUlADheFF/xLrq9J6QHoSgkT75oVeeFFWEDMwalb5QP9t2mY52RXRPuwh5Ti W4LdiDnDsp6/EwzYoz+wN0BTrmWO027QZDNxc73FYlGmYmskeL66Gft5Z8eIey1rMxUn KmK2IkY+98aR7vDTZMiTa0WD+lXEsOoH7HAL5URRoK3E3JJH7Qqmh756ZKrl8hZES56+ aGJAMYnGvQuXZwlVnFTtuVy0exULSmPV7gAkicPVzBRzGheYHa4vGy8J4nPA32R9txYe vHwA== 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:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=sPsh5+jzBJzRqTQCIxrOG+l7vbwhd8g0s86pR/ouTAw=; b=PEfFe8hJMXIy41NMOnrRdPTO/Tmxwhlisjh2MYvDXUo1k/ajldvbSxtVkT86dzhp0q 5njQqJPuZWzwyTv+3TJtYRCM6RkG7zXwKh7mDFq5KmP29gAUuzRIlhIlPSx0EtDWDF0m Oi7MyyR1mRKaF4kuT2UtTTNXb5sFrfZChp2vlCA9ZGS7UBNn6jbimbTH1Km5TFoFgNHY 3ckhmF95Y2kCgJYKyxXrpC++vhUbOtaZXw5cjfUcriN2BWC8fFxO2IWwYjz18S1C1lNb 2WKIx6pjNRt9Z8PLk27lvgd+HW010ZoUXFO6rY1Xq4bidP/su8TBhsPUn6xSCV46o6TS HjRQ== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g51si4127560wrg.140.2017.10.26.08.59.59; Thu, 26 Oct 2017 09:00:00 -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; 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 0BB6368A62D; Thu, 26 Oct 2017 18:58:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from james.theweblords.de (james.theweblords.de [217.11.55.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 675F068A5E8 for ; Thu, 26 Oct 2017 18:58:50 +0300 (EEST) Received: (qmail 24023 invoked by uid 210); 26 Oct 2017 15:58:58 -0000 X-Qmail-Scanner-Diagnostics: from wl-r3-231.rz.tu-ilmenau.de (petronios@theweblords.de@wl-r3-231.rz.tu-ilmenau.de) by james (envelope-from , uid 201) with qmail-scanner-2.10st (mhr: 1.0. spamassassin: 3.4.1. perlscan: 2.10st. Clear:RC:1(141.24.16.231):. Processed in 0.044817 secs); 26 Oct 2017 15:58:58 -0000 Received: from wl-r3-231.rz.tu-ilmenau.de (HELO montepegro.fem.tu-ilmenau.de) (petronios@theweblords.de@141.24.16.231) by james.theweblords.de with ESMTPA; 26 Oct 2017 15:58:58 -0000 From: =?UTF-8?q?Peter=20Gro=C3=9Fe?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Oct 2017 17:58:39 +0200 Message-Id: <20171026155840.16816-7-pegro@friiks.de> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171026155840.16816-1-pegro@friiks.de> References: <20171026155840.16816-1-pegro@friiks.de> Subject: [FFmpeg-devel] [PATCH 6/7] dashenc: Don't output frameRates at both AS and Representation-level. Only output maxFrameRate at AS-level. 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: Anton Schubert MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Anton Schubert Signed-off-by: Anton Schubert --- libavformat/dashenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index f3a12462be..b12a37a2e5 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -393,8 +393,8 @@ static int write_adaptation_set(AVFormatContext *s, AVIOContext *out, int as_ind avio_printf(out, "\t\tid, as->media_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio"); - if (as->media_type == AVMEDIA_TYPE_VIDEO && as->max_frame_rate.num && !as->ambiguous_frame_rate) - avio_printf(out, " %s=\"%d/%d\"", (av_cmp_q(as->min_frame_rate, as->max_frame_rate) < 0) ? "maxFrameRate" : "frameRate", as->max_frame_rate.num, as->max_frame_rate.den); + if (as->media_type == AVMEDIA_TYPE_VIDEO && as->max_frame_rate.num && !as->ambiguous_frame_rate && av_cmp_q(as->min_frame_rate, as->max_frame_rate) < 0) + avio_printf(out, " maxFrameRate=\"%d/%d\"", as->max_frame_rate.num, as->max_frame_rate.den); lang = av_dict_get(as->metadata, "language", NULL, 0); if (lang) avio_printf(out, " lang=\"%s\"", lang->value);