From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3F62B46365 for ; Mon, 15 May 2023 12:42:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D33068BE0B; Mon, 15 May 2023 15:41:58 +0300 (EEST) Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DF1368BCE9 for ; Mon, 15 May 2023 15:41:51 +0300 (EEST) Received: by mail-oi1-f180.google.com with SMTP id 5614622812f47-38dec65ab50so7119236b6e.2 for ; Mon, 15 May 2023 05:41:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684154510; x=1686746510; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=/1nRvcbe8xFMqC6nmEXh/DU+ET2pdsYxHhzKuYmEiuI=; b=QmpzA3E5+pzkQRUm7XwhRl+24CJsyARb4llGEbYW2eOSm3F7aDkdvH9M4tcVMzirBc ta3GR4rvuWjMnPNW10mJD5lDXWyFjQAsDLi0g3QoxZwu48tegL/Ps//Wi216ZSLpEgKc CWBTdPBsOUD7Hd2Q3+0bBd+ugWN5IPcWs4tmht7OJRi2x6Dta66Pm+a5MnGv8vk3obhC muMIXcBd5d1qHhwPv8ek5ISsXDcmIswrRBMZP1F9itHXXfJTBqVAM9YvIr0Dow1A0Zln YHyTBatPvOBXBFpizNsAYuEWrhsvWV6dw2pXexrtmwqmmTZDdtWEfUYkm1b1KVBLLQ/7 FHXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684154510; x=1686746510; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/1nRvcbe8xFMqC6nmEXh/DU+ET2pdsYxHhzKuYmEiuI=; b=aw1a/02CZu8N02CdCGHpW+fx6bjh4m/xzVZWgHqaKzb5H1rS7sQ/RpfoRHt6Qlqwkw bGPKcSWvg7stMxCQU7TWz6lK56rZ093DKGvrLEnFKGLwWu3g8Rm2CZjyJ7d45Qv4/+Of IlCghYmCDGrrnRIV+9ryqvbkyrYXPxbkqnWDHRikD+yFhnw8p/cFPU+6up0nROfvNcy1 eMdV9wmwXfqrLc+wCjMEn9uanTNeWYZh2/PYS04KfgPWDmuWA4gzrCR/3O+qoOtvhK3x T+Ux9T0RGxrNQzeoLHsspIY1id80yNnaa9TUHI7V/hRyT0lTq+x2T4+imRZ3zjx/BuLo 7QDA== X-Gm-Message-State: AC+VfDx22HX6n7+ABYAq7o1rriy7jSCQNuWVqR4XovCx3s4n6E/pXuQA oHHhRR9P2UVQiNdU9fJVG4Cu5MgRPR4= X-Google-Smtp-Source: ACHHUZ7yZhXhyDWLh1FPmaFPIgF9N2hylCvoTJBD0ys+xe3/z4xn8GFH4UI4j6eoxg5mJLWEM9DHTg== X-Received: by 2002:a05:6808:1a0a:b0:395:df5c:59ed with SMTP id bk10-20020a0568081a0a00b00395df5c59edmr4389263oib.40.1684154509441; Mon, 15 May 2023 05:41:49 -0700 (PDT) Received: from [192.168.0.12] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id l11-20020acabb0b000000b0037832f60518sm7643228oif.14.2023.05.15.05.41.48 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 May 2023 05:41:49 -0700 (PDT) Message-ID: <82e59f67-7087-2a81-9af3-2cab143bbb5e@gmail.com> Date: Mon, 15 May 2023 09:41:55 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <49d5394d-cb12-4c4f-447f-7d063c0a85cb@gmail.com> <20230515122240.2256-1-anton@khirnov.net> From: James Almer In-Reply-To: <20230515122240.2256-1-anton@khirnov.net> Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 5/15/2023 9:22 AM, Anton Khirnov wrote: > 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; LGTM _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".