From patchwork Mon Jun 13 03:36:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36195 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp282009pzb; Sun, 12 Jun 2022 20:38:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQf7J6jzOsc3LS/fdK1cKBZpgHXp/dPXJSjNTSC/RK2JupGbUmqBqS0zd9VZn1GONweEYH X-Received: by 2002:a05:6402:3588:b0:42e:6a8:a5d5 with SMTP id y8-20020a056402358800b0042e06a8a5d5mr63079497edc.117.1655091492063; Sun, 12 Jun 2022 20:38:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655091492; cv=none; d=google.com; s=arc-20160816; b=SuCLX+Avh0xciaSoqORMzqOjIsL58S4NZYNuPZUK9wGLNr3Zy3istE7bDmuPCAV+I4 LFOWftwqmnd4eRPHhVDq7aSi3hRSY+2JFI6IK78F4k0og++ok/6zJVuwfsB2XAjP+2IA Onlpt3TyqN6bgd8ZoetVUshtER08AkgaD++6FBd7K/QYv3UYSfhBblKpGRztWRcY3Aba 5l76kYTsTDtmDrbgyLAd3H2LJYnFGQINgIISI0t7wS6sgohH89rZIyz0uCOuAl1ZSv73 C9DfuZHFmtjCdBRc2oIb6GLM4XqgJyYBOyRInd+aGnUs3I+Pg00tRX+uBgNal82mKoFl LfOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=eHtaKzZKGH2iW9u5hEXIRnoSeK+KQ0CZo/Zc0RrEIG0=; b=kvNv6raPR2G9P3r7if2Z1ofJ9RTrkS1SYy/MhVL+WcfZnH0oPDXHEgTpKwOm8VXVRF FLKW/o2kh4zSPWavSiM1bkYhf4FEQTZuzpN8Ny5JWdmhKIvELsNOn9XROjMZ3If08nOF ltotOkCFfP0Eg4KcMXljhcA5TkTJkRHE2VwVOaxfD1WKeiCAHHlnXFFSlbaHP802kqML A19Flmv6RV2kdoYm0AON/6TuSIO2QM+7HnPU43TVoyty0O5fdkpoiiovGvYubgAmlfSn Ox3kQ630+Se34NaBD6v2MO0rjxBTeJAHjyzqBjwrY/QumqquWX282Sf0iXXQQqG0Ikak 41Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=qhCLkwBb; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w21-20020a05640234d500b0042defb7235csi7536995edc.202.2022.06.12.20.38.11; Sun, 12 Jun 2022 20:38:12 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=qhCLkwBb; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CBE9468B5E3; Mon, 13 Jun 2022 06:38:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-72.mail.qq.com (out203-205-251-72.mail.qq.com [203.205.251.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CDC668B41C for ; Mon, 13 Jun 2022 06:38:01 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1655091478; bh=2xp49KpODor2cjaO3KzKvCGd0nVf6PJRs3JIEWIhiHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qhCLkwBbZVLUq4AMKs4EqTmyNxq6O8rq0LBmmqeqRQJ1r/WKADjl4c7ip1rLtnkpS hvlO1nCguWc28L1MnhA28NM/1EfUkOgrgc2NqiqpRtlOX5/Ka3IaznUZsinDGWN8TO s4sJyhdots3hYCYc7Jec5GdsS/4h9J/WTLBzN3ow= Received: from ZHILIZHAO-MB2.tencent.com ([59.37.125.124]) by newxmesmtplogicsvrszb6.qq.com (NewEsmtp) with SMTP id 926352F6; Mon, 13 Jun 2022 11:36:38 +0800 X-QQ-mid: xmsmtpt1655091403t3ydmxirb Message-ID: X-QQ-XMAILINFO: NSmesZGuqQTYWng4jGpW3mh3qMnz4h0M4H+JgZYp55L18KiXcrIlSE0YnXYlPv 2tDlJ+G4sx/uAiyQ6oqqLh7HAvJhQfYWy7zHw/9gd+SUtZ7HWNe5VKD0eCVR1EBVLzwzxMiQiLd4 LOiD7byPTMaTIoT36ZcQZ5sv6LA9qr9MJd/jIVO8IOVlFTp4rNbvfOUp5pefgFS4G09oCrUWUaBc HWcLTnDK2QsvVS8QmJvYobiL8EMjl4s240cZOO4e/mhaBa3Sw6HESyDuhPlThpR4Y0k02k3ECXgf 8+9od3JKDLsCE7yrJZY+/nmyjCdxtNEZczG9A07mlrzjgrLCnVjFNNoGqYDlP1/yY8hklo0yRadU j07wWrOXsE+fcPV7TIZlAPVPpLxrd5M+fEiV2+xv/50ogFcHChIpzSC4a6rV2awTQH6zwb97+3nE Os1/8h2w4MeQqrF9YHt7qf6IYc2S3Rg1X0EhwUnuMV2I1DzjMaDIX+N/R4ANsRxZKWet9HfzzpWb FYsr48VihqS758ume5MCp9ktoha0zA67EWGzkQc8dIGDRGKm6IH4abCs8Q0ayrNrfGmOMORu+hvj 9S5lV0Hc7xrnSFs//AqlEJ+mc3veBy/Q01cBIOhGcYY3oBz0eztzwKbqRqnUrecrd2og00QeC3sP gVr34fwxfSNjyxht/LMLQKIp+U1mHZb9hawMu72aEYiFa2uYJV4/KmV3rkUa5Cg6r030C5OwyFqH JuINYLT3Tu44ig+EnCFQ0EqAV/1G/xZNvV/3+R1RBo9Bjbiz9wujgmewpHo2HeW8R8m8EdxlLBhv M+4hbZGOB936pxg7W4AziAkUwwv1RqysESaGVVvep7F8kuUEpbANO6JwN8jYfE0GgKXySaar4bk2 bEUYPN35DDWfTKAzKIcf5cCLYDmn8WctBPX6SC4248Chrgde24NClcDP2ChflV7zorpKTa6jJFjl 2rZFzN3nSZAkpn/QH56o0+fMqJT4WekTFoWwgLp2E= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jun 2022 11:36:36 +0800 X-OQ-MSGID: <20220613033636.84271-6-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220613033636.84271-1-quinkblack@foxmail.com> References: <20220613033636.84271-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 5/5] avcodec/libdavs2: use frame rate code table 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 Cc: Zhao Zhili , Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 65HWtslLvFxJ It's more natural than the floating to fraction conversion. Signed-off-by: Zhao Zhili --- libavcodec/libdavs2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index bc31745a4f..d7625718a2 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -25,6 +25,7 @@ #include "libavutil/cpu.h" #include "avcodec.h" #include "codec_internal.h" +#include "avs2.h" #include "davs2.h" typedef struct DAVS2Context { @@ -85,7 +86,8 @@ static int davs2_dump_frames(AVCodecContext *avctx, davs2_picture_t *pic, int *g */ avctx->has_b_frames = FFMAX(avctx->has_b_frames, !headerset->low_delay); - avctx->framerate = av_d2q(headerset->frame_rate,4096); + if (headerset->frame_rate_id < 16) + avctx->framerate = ff_avs2_frame_rate_tab[headerset->frame_rate_id]; *got_frame = 0; return 0; }