From: Carl Hetherington Date: Sun, 9 Jan 2022 22:44:00 +0000 (+0100) Subject: Speed up hints tests by not running a pointless audio analysis. X-Git-Tag: v2.15.183~14 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=cd6c6a693f19fcaa6c75ed60f48a54a8cae51352 Speed up hints tests by not running a pointless audio analysis. --- diff --git a/src/lib/hints.cc b/src/lib/hints.cc index 46704ebf8..40b51e817 100644 --- a/src/lib/hints.cc +++ b/src/lib/hints.cc @@ -407,7 +407,7 @@ try auto player = make_shared(film, Image::Alignment::COMPACT); player->set_ignore_video (); - if (check_loudness_done) { + if (check_loudness_done || _disable_audio_analysis) { /* We don't need to analyse audio because we already loaded a suitable analysis */ player->set_ignore_audio (); } diff --git a/src/lib/hints.h b/src/lib/hints.h index 2a5e8d4a0..6553593a0 100644 --- a/src/lib/hints.h +++ b/src/lib/hints.h @@ -51,6 +51,9 @@ public: /* For tests only */ void join (); + void disable_audio_analysis () { + _disable_audio_analysis = true; + } private: friend struct hint_subtitle_too_early; @@ -103,4 +106,6 @@ private: boost::optional _last_subtitle; boost::atomic _stop; + + bool _disable_audio_analysis = false; }; diff --git a/test/hints_test.cc b/test/hints_test.cc index 263f02435..c228cd07a 100644 --- a/test/hints_test.cc +++ b/test/hints_test.cc @@ -56,6 +56,8 @@ get_hints (shared_ptr film) { current_hints.clear (); Hints hints (film); + /* None of our tests need the audio analysis, and it is quite time-consuming */ + hints.disable_audio_analysis (); hints.Hint.connect (collect_hint); hints.start (); hints.join ();