From patchwork Mon May 15 08:22:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41614 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1437993pzb; Mon, 15 May 2023 01:23:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5qfBA1WfTWgZGCpVEDXqtcAhE2uRFAVPbxmMPZotnrblGoVSoI4UF7zxwO4PzHZjIrn0vD X-Received: by 2002:a05:6402:14d3:b0:508:4120:202a with SMTP id f19-20020a05640214d300b005084120202amr29195286edx.10.1684138985430; Mon, 15 May 2023 01:23:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684138985; cv=none; d=google.com; s=arc-20160816; b=o9CPvHigZi2egxH+g+hM3g8Sxqirtsri/I/ONBfJpwDPFj1rt6d2IM5mYpSI9PBnoa nkoBq18KNd0k//D/VYInUaA8gMEO10KbK1YXprNxenJT6Ap2SuqIMzyei7hqJWWdqhty p4oAG98fJmq+aC0iEXc4E77OcTUUE/hNkXmYNnsehBXOY6y88k4OakBn4nBRB6HHqpGT o+ksF9ci9Fy6jqMWTVHNygumcq4r2dyFUfZWrHUoMI5hFUxhN2n8utkOh8/W2KJ49Ttb kJJ25XVCoyoEf3X5/cNK1TdizFa/5yXH6WPbqrrlv8O5B4d7rgN7IlTnknZiah+XCioB Rg5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=SXl4JpGkKa4qgjmAKjpTVi7mkwCZYQqyX1qliEWRSms=; b=TDUt8CySZrDF2uReFQKsgDcT/gkZG2Ljg0cs/gM9kImCOCx68mfTs6R5qYmXkeGhm/ J3SEBiSPJhZS4FFjB40lavryzvo9U/O6KYVzSuvHNuT6LJZ9vxMxIVJkuOXtxx91hx6X 2KWmRoF4UD2uWYAskjmWzpHjR0sxx1m95XjLnqSaEmX2nNtAsMgsyCuuTQe7gPnUen2b PFNVT8x9k/aTxcqGnt9JiuAoDyjDnFXFlKXlenTgsPTZmP2hgfZb6FNHXg80ADg3J10c Yz3SpdDceI6yvRj8I/9itv0MEaV20+v6p6oWCc7FKb53KdSlYRxj3ByrSX7wkzN5gSmn bUAA== 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 v14-20020aa7d80e000000b0050d1e06a49csi11065723edq.443.2023.05.15.01.23.05; Mon, 15 May 2023 01:23:05 -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 B8B5C68C069; Mon, 15 May 2023 11:23:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6883D68BF88 for ; Mon, 15 May 2023 11:22:56 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 00AFD2404EC for ; Mon, 15 May 2023 10:22:56 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id dBYCTs5DFoa7 for ; Mon, 15 May 2023 10:22:55 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3086D240177 for ; Mon, 15 May 2023 10:22:55 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 027103A031B for ; Mon, 15 May 2023 10:22:55 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 May 2023 10:22:54 +0200 Message-Id: <20230515082254.4461-1-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230507133255.20881-6-anton@khirnov.net> References: <20230507133255.20881-6-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/libdav1d: fix exporting framerate 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7G33RaQy0il3 Same issues as in the previous commit. --- Updated for changes in previous patch. --- libavcodec/Makefile | 2 +- libavcodec/libdav1d.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9587e56493..4d59411662 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1086,7 +1086,7 @@ OBJS-$(CONFIG_LIBARIBCAPTION_DECODER) += libaribcaption.o ass.o OBJS-$(CONFIG_LIBCELT_DECODER) += libcelt_dec.o OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o OBJS-$(CONFIG_LIBCODEC2_ENCODER) += libcodec2.o -OBJS-$(CONFIG_LIBDAV1D_DECODER) += libdav1d.o +OBJS-$(CONFIG_LIBDAV1D_DECODER) += libdav1d.o av1_parse.o OBJS-$(CONFIG_LIBDAVS2_DECODER) += libdavs2.o OBJS-$(CONFIG_LIBFDK_AAC_DECODER) += libfdk-aacdec.o OBJS-$(CONFIG_LIBFDK_AAC_ENCODER) += libfdk-aacenc.o diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index af072da681..0320ae7c6c 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -30,6 +30,7 @@ #include "libavutil/opt.h" #include "atsc_a53.h" +#include "av1_parse.h" #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" @@ -154,12 +155,9 @@ static void libdav1d_init_params(AVCodecContext *c, const Dav1dSequenceHeader *s else c->pix_fmt = pix_fmt[seq->layout][seq->hbd]; - if (seq->num_units_in_tick && seq->time_scale) { - av_reduce(&c->framerate.den, &c->framerate.num, - seq->num_units_in_tick, seq->time_scale, INT_MAX); - if (seq->equal_picture_interval) - c->ticks_per_frame = seq->num_ticks_per_picture; - } + c->framerate = ff_av1_framerate(seq->num_ticks_per_picture, + seq->num_units_in_tick, + seq->time_scale); if (seq->film_grain_present) c->properties |= FF_CODEC_PROPERTY_FILM_GRAIN;