RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 00:02:52 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/evc: Alterations following changes in libxeve

Browse Source 
Signed-off-by: Dawid Kozinski <d.kozinski@samsung.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Dawid Kozinski 2024-06-25 14:20:16 +02:00 committed by James Almer
parent 83b77990c6
commit 3e6c794862
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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

7
libavcodec/libxeve.c
View File

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

2
libavcodec/version.h
View File

@ -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, \