From patchwork Sat Apr 28 17:24:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 8686 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1891300jad; Sat, 28 Apr 2018 10:24:15 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrVfuDcMk7njZroh0q2liE13x3GRdu2QzsbW9l3Lg0kY9MFJmfZm430bHw+XOGEidgFpZWp X-Received: by 10.28.109.144 with SMTP id b16mr3830543wmi.138.1524936255704; Sat, 28 Apr 2018 10:24:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524936255; cv=none; d=google.com; s=arc-20160816; b=rZ2vzFO0Jo8zVjmXRYdWx6DDI9g08DwOASloLcSlO02120YLayAdmFn4vPFVf3CNYa B1Ex8eLB5zvsoHOt5UHTf3Jh+6cyvz+Mx8PufAK1eoOSoQABz74ZQC1rfNVvO2jYbH7I cjDxrIbRiVYdN9KfB9VlC6XyW+ViuuJbWkSRofwiHmuC6VPmedhuRPn0RWjJE9gyUGqm cME0f5vVbgbaUtJopK8nYliNL2sT9WZaWy/M4M2inkwEK6RsCOkl986EdjK3clh/UXyB W7oLaR5cwXVGLx1IsSlz2tuloyJdRUm2prUsdP0jtdgthYY6IYIx9ei68DxIil4Ea45u QemQ== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=qLK2HhynYjhWDVgv/aE3xjrmpdh9OiRu6ODe0AHmMPQ=; b=D8kLLR1rYsVRbSdqJjK8WjMR1V2teP+mXVMKixNkzctyif4BJGbzljYH4EKzJuhdM2 9xkAB2oGiU781Njm0UHrRvRcoXZJj7A6R56ui2mS3aarkSPYYhv4q39nj9xMVaUXY7vQ RLj9I3jzG5WX+eN24n75gm42hX1PRti+C5gvrsttiuwK+o9tE9GBtp9GDQ9p6Y3epVQP BfRAjGAVC28j+S39wVB/DoF5lcwDTbUlNvP8td+if6hURUG00EPu1Alu6Z/3inw/z9MK iTzuQSf/zgUUfzfcr7jtlq+1h/indij/G9iHsx71N36TD8nL6Ae2eRT6N0mhIz3V47Ho X6FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=HW4WXiOf; 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=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b185si2768462wmc.65.2018.04.28.10.24.14; Sat, 28 Apr 2018 10:24:15 -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=@googlemail.com header.s=20161025 header.b=HW4WXiOf; 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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 287A668A599; Sat, 28 Apr 2018 20:23:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99E6A68A55C for ; Sat, 28 Apr 2018 20:23:35 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id j4so7140663wme.1 for ; Sat, 28 Apr 2018 10:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=1eHoku5JQNDqNPRy96CjDp7bPPrguOn8n24GrK0jcKQ=; b=HW4WXiOfo1CVTw5e6qEqgLfit102AwwTgZt3JUQ+wE+5XsPTU67Cebn/e/9dq8LHMu hdmtTbZWz6ZMqvN8uWobjKn/s7nMC5iUIfYXUf4IVjh6RXnWBSurZJJVn7TSwfa2M96W u9FX58L07erURuGiJUvnaZ5Tqrs7KQdj+zPoN7SRD2FdNMmEyYgywBV5xu/WVQUUUrJu EdAGL2cIoB/V0qEMCjocnxcGVmcLMeM+ZvsWUBvuqAET3Yep5+/HpRSRMlnCUTJTvGun P9+BbJmrqSuB6IkXm2vUpmH4F6mZKIfhz9w2x90r8u5IEyDGzY9F8DJmfX7E7E3Pq99J lXsg== 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=1eHoku5JQNDqNPRy96CjDp7bPPrguOn8n24GrK0jcKQ=; b=Oxdps0mNRIEAgKuHyjiLhPYMREPh8mUMgjsqdZoyHF47+HwEpiqnd7Z4HmYYOlY+va XVnUaG184K1UnLAxGic/XUKO0KuVM1gfa5QzUE6MM7bVe7dcEm38pGhN4btr4BFNI3KZ T3dFPRxe9uZIcMx/Lo5RftQrlXp1KhJgylo9MFAdESHmh8XOmFtlczfd0XsJRTUd4HfD ALLj6SY+Z1nvCxKcwaJhmMew2di5vQj5CvhxgFZ5Dxdfe5C0Lu4LbuYZH47MqJIjTdUc vW/JyxpBfC/w3ec1Snc1WsolbAELp/MqomXPFg6SP/7MEGq475flesdPhIu8UR1LCHJT Gs5g== X-Gm-Message-State: ALQs6tBHPJa/2MRDR96bQkBdqOum/dGkjzLuMBlRyWmZT6PAXn88AMp8 qZeGl2uE3sie16OWw8tY7CwQ1A== X-Received: by 10.28.97.139 with SMTP id v133mr3992527wmb.75.1524936246482; Sat, 28 Apr 2018 10:24:06 -0700 (PDT) Received: from debian.speedport.ip (p2003006CCD400529356A485EC7273119.dip0.t-ipconnect.de. [2003:6c:cd40:529:356a:485e:c727:3119]) by smtp.googlemail.com with ESMTPSA id i138sm3740329wmf.22.2018.04.28.10.24.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Apr 2018 10:24:05 -0700 (PDT) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Apr 2018 19:24:21 +0200 Message-Id: <20180428172421.29763-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.16.1 Subject: [FFmpeg-devel] [PATCH] avformat/matroskaenc: do not write timebase as framerate 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: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" If the API user doesn't set avg_frame_rate, matroskaenc will write the current timebase as "default duration" for the video track. This makes no sense, because the "default duration" implies the framerate of the video. Since the timebase is forced to 1/1000, this will make the resulting file claim 1000fps. Drop it and don't write the element. It's optional, so it's better not to write it if the framerate is unknown. Strangely does not require FATE changes. --- libavformat/matroskaenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 5950b4de44..b7ff1950d3 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1304,8 +1304,6 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, if( st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0 && av_cmp_q(av_inv_q(st->avg_frame_rate), st->time_base) > 0) put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, 1000000000LL * st->avg_frame_rate.den / st->avg_frame_rate.num); - else - put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, 1000000000LL * st->time_base.num / st->time_base.den); if (!native_id && ff_codec_get_tag(ff_codec_movvideo_tags, par->codec_id) &&