]>
Commit | Line | Data |
---|---|---|
32e49ce0 JP |
1 | From b6e6f1ae73375ef66a5748069843aaed1a83e6a6 Mon Sep 17 00:00:00 2001 |
2 | From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> | |
3 | Date: Tue, 5 Feb 2019 22:14:18 +0100 | |
4 | Subject: [PATCH] vpx: Fix build against libvpx 1.8 | |
5 | ||
6 | The deprecated debug visualizer was removed. | |
7 | --- | |
8 | configure.ac | 4 ++++ | |
9 | ext/vpx/gstvpxdec.c | 2 ++ | |
10 | ext/vpx/meson.build | 4 ++++ | |
11 | 3 files changed, 10 insertions(+) | |
12 | ||
13 | diff --git a/configure.ac b/configure.ac | |
14 | index 5e4cff126..8c20e5081 100644 | |
15 | --- a/configure.ac | |
16 | +++ b/configure.ac | |
17 | @@ -1054,6 +1054,10 @@ AG_GST_CHECK_FEATURE(VPX, [VPX decoder], vpx, [ | |
18 | AC_DEFINE(HAVE_VPX_1_4, 1, [Defined if the VPX library version is 1.4 or bigger]) | |
19 | ], [true]) | |
20 | ||
21 | + PKG_CHECK_MODULES(VPX_180, vpx >= 1.8.0, [ | |
22 | + AC_DEFINE(HAVE_VPX_1_8, 1, [Defined if the VPX library version is 1.8 or bigger]) | |
23 | + ], [true]) | |
24 | + | |
25 | LIBS="$OLD_LIBS" | |
26 | CFLAGS="$OLD_CFLAGS" | |
27 | fi | |
28 | diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c | |
29 | index c3f0f625f..da4322513 100644 | |
30 | --- a/ext/vpx/gstvpxdec.c | |
31 | +++ b/ext/vpx/gstvpxdec.c | |
32 | @@ -62,6 +62,7 @@ gst_vpx_dec_post_processing_flags_get_type (void) | |
33 | {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"}, | |
34 | {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"}, | |
35 | {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"}, | |
36 | +#ifndef HAVE_VPX_1_8 | |
37 | {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO), | |
38 | "Print frame information", | |
39 | "visualize-frame-info"}, | |
40 | @@ -74,6 +75,7 @@ gst_vpx_dec_post_processing_flags_get_type (void) | |
41 | {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO), | |
42 | "Print video rate info", | |
43 | "visualize-rate-info"}, | |
44 | +#endif | |
45 | {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"}, | |
46 | {0, NULL, NULL} | |
47 | }; | |
48 | diff --git a/ext/vpx/meson.build b/ext/vpx/meson.build | |
49 | index 6ed440728..0d2340b32 100644 | |
50 | --- a/ext/vpx/meson.build | |
51 | +++ b/ext/vpx/meson.build | |
52 | @@ -48,6 +48,10 @@ if vpx_dep.found() | |
53 | vpx_args += '-DHAVE_VPX_1_4' | |
54 | endif | |
55 | ||
56 | + if dependency('vpx', version : '>=1.8.0', required : false).found() | |
57 | + vpx_args += '-DHAVE_VPX_1_8' | |
58 | + endif | |
59 | + | |
60 | gstvpx = library('gstvpx', | |
61 | vpx_sources, | |
62 | c_args : gst_plugins_good_args + vpx_args, | |
63 | -- | |
64 | 2.18.1 | |
65 |