[FFmpeg-cvslog] avcodec/evc: Alterations following changes in libxeve
Dawid Kozinski
git at videolan.org
Fri Jun 28 18:20:20 EEST 2024
ffmpeg | branch: master | Dawid Kozinski <d.kozinski at samsung.com> | Tue Jun 25 14:20:16 2024 +0200| [3e6c7948626f19c46c1a630c788ea6bbd9e7fbcb] | committer: James Almer
avcodec/evc: Alterations following changes in libxeve
Signed-off-by: Dawid Kozinski <d.kozinski at samsung.com>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e6c7948626f19c46c1a630c788ea6bbd9e7fbcb
---
configure | 2 +-
libavcodec/libxeve.c | 7 ++++---
libavcodec/version.h | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 7685c95fbb..fed4c44cd1 100755
--- a/configure
+++ b/configure
@@ -7012,7 +7012,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];
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 37c4c39451..230d5fa13e 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#include "version_major.h"
-#define LIBAVCODEC_VERSION_MINOR 8
+#define LIBAVCODEC_VERSION_MINOR 9
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
More information about the ffmpeg-cvslog
mailing list