mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-19 05:45:58 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: oggmux: check vorbisenc + theoraenc availability at runtime

Browse source 
HAVE_VORBIS was used but never set, so only 3 out of 7 tests
actually ran. Drop now-unused HAVE_THEORA define.
This commit is contained in:
Tim-Philipp Müller 2019-12-07 14:36:36 +00:00 committed by GStreamer Merge Bot
parent ca11e82e66
commit 2b99761dcf
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ext/theora/meson.build
View file

@ -5,7 +5,6 @@ theora_sources = [
theoradec_dep = dependency('theoradec', version : '>=1.1', required : get_option('theora')) theoradec_dep = dependency('theoradec', version : '>=1.1', required : get_option('theora'))
theoraenc_dep = dependency('theoraenc', version : '>=1.1', required : get_option('theora')) theoraenc_dep = dependency('theoraenc', version : '>=1.1', required : get_option('theora'))
core_conf.set('HAVE_THEORA', theoradec_dep.found() and theoraenc_dep.found())
theora_deps = [] theora_deps = []
if theoradec_dep.found() or theoraenc_dep.found() if theoradec_dep.found() or theoraenc_dep.found()

42
tests/check/pipelines/oggmux.c
View file

@ -46,7 +46,6 @@ typedef struct
ChainCodec codec; ChainCodec codec;
} ChainState; } ChainState;
#if (defined (HAVE_THEORA) || defined (HAVE_VORBIS))
static ogg_sync_state oggsync; static ogg_sync_state oggsync;
static GHashTable *eos_chain_states; static GHashTable *eos_chain_states;
static gulong probe_id; static gulong probe_id;
@ -310,9 +309,7 @@ test_pipeline (const char *pipeline)
gst_object_unref (pad); gst_object_unref (pad);
gst_object_unref (bin); gst_object_unref (bin);
} }
#endif
#ifdef HAVE_VORBIS
GST_START_TEST (test_vorbis) GST_START_TEST (test_vorbis)
{ {
test_pipeline test_pipeline
@ -344,9 +341,7 @@ GST_START_TEST (test_vorbis_oggmux_unlinked)
} }
GST_END_TEST; GST_END_TEST;
#endif
#ifdef HAVE_THEORA
GST_START_TEST (test_theora) GST_START_TEST (test_theora)
{ {
test_pipeline test_pipeline
@ -354,9 +349,7 @@ GST_START_TEST (test_theora)
} }
GST_END_TEST; GST_END_TEST;
#endif
#if (defined (HAVE_THEORA) && defined (HAVE_VORBIS))
GST_START_TEST (test_theora_vorbis) GST_START_TEST (test_theora_vorbis)
{ {
test_pipeline test_pipeline
@ -374,7 +367,6 @@ GST_START_TEST (test_vorbis_theora)
} }
GST_END_TEST; GST_END_TEST;
#endif
GST_START_TEST (test_simple_cleanup) GST_START_TEST (test_simple_cleanup)
{ {
@ -406,23 +398,35 @@ GST_END_TEST;
static Suite * static Suite *
oggmux_suite (void) oggmux_suite (void)
{ {
gboolean have_vorbisenc;
gboolean have_theoraenc;
Suite *s = suite_create ("oggmux"); Suite *s = suite_create ("oggmux");
TCase *tc_chain = tcase_create ("general"); TCase *tc_chain = tcase_create ("general");
have_vorbisenc =
gst_registry_check_feature_version (gst_registry_get (), "vorbisenc",
GST_VERSION_MAJOR, GST_VERSION_MINOR, 0);
have_theoraenc =
gst_registry_check_feature_version (gst_registry_get (), "theoraenc",
GST_VERSION_MAJOR, GST_VERSION_MINOR, 0);
suite_add_tcase (s, tc_chain); suite_add_tcase (s, tc_chain);
#ifdef HAVE_VORBIS
tcase_add_test (tc_chain, test_vorbis);
tcase_add_test (tc_chain, test_vorbis_oggmux_unlinked);
#endif
#ifdef HAVE_THEORA if (have_vorbisenc) {
tcase_add_test (tc_chain, test_theora); tcase_add_test (tc_chain, test_vorbis);
#endif tcase_add_test (tc_chain, test_vorbis_oggmux_unlinked);
}
#if (defined (HAVE_THEORA) && defined (HAVE_VORBIS)) if (have_theoraenc) {
tcase_add_test (tc_chain, test_vorbis_theora); tcase_add_test (tc_chain, test_theora);
tcase_add_test (tc_chain, test_theora_vorbis); }
#endif
if (have_vorbisenc && have_theoraenc) {
tcase_add_test (tc_chain, test_vorbis_theora);
tcase_add_test (tc_chain, test_theora_vorbis);
}
tcase_add_test (tc_chain, test_simple_cleanup); tcase_add_test (tc_chain, test_simple_cleanup);
tcase_add_test (tc_chain, test_request_pad_cleanup); tcase_add_test (tc_chain, test_request_pad_cleanup);