RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libdavs2: update api version and enable avx option 

Signed-off-by: hwrenx <hwrenx@126.com>
This commit is contained in:
hwrenx 2018-12-03 14:37:05 +08:00 committed by Steven Liu
parent 4bbb6d1ae9
commit 701cbbb58c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -6082,7 +6082,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 &&
enabled libcaca && require_pkg_config libcaca caca caca.h caca_create_canvas enabled libcaca && require_pkg_config libcaca caca caca.h caca_create_canvas
enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lcodec2 enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lcodec2
enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.0.1" "dav1d/dav1d.h" dav1d_version enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.0.1" "dav1d/dav1d.h" dav1d_version
enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.5.115" davs2.h davs2_decoder_open enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open
enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion
enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||

3
libavcodec/libdavs2.c
View File

@ -40,11 +40,14 @@ typedef struct DAVS2Context {
static av_cold int davs2_init(AVCodecContext *avctx) static av_cold int davs2_init(AVCodecContext *avctx)
{ {
DAVS2Context *cad = avctx->priv_data; DAVS2Context *cad = avctx->priv_data;
int cpu_flags = av_get_cpu_flags();
/* init the decoder */ /* init the decoder */
cad->param.threads = avctx->thread_count; cad->param.threads = avctx->thread_count;
cad->param.info_level = 0; cad->param.info_level = 0;
cad->decoder = davs2_decoder_open(&cad->param); cad->decoder = davs2_decoder_open(&cad->param);
cad->param.disable_avx = !(cpu_flags & AV_CPU_FLAG_AVX &&
cpu_flags & AV_CPU_FLAG_AVX2);
if (!cad->decoder) { if (!cad->decoder) {
av_log(avctx, AV_LOG_ERROR, "decoder created error."); av_log(avctx, AV_LOG_ERROR, "decoder created error.");