From patchwork Mon Dec 6 13:13:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32061 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4614755iog; Mon, 6 Dec 2021 05:14:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJyx+co+SQMS5nbeS72nSWyErtJqJexTgrRoWyEA4PybryNViAKuj+7pDCPXgrGOlbMFt6fB X-Received: by 2002:a17:907:6d28:: with SMTP id sa40mr44705795ejc.201.1638796482869; Mon, 06 Dec 2021 05:14:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638796482; cv=none; d=google.com; s=arc-20160816; b=lorV/mg3bIjwFZ0f/ecdVRIa8QRPDSYWHOk29JVVOjai4X6t5tvZGFmk7MVGyN+ioY kAOl/+giECJNGbxqruEdZmwHMmeyvHejeOZlb2udqckZv2DOnxpExvMs+KnDd4Ocsp4I QDUSQTwV9JbTP5vDIH7LYzjXrzaRuL2uRZEKTlwzAOsI7E9k3hSyZCnbbfXDmnWhIl8q 73Ux0Zxa81yX4Z2eXCWNuCXFSgfkQtiA/L2hNT/R7gVfd1L/u1bcVqJAsn2HYL+uwwKL /X+lSa6K3Er1NE7QQ8tXU7fqGuRaCn5h2l6tbeX+yrtKn2hh7zngQmhXXr44YXQqQy9X sAPg== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=Ior7Mp1m+mGYNgN3hyVVBs5R+9BnoV9eXzTO3SMWPNs=; b=cYKAGeFl2rkUYdqXoIhyvZBA+x1YwWiYf9qFYjOeM1YJxS3yOgNXnkysNph/DhqXl+ /5pTrpZmDmNfsHdiev8VvIFL8Is/4fBdWWuFgf2kWhGB56r6TxNMwIn3cCvewWJkw6sH Za09CEpFPGEFH5WBHli3anDbgcyeh6uvLzp65CgmBrSRiznPHYKXvFswdbZNkixKPRqc rTe0tsSpA/+ilVOltb0uQC+L2svmLo94T9U4sz6MmDmH5gWd86w3y+jy9wjjaXSkxirQ Tdl7duewGvegKviY6cMgeG02ePbuk0dbemrd+4IYHm/HcjvJK4kfPbnQw5tRukvaTPey /JJg== 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 do2si21718585ejc.536.2021.12.06.05.14.39; Mon, 06 Dec 2021 05:14:42 -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; 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 4815768A920; Mon, 6 Dec 2021 15:14:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-1.mx.upcmail.net (vie01a-dmta-pe04-1.mx.upcmail.net [62.179.121.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0615F6800D4 for ; Mon, 6 Dec 2021 15:14:28 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1muDp6-00B2zU-0B for ffmpeg-devel@ffmpeg.org; Mon, 06 Dec 2021 14:14:28 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id uDo7mgFevSgGFuDo7msUPM; Mon, 06 Dec 2021 14:13:28 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=-7hgwuxZ47nPnsXd9h0A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 6 Dec 2021 14:13:27 +0100 Message-Id: <20211206131327.14034-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfFloBhTylYnDVWvHfIOeUS9rC5HGyhQG+AmK4kuSJh9KCPuKwpIhaS8HZj+fLFWV9zUS9yEoBc/WCryTVnYewzEP7qggL9bqnkO8b+9BsbE+QA2x80lj G667WZqbAT8iK+VXmvGyXs8LLuP8ztYrpoRQrA0QiPgL5WPFUlPNpKgA Subject: [FFmpeg-devel] [PATCH] avformat/vivo: Favor setting fps from explicit fractions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2MKeFd0rskMv Signed-off-by: Michael Niedermayer --- libavformat/vivo.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/vivo.c b/libavformat/vivo.c index 8e819d910b7..6126f62f7ba 100644 --- a/libavformat/vivo.c +++ b/libavformat/vivo.c @@ -120,7 +120,7 @@ static int vivo_get_packet_header(AVFormatContext *s) static int vivo_read_header(AVFormatContext *s) { VivoContext *vivo = s->priv_data; - AVRational fps = { 1, 25}; + AVRational fps = { 0 }; AVStream *ast, *vst; unsigned char *line, *line_end, *key, *value; long value_int; @@ -211,13 +211,16 @@ static int vivo_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; value_used = 1; - fps = av_d2q(1/d, 10000); + if (!fps.num && !fps.den) + fps = av_d2q(1/d, 10000); } if (!value_used) av_dict_set(&s->metadata, key, value, 0); } } + if (!fps.num || !fps.den) + fps = (AVRational){ 1, 25}; avpriv_set_pts_info(ast, 64, 1, ast->codecpar->sample_rate); avpriv_set_pts_info(vst, 64, fps.num, fps.den);