diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-16 08:36:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-16 08:36:47 +0100 |
| commit | 21ce34c2cd04a2e7e133ff693b84c054182f4f91 (patch) | |
| tree | 5bda50a34b2fa7526dcd682578247f75a85d26b1 /test/test.cc | |
| parent | 0db016f90ae722fc8b72d465e21d9f153f72b340 (diff) | |
Compiles; strange hang on adding content to a film.
Diffstat (limited to 'test/test.cc')
| -rw-r--r-- | test/test.cc | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/test/test.cc b/test/test.cc index 2c957fd35..82b958216 100644 --- a/test/test.cc +++ b/test/test.cc @@ -364,6 +364,7 @@ BOOST_AUTO_TEST_CASE (make_dcp_with_range_test) BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false); } +#if 0 /* Test best_dcp_frame_rate and FrameRateConversion */ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test) { @@ -502,6 +503,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test) BOOST_CHECK_EQUAL (frc.repeat, false); BOOST_CHECK_EQUAL (frc.change_speed, true); } +#endif BOOST_AUTO_TEST_CASE (audio_sampling_rate_test) { @@ -513,47 +515,47 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test) shared_ptr<Film> f = new_test_film ("audio_sampling_rate_test"); // f->set_source_frame_rate (24); - f->set_dcp_frame_rate (24); +// f->set_dcp_frame_rate (24); // f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0))); - BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000); +// BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000); // f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0))); - BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000); +// BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000); // f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 80000, 0))); - BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 96000); +// BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 96000); // f->set_source_frame_rate (23.976); - f->set_dcp_frame_rate (best_dcp_frame_rate (23.976)); +// f->set_dcp_frame_rate (best_dcp_frame_rate (23.976)); // f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0))); - BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952); +// BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952); // f->set_source_frame_rate (29.97); - f->set_dcp_frame_rate (best_dcp_frame_rate (29.97)); - BOOST_CHECK_EQUAL (f->dcp_frame_rate (), 30); +// f->set_dcp_frame_rate (best_dcp_frame_rate (29.97)); +// BOOST_CHECK_EQUAL (f->dcp_frame_rate (), 30); // f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0))); - BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952); +// BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952); // f->set_source_frame_rate (25); - f->set_dcp_frame_rate (24); +// f->set_dcp_frame_rate (24); // f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0))); - BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 50000); +// BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 50000); // f->set_source_frame_rate (25); - f->set_dcp_frame_rate (24); +// f->set_dcp_frame_rate (24); // f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0))); - BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 50000); +// BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 50000); /* Check some out-there conversions (not the best) */ // f->set_source_frame_rate (14.99); - f->set_dcp_frame_rate (25); +// f->set_dcp_frame_rate (25); // f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 16000, 0))); /* The FrameRateConversion within target_audio_sample_rate should choose to double-up the 14.99 fps video to 30 and then run it slow at 25. */ - BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), rint (48000 * 2 * 14.99 / 25)); +// BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), rint (48000 * 2 * 14.99 / 25)); } class TestJob : public Job |