mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 09:55:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

vpx: Fix build against libvpx 1.8

Browse source 
The deprecated debug visualizer was removed.
This commit is contained in:
Jan Alexander Steffens (heftig) 2019-02-05 22:14:18 +01:00 committed by Tim-Philipp Müller
parent 062f2c46fa
commit b6e6f1ae73
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -1054,6 +1054,10 @@ AG_GST_CHECK_FEATURE(VPX, [VPX decoder], vpx, [
AC_DEFINE(HAVE_VPX_1_4, 1, [Defined if the VPX library version is 1.4 or bigger]) AC_DEFINE(HAVE_VPX_1_4, 1, [Defined if the VPX library version is 1.4 or bigger])
], [true]) ], [true])
PKG_CHECK_MODULES(VPX_180, vpx >= 1.8.0, [
AC_DEFINE(HAVE_VPX_1_8, 1, [Defined if the VPX library version is 1.8 or bigger])
], [true])
LIBS="$OLD_LIBS" LIBS="$OLD_LIBS"
CFLAGS="$OLD_CFLAGS" CFLAGS="$OLD_CFLAGS"
fi fi

2
ext/vpx/gstvpxdec.c
View file

@ -62,6 +62,7 @@ gst_vpx_dec_post_processing_flags_get_type (void)
{C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"}, {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"},
{C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"}, {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"},
{C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"}, {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"},
#ifndef HAVE_VPX_1_8
{C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO), {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO),
"Print frame information", "Print frame information",
"visualize-frame-info"}, "visualize-frame-info"},
@ -74,6 +75,7 @@ gst_vpx_dec_post_processing_flags_get_type (void)
{C_FLAGS (VP8_DEBUG_TXT_RATE_INFO), {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO),
"Print video rate info", "Print video rate info",
"visualize-rate-info"}, "visualize-rate-info"},
#endif
{C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"}, {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"},
{0, NULL, NULL} {0, NULL, NULL}
}; };

4
ext/vpx/meson.build
View file

@ -48,6 +48,10 @@ if vpx_dep.found()
vpx_args += '-DHAVE_VPX_1_4' vpx_args += '-DHAVE_VPX_1_4'
endif endif
if dependency('vpx', version : '>=1.8.0', required : false).found()
vpx_args += '-DHAVE_VPX_1_8'
endif
gstvpx = library('gstvpx', gstvpx = library('gstvpx',
vpx_sources, vpx_sources,
c_args : gst_plugins_good_args + vpx_args, c_args : gst_plugins_good_args + vpx_args,