diff options
| -rw-r--r-- | TO_PORT | 1 | ||||
| -rw-r--r-- | test/audio_analysis_test.cc | 19 | ||||
| -rw-r--r-- | test/test.cc | 2 |
3 files changed, 18 insertions, 4 deletions
@@ -1,3 +1,2 @@ -f27ea1605bbbe488186e922068bc6c85cab369b0 e8303dae428b17fb4315b113486bb5ee7b0f49af 2bbe8112dd12f770844ce367751faf348d5414b0 diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc index dda7db544..7be9ca549 100644 --- a/test/audio_analysis_test.cc +++ b/test/audio_analysis_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ #include "lib/film.h" #include "lib/sndfile_content.h" #include "lib/dcp_content_type.h" +#include "lib/ffmpeg_content.h" #include "lib/ratio.h" #include "test.h" @@ -78,7 +79,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test) BOOST_CHECK_EQUAL (b.peak_time().get(), peak_time); } -void +static void finished () { @@ -99,3 +100,17 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test) c->analyse_audio (boost::bind (&finished)); wait_for_jobs (); } + +/* Check that audio analysis works (i.e. runs without error) with a -ve delay */ +BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test) +{ + shared_ptr<Film> film = new_test_film ("audio_analysis_negative_delay_test"); + film->set_name ("audio_analysis_negative_delay_test"); + shared_ptr<AudioContent> c (new FFmpegContent (film, private_data / "boon_telly.mkv")); + c->set_audio_delay (-250); + film->examine_and_add_content (c); + wait_for_jobs (); + + c->analyse_audio (boost::bind (&finished)); + wait_for_jobs (); +} diff --git a/test/test.cc b/test/test.cc index 32ad6ca70..0de7ace62 100644 --- a/test/test.cc +++ b/test/test.cc @@ -70,7 +70,7 @@ struct TestConfig Config::instance()->set_num_local_encoding_threads (1); Config::instance()->set_server_port_base (61920); Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ()); - Config::instance()->set_default_container (static_cast<Ratio*> (0)); + Config::instance()->set_default_container (Ratio::from_id ("185")); Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0)); Config::instance()->set_default_audio_delay (0); Config::instance()->set_default_j2k_bandwidth (100000000); |