From patchwork Sun May 7 13:32:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41521 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp1707635pzb; Sun, 7 May 2023 06:34:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4abzOosdRR6HoGta5myo0N9Kd3jdWwXoUsdRblhgBUAfcM8rLCHuycYpqK39hWECqAxOHy X-Received: by 2002:aa7:cd53:0:b0:50b:c49b:62d4 with SMTP id v19-20020aa7cd53000000b0050bc49b62d4mr5391896edw.28.1683466462864; Sun, 07 May 2023 06:34:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683466462; cv=none; d=google.com; s=arc-20160816; b=f0AN1Tr8wuAw4GDsUEFuVPHBuI5BbWCwIAVE/0qIlNKZgBT1jTOcuGbARftHhHnflG NsRDYU2ukzYhZ/qNOkOebnwuAL1ebfW4rwFqTvYvTVIGRizgV79DvcSdRKXPDBsDAv9C 00DdmBRWqGl3anf4VM2g3DP3AGHr4B8btR3fmQn0huOcJMqh5+Yfbevhs1c3nDfPukU3 U7hjhSiuFYqZURgrQhTucpCC0Ug6HybOkQTRr99MVnVCgwlU2RYQ7U3uu9MkWlWXGxIL OqYL2DU4veE6ozAJYi/SeEWZvHV9ZCuP/VZJ9rWbQVZT4eiaItkjFCkqqi8YKw6R2tPY Pu5A== 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=xc2hgEU7Mwlq2xb+u4Y0lS40dp3/i5UXxRpu7y8MtnI=; b=HaWwfS0ZZCxOwuVJDcToKEJtkyt9GnYNo9NGyrgxb6YR8vvTSM6sgzYwJfyhroo3e8 p0Gr/emp1y6iH5K8AsCwVnBpRyczWMthnzvQy1PbFFcVR5+fHlOrlOUOVaWQafpl2Ot3 T0kyWSBzLJiQAQvDn62+xvCMXbkYHvGqJkploUop8RJEf96ptM6JdCTflqH+oO/crnhx 1MH7Pc7cuxBUmIUshN7CdBv1s3BGdHzKE/btLNKiY9CYIKIKwE7d/weZf/Sd4c7A2q2L LhqPzGazwMjRIbhv0lGo5UJ2d9tTbRqqsj3tINstZcd3CTVN/jprotW4HSk6ktbGlrAv Uw/g== 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 c16-20020aa7c990000000b0050ce388a8aesi3606514edt.50.2023.05.07.06.34.22; Sun, 07 May 2023 06:34:22 -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 9488D68C108; Sun, 7 May 2023 16:33:28 +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 B3F5F68C11D for ; Sun, 7 May 2023 16:33:20 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3AAD8240591 for ; Sun, 7 May 2023 15:33:18 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id pB-mItfKZ7gu for ; Sun, 7 May 2023 15:33:15 +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 0F7002404EE for ; Sun, 7 May 2023 15:33:13 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 824E13A154F for ; Sun, 7 May 2023 15:33:05 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 May 2023 15:32:50 +0200 Message-Id: <20230507133255.20881-8-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230507133255.20881-1-anton@khirnov.net> References: <20230507133255.20881-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/13] lavc/msmpeg4enc: use AVCodecContext.framerate when available 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: NdkHsDmIBpz1 --- libavcodec/msmpeg4enc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 54121438a0..df190d376c 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -280,7 +280,13 @@ void ff_msmpeg4_encode_picture_header(MpegEncContext * s) void ff_msmpeg4_encode_ext_header(MpegEncContext * s) { - unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1); + unsigned fps; + + if (s->avctx->framerate.num > 0 && s->avctx->framerate.den > 0) + fps = s->avctx->framerate.num / s->avctx->framerate.den; + else + fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1); + put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29 put_bits(&s->pb, 11, FFMIN(s->bit_rate / 1024, 2047));