From patchwork Mon May 15 12:22:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41630 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1571786pzb; Mon, 15 May 2023 05:23:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6veRycua7SYisKumcpxrQGG1N69FzQlqF3jLTMqZSLAKfue34vWJH9ahDVt0v9lPPbNgGN X-Received: by 2002:a17:907:8a14:b0:94f:6218:191f with SMTP id sc20-20020a1709078a1400b0094f6218191fmr33018087ejc.52.1684153418975; Mon, 15 May 2023 05:23:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684153418; cv=none; d=google.com; s=arc-20160816; b=PbLEyumrYR6qvLao2x0VcR6igssoGgdtUGaZorGMvjEBiXISkLYSTdEOn+Q/fq6XYQ bgYSgw3catq4jEwg5Ql1gYpBHfYKRy0E8KWbGfwdPb8vRnbyrks0rC4eQKNuMurkNW6a hGUxYXQPEZydeAB6ua4D4xhoTL5TbsC/0FeKeT6NBD/6KRn+AK/qTtqEGZvZpN9dssMO +1ZUqYPuRL7oqpdnqgCsCQQOHULsULV5j6+r9EDy4ggdK337Igrieei0yl6aJaDlokEe voj8gVVADnyT1rJXVmfRinwpkVUSgF/tBs3eTZAZ/AO47D2QA0FXQfBiTd8m3rjSo/NQ 03Ow== 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=kC5IL5aY1kmLFgYiXawznKssRLw+MYYgduBhy3YSGhM=; b=r1V8EhdkVKKjDsCK5aq9TulrOgrr4x2Ju7EhUA+hjdFHZNb0QdEgX1P/D7Y8SwiMat gaFYdC3vBk5IIzng9Lbol2UZxo5xOy0Ykk5xq2afCAobfhCz798OUi4xykeqjATXgmPL fQG+HLuEqyJ5hSOoIlHf7zhNQeeGfCYr9Y0tIBJiJ0bmFojgRFg2gENYrW6Gm0u0XRZn 2mqZeZ0IHWy01LbNyLNLc96APPdw0ndvp/qRRlEgfUh8BIK0QRmvGiya8+Zu7i04r+gO ad17pvMmNmqpxp3msDcJa7zaLYz/9xJZR/d71EMWJxhlJF/ExL+sb1A85A0OiobU2Bzt O2bQ== 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 g18-20020a17090670d200b0094f5e17e817si13241946ejk.797.2023.05.15.05.23.38; Mon, 15 May 2023 05:23:38 -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 C0DE368BF34; Mon, 15 May 2023 15:23:34 +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 33F5368BEFE for ; Mon, 15 May 2023 15:23:29 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id DF1122404EC for ; Mon, 15 May 2023 14:23:28 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id HJKfwVYiDkDs for ; Mon, 15 May 2023 14:23:28 +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 2E57C240177 for ; Mon, 15 May 2023 14:23:28 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id EC5123A031B for ; Mon, 15 May 2023 14:23:27 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 May 2023 14:22:40 +0200 Message-Id: <20230515122240.2256-1-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <49d5394d-cb12-4c4f-447f-7d063c0a85cb@gmail.com> References: <49d5394d-cb12-4c4f-447f-7d063c0a85cb@gmail.com> 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: soc31ipS2Zcd Same issues as in the previous commit. --- 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..4c48f0099a 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, + (unsigned)seq->num_units_in_tick, + (unsigned)seq->time_scale); if (seq->film_grain_present) c->properties |= FF_CODEC_PROPERTY_FILM_GRAIN;