diff mbox series

[FFmpeg-devel,v1] avcodec/evc: Alterations following changes in libxeve

Message ID 20240625122016.862-1-d.kozinski@samsung.com
State New
Headers show
Series [FFmpeg-devel,v1] avcodec/evc: Alterations following changes in libxeve | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Dawid Kozinski June 25, 2024, 12:20 p.m. UTC 
Signed-off-by: Dawid Kozinski <d.kozinski@samsung.com>
---
 configure            | 2 +-
 libavcodec/libxeve.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
diff mbox series

Patch

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];