From patchwork Sun Oct 29 15:10:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_Gro=C3=9Fe?= X-Patchwork-Id: 5744 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1667711jah; Sun, 29 Oct 2017 08:10:59 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SIejhzZnqZDFLEsVesxcQZ+KP2Auczv412sErTshiZ37N8d88EmjsiyuqBUqzQFogEd02i X-Received: by 10.223.156.133 with SMTP id d5mr1140374wre.29.1509289858977; Sun, 29 Oct 2017 08:10:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509289858; cv=none; d=google.com; s=arc-20160816; b=ODKLQqS3/3XORvqyQHpIi7uqCrhyOb0xVYpUC5lWvnfTBP8tHbu4zlTb+TYDt8Gp3E Zw++KI3Tcg+gzGobJTBG9BL3MKgVUm6/7TVcWd3Lj3YLeqOaWQ0yCufp7wOO15zF2M1s NSrvycKdSr4uj5zNDeztZOGGFyWCkziDkXY5ap4lYCrcifA6MR3lAVp66b5+pwgFvWaN UZKL/F8DWSUZ0qu/fiq01g+0W6S1HkB3MErSCT7FPCp18uJxr2hJMRAWFKCSTI7rEhYr 3Dk7QbWWBBSnYcNsbwV45P4a7kFN+zYPOVtFgH0wJ8Oo+17xlqhuAzYWfVaNvie1Swed PMWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=5Dfj9Q4e9CD8j91hjhIVl0nAbsvyA+Y72ELQdfktjrg=; b=IXM4zXl7Shz+Jw124NtR1h0+e34w7JZ/MKVFvcxj/4J2axVs8qK89R1X4j0gtdNhsB TkAOze+70cb5hkleJNdxq6UsjEPWWxhRe1kN7kZO+duQVwBv7gtqOkSYKuTA+XCXBGjO ZSvn7tKxVUCPYjjX3bqsph/5Cmw/PHiaVBw4lK/9MsgnPtEBkijlmCbW+AM494bgq152 X+ZDw9MlN2PfIOUY867UoA5sMGz8ECZZaummxjKlAW4apqBd+QVI7yiyNq/35YiwIHjh 5sGzP+5sRDVivqZJwPp+KQ1DkjNNnTDQQiJGw5AlO9oOjRmkykSVBnIs543BHuLOKLCU guFg== 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 e4si9165202wrc.555.2017.10.29.08.10.58; Sun, 29 Oct 2017 08:10:58 -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 3AA1A68825F; Sun, 29 Oct 2017 17:10:40 +0200 (EET) 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 CE2146805C1 for ; Sun, 29 Oct 2017 17:10:33 +0200 (EET) Received: (qmail 11354 invoked by uid 210); 29 Oct 2017 15:10:42 -0000 X-Qmail-Scanner-Diagnostics: from x4d07d30c.dyn.telefonica.de (petronios@theweblords.de@x4d07d30c.dyn.telefonica.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(77.7.211.12):. Processed in 0.045766 secs); 29 Oct 2017 15:10:42 -0000 Received: from x4d07d30c.dyn.telefonica.de (HELO montepegro.fem.tu-ilmenau.de) (petronios@theweblords.de@77.7.211.12) by james.theweblords.de with ESMTPA; 29 Oct 2017 15:10:42 -0000 From: =?UTF-8?q?Peter=20Gro=C3=9Fe?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Oct 2017 16:10:35 +0100 Message-Id: <20171029151036.16579-2-pegro@friiks.de> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029151036.16579-1-pegro@friiks.de> References: <20171029151036.16579-1-pegro@friiks.de> In-Reply-To: <20171026155840.16816-7-pegro@friiks.de> References: <20171026155840.16816-7-pegro@friiks.de> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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 , =?UTF-8?q?Peter=20Gro=C3=9Fe?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Anton Schubert Fix conformance regarding section "3.2.4. Presence of Attributes and Element" of the "Guidelines for Implementation: DASH-IF Interoperability Points V4.1" (http://dashif.org/guidelines/) Signed-off-by: Anton Schubert Signed-off-by: Peter Große --- v2: extended commit message libavformat/dashenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index c55106c11d..82381b67a9 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);