From patchwork Tue Jun 25 12:20:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 50146 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp2606674vqz; Tue, 25 Jun 2024 05:20:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUOEUfIinKbPiGbCQ6xn/G/RqMTqEb1TRcC63yicpWJBOty+FfRoWDBQPJpS/gR2aB1YN0NwFTnQaDPhkBbqMxIwyuUwg18W9Rvuw== X-Google-Smtp-Source: AGHT+IHhOgx2Um5IioQq/Sa18A5WACQTdBjOnRxhC4BN07xN4wUTcf9IlBqDbAhUMeGM0uLqVHxf X-Received: by 2002:a2e:a17a:0:b0:2ec:4093:ec7 with SMTP id 38308e7fff4ca-2ec5b2e7238mr55554201fa.30.1719318047036; Tue, 25 Jun 2024 05:20:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719318047; cv=none; d=google.com; s=arc-20160816; b=xIcct7v7w1Uqyw5ukJcWe86ESEes/maKp/aDyHuNRvSWzmsgFhUpQ0TBayIxFP47UN JX6qq/zsr4m6FgWl9TBlckiEEJ3AFFyjjF26O4lZQLZGWT2ezYGRhpQ3rBpGGJo7B1jy TKJSlQwjsGZ+g4sPjUd9db9TG5adKy4T2AkgK9ItpiKnsIvEMywY2Xu6c149B5cwD0Sx gK1IUAOBXbeK9KZ+RPS8OEueqbTjb14ERYRd+uD+bfHxSwvawDVa/aALiTCOisoWcrWd cuiN1+uuz3R2+q3mIaD58Bx401zrcWqkJTsRtYeZOWWwSpA2q0g3Zyo0JPmLcRXifsWK tnEw== 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:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=otyl46BydoBYkpw1KtBaARPrq65nC38EWC4GKnkOLzE=; fh=+CoJMqcO7X76kE97Bx5T9sFRidmuqFXOXO2hAQXFslQ=; b=TiXCeNZJkSZDAx6mOiUbLWryJ4zzEEZ5SUnCClkzIlTHEsHvoPZylwMWJ+xm2fVXN7 xsW9c82hDe9IMINuSd62L4VsrIo4HBYv+IE3kgKPEvX3ARsPB8OF8rmfUHhRtQzqKk37 dCRuvPzulxRMM+To/YiDVQuu4jb5Xu2mo9QihQOVcWCq4A/A58qHnFg+9gbyPiS9Ng+p 9S4atO6t+Bget4MOquFoMi/J3rlSVhI+U4mlkIxXd8UeTb5c0cYm+3DiopK8AYDrFMl1 PLKoZ0HdJfITRH9JD3H32Lhim1FhSkpLQoBxOPVW9JbMXbdUmZKZR3ocJFwt9a9K5Cbi 6tOQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=UQ4aVa8F; 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=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2ec4e759068si26212881fa.126.2024.06.25.05.20.46; Tue, 25 Jun 2024 05:20:47 -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=@samsung.com header.s=mail20170921 header.b=UQ4aVa8F; 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=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 199CE68D4AF; Tue, 25 Jun 2024 15:20:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C17A68C620 for ; Tue, 25 Jun 2024 15:20:28 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20240625122024euoutp027de9ee67551ecd6ebad9e3d149eba910~cPqJh3qVw0204702047euoutp02N for ; Tue, 25 Jun 2024 12:20:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20240625122024euoutp027de9ee67551ecd6ebad9e3d149eba910~cPqJh3qVw0204702047euoutp02N DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1719318024; bh=5DdDO4mriiFFO7bSoBEaHkaCSt2sNk8xql9lho2ZF+U=; h=From:To:Cc:Subject:Date:References:From; b=UQ4aVa8FYPGZ9LSmMU7RQF/OCfmyYkh6mf2lE6DY2DWRy5Ge4/kpp+36t5L20kFpW yS8+9v+1BJn/zmlSHsP66YUcoveO+lLqj1vjWQSG+OVA4TbasNt/6mB/1Qze4hPxNU 5Qx3KDQynUeQ9+8R94ZeZKWv7LZb4bCoJ5riPgKw= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20240625122024eucas1p11f8a70e37d1be662f5cb90c8824a0a05~cPqJM_y0s2476724767eucas1p1d; Tue, 25 Jun 2024 12:20:24 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id B5.8B.09624.806BA766; Tue, 25 Jun 2024 13:20:24 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20240625122024eucas1p1e747fc76786fb839944162dabc735cd0~cPqI4K_ev2216322163eucas1p1j; Tue, 25 Jun 2024 12:20:24 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20240625122024eusmtrp13e1222a0e74575cf74c1dd1866d02d6d~cPqI3rQHi0981309813eusmtrp1G; Tue, 25 Jun 2024 12:20:24 +0000 (GMT) X-AuditID: cbfec7f2-bfbff70000002598-f2-667ab608ba40 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id C5.74.08810.806BA766; Tue, 25 Jun 2024 13:20:24 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20240625122023eusmtip285ee6109e7dc366f1bbda8a7efba1b16~cPqIlKewo1295012950eusmtip2V; Tue, 25 Jun 2024 12:20:23 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jun 2024 14:20:16 +0200 Message-ID: <20240625122016.862-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.44.0.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87oc26rSDJY/lrX4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDJ6JvxnKegTqvjW9oq1gfEdbxcj B4eEgInEpPtuXYxcHEICKxgljl7azALhfGGUeP7xLzOE85lRYtL+n4xdjJxgHVuWrmSHSCxn lNh3/zcThNPOJHHhaCsbSBWbgK7Eyw+PmEBsEQFTiZPNe8HizALaEuvufgezhQU8JT68uMsM YrMIqEq8XXYULM4rYCkxa+0zZohtmhLvZ31nhogLSpyc+YQFIs4tsW7WJVaImfISzVtng50q IfCTXWLClv3sEEUuEpPvX4AaJCzx6vgWqLiMxOnJPSyQACiWONTvAGHWSBz6kQ5RYS3xtvE4 I0iYGeiE9bv0IcKOElfe7GCDqOaTuPFWEOIAPolJ26YzQ4R5JTrahCBMFYm+TjGIRimJp8vm QF3iIbF1/z3GCYyKs5B8NQvJJ7MQ1i5gZF7FKJ5aWpybnlpsmJdarlecmFtcmpeul5yfu4kR mB5O/zv+aQfj3Fcf9Q4xMnEwHmKU4GBWEuENLalKE+JNSaysSi3Kjy8qzUktPsQozcGiJM6r miKfKiSQnliSmp2aWpBaBJNl4uCUamDyU5v7nj37s3iTlpPiF+si5V7rJ63pe36KvzSJ1uuz Z/D+p176+Yj89e8sjzI1VVNOSswPMv/G6nJMd+Xyg28bg+9UBpyeOX/5kTnX/p5LeybYYqci 0P5PcMussLsJfJ+fZF4M021M2OJsLxsdnLF3dfskyyuJJvZmLF9fzTv4uf+d583P5o823P1j yTZz1Qax498u7zp4XvzaKQevjluNlk3KLn4LA3i554S66DikvLpgtMjza8JuuQUlwWdv6M/7 9NXnZbDiF/HHTErxbKcSOyO+hdn8nd5Z2ysb90A9TrD53bbjs5aXXtn29naaVsT7ldFTt+3R vrCBJ0XQqX3akT85q/ruv2rre6K29L2XEktxRqKhFnNRcSIAvP9CWX4DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7oc26rSDJatZbP4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DJ6JvxnKegTqvjW9oq1gfEdbxcjJ4eEgInElqUr2bsYuTiEBJYy SmzvvcwEkZCSWLp0ESOELSzx51oXG0RRK5PEnxWdrCAJNgFdiZcfHoE1iAiYS1xcdwusgVlA W2Ld3e9sILawgKfEhxd3mUFsFgFVibfLjoLFeQUsJWatfcYMsUBT4v2s78wQcUGJkzOfsEDE uSXWzbrECjFTXqJ562zmCYz8s5CUzUKSWsDItIpRJLW0ODc9t9hQrzgxt7g0L10vOT93EyMw cLcd+7l5B+O8Vx/1DjEycTAeYpTgYFYS4Q0tqUoT4k1JrKxKLcqPLyrNSS0+xGgKdOtEZinR 5Hxg7OSVxBuaGZgamphZGphamhkrifN6FnQkCgmkJ5akZqemFqQWwfQxcXBKNTBNelZreuWf nssvz7cM4TZG/2z22Sd0ibY8Flc8NIPxfvE15h87sqTOqHLFT3jQ++xMTrCw/wL/3ZdZJbTV JEKdzu1+cfT8gf7jE3fHZjAke1gVFDmsSPqdufhyvPnnrjWPNaQqnGX3v1+4MlMgrqJh7eVC iYDQjo9SW3tYfL/9F/63+vV9i0XKaxvi9kdyqpm+leQ+q1leNCOq9++Vu9v4ZL6FRMp35TOE fW6N/N8R/r0xOnKBw7P0r2Gtqb3Sv6c3Hw6f+FlPbtqEjFYrz4Mi9VO15DcE8Ffd39M806pv 7t2Vm3oClTgnzbJv6e468qEp/YnGEvtjSi4Z17YsUEwUkGyZcfBL0t2TmxXMlyuxFGckGmox FxUnAgAk4WCf5QIAAA== X-CMS-MailID: 20240625122024eucas1p1e747fc76786fb839944162dabc735cd0 X-Msg-Generator: CA X-RootMTR: 20240625122024eucas1p1e747fc76786fb839944162dabc735cd0 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20240625122024eucas1p1e747fc76786fb839944162dabc735cd0 References: Subject: [FFmpeg-devel] [PATCH v1] avcodec/evc: Alterations following changes in libxeve 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: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: m7DpQ0Vhe9kQ Signed-off-by: Dawid Kozinski --- configure | 2 +- libavcodec/libxeve.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 06a72e4114..de53fd4c68 100755 --- a/configure +++ b/configure @@ -7031,7 +7031,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get enabled libxevd && require_pkg_config libxevd "xevd >= 0.4.1" "xevd.h" xevd_decode -enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.3" "xeve.h" xeve_encode +enabled libxeve && require_pkg_config libxeve "xeve >= 0.5.1" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version enabled libzmq && require_pkg_config libzmq "libzmq >= 4.2.1" zmq.h zmq_ctx_new diff --git a/libavcodec/libxeve.c b/libavcodec/libxeve.c index 1d9972619d..aca994702a 100644 --- a/libavcodec/libxeve.c +++ b/libavcodec/libxeve.c @@ -197,7 +197,8 @@ static int get_conf(AVCodecContext *avctx, XEVE_CDSC *cdsc) if (avctx->framerate.num > 0) { // fps can be float number, but xeve API doesn't support it - cdsc->param.fps = lrintf(av_q2d(avctx->framerate)); + cdsc->param.fps.num = avctx->framerate.num; + cdsc->param.fps.den = avctx->framerate.den; } // GOP size (key-frame interval, I-picture period) @@ -481,8 +482,8 @@ static int libxeve_encode(AVCodecContext *avctx, AVPacket *avpkt, memcpy(avpkt->data, xectx->bitb.addr, xectx->stat.write); - avpkt->time_base.num = 1; - avpkt->time_base.den = xectx->cdsc.param.fps; + avpkt->time_base.num = xectx->cdsc.param.fps.den; + avpkt->time_base.den = xectx->cdsc.param.fps.num; avpkt->pts = xectx->bitb.ts[XEVE_TS_PTS]; avpkt->dts = xectx->bitb.ts[XEVE_TS_DTS];