From 9f8f3d7655de5525cc89db6a8e262be5d0c29765 Mon Sep 17 00:00:00 2001 From: Dawid Kozinski Date: Tue, 25 Jun 2024 14:20:16 +0200 Subject: [PATCH] avcodec/evc: Alterations following changes in libxeve Signed-off-by: Dawid Kozinski Signed-off-by: James Almer Signed-off-by: Paul B Mahol --- configure | 2 +- libavcodec/libxeve.c | 7 ++++--- libavcodec/version.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 2b6f9e4a71..05c5d73176 100755 --- a/configure +++ b/configure @@ -6998,7 +6998,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 c6865f9ad7..b0701b54ea 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]; diff --git a/libavcodec/version.h b/libavcodec/version.h index 7acb261bb3..230d5fa13e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 7 +#define LIBAVCODEC_VERSION_MINOR 9 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \