From patchwork Tue Dec 7 08:14:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32094 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5920699iog; Tue, 7 Dec 2021 00:15:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxAyC+M5bImn+gqRIZE2/HXpxyp+vbbQJ9xF/WX9CCqZN30134abUqU5/VrjpTqFZuIg8pg X-Received: by 2002:a17:907:3e96:: with SMTP id hs22mr51823506ejc.139.1638864941740; Tue, 07 Dec 2021 00:15:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638864941; cv=none; d=google.com; s=arc-20160816; b=g0ZdLU0Uk+xa2ifzQ/bfVTHwViVEUv/2f443PJ615yc1+h6uCgJHgcX99HIKs7iJPe THGyr1qI5cxBJHeHmvaNK07uU5QM4R+ahf1MCVzf6AC4GzjrVUSxZdEi701c63wzfY4Q sn1ijZjXFuGbeYWtniYBt3kI/tn0+nMcCiVbv2sJAnoR1z8EJGN3wnkvxwZnnAw7zaLw nk9D1EYsMr6T/xqTL5O0QwAXHZ2paD0d7W1BRYhs2MFXYwxE8m1kDox+skBfEv0eTzS2 AVOCAwh5FPrId3U9IZsZcZAs41fg16kEW1BOPdbsF/4gRAvxZomWXc56NiHZBr44OE7Q dSWQ== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=IHk+efKgl4HTKmGWeD8rUWEH2ak+Oyp+GLqUUorlUUI=; b=oAVlEoSd8t6hwpcNefF6hKZjI9f/Cf2YHfrV25QOKxPHSTBWGhg33m2XskxPbqH1ul wj+ZbRqEF/vfr3iE2lpsirI+jbkDZCNSdQN/VvCNycY944FDBIjXwTeFD/LVRXcQOCA8 X8d1xNn0FDQqqjTjGwIqyXvcy63PjGNbBlheJjhn7anowOXj4cEFX+rj/qJQyJ0WpSyi ly6r9uJgmCDcW+ev96h2bK/Op1DvSsJAo7LmoB4XWi1icq2Xgvczn9mWgzh7rqjzCOKR NxxMWIXL+GX+c97NhtpOpnnUvbhtEwupkM5AoCh5l/BVTmHWB7Fh58U4YTExofe1dXg8 kUVQ== 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 n19si22146068edv.388.2021.12.07.00.15.41; Tue, 07 Dec 2021 00:15:41 -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 412E968AD0A; Tue, 7 Dec 2021 10:15:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-2.mx.upcmail.net (vie01a-dmta-pe04-2.mx.upcmail.net [62.179.121.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0C9F6808B2 for ; Tue, 7 Dec 2021 10:15:13 +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 1muVd3-00Cxjv-0K for ffmpeg-devel@ffmpeg.org; Tue, 07 Dec 2021 09:15:13 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id uVc5mdsvkSgGFuVc5mFB8g; Tue, 07 Dec 2021 09:14:13 +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: Tue, 7 Dec 2021 09:14:11 +0100 Message-Id: <20211207081411.16442-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207081411.16442-1-michael@niedermayer.cc> References: <20211207081411.16442-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfP8NW1mlv/LtT6ItyJ9DtQSCNxNKUEhHVZSuXxzGi+EjJIyzWpxNjusyDI1YsoT3mG3BfMaIt/icSbb1lmcAxf1iY/VAN+xvcdkDFV8DcpiU2T4eJVk3 0EgAErxpAN5aKxCMcGex4jm3Bm/HQJ0Ic/oVaG2nSaZCFP0EywYDk02k Subject: [FFmpeg-devel] [PATCH 4/4] 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: OeUqpDYbzczn 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 6447ec7ee84..2a08e1df033 100644 --- a/libavformat/vivo.c +++ b/libavformat/vivo.c @@ -121,7 +121,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; @@ -212,13 +212,16 @@ static int vivo_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; value_used = 1; - fps = av_inv_q(av_d2q(d, 10000)); + if (!fps.num && !fps.den) + fps = av_inv_q(av_d2q(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);