diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-10-15 22:33:46 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-10-16 10:13:26 +0200 |
| commit | c8fa584045ad65283a85015f18ee8789ddf881d1 (patch) | |
| tree | 9887fe131c628a27555afcf705c565ba91ad9c16 /test | |
| parent | 0e896f9f37db001f34c876ed5fc50e874f96ae09 (diff) | |
Always block waiting for audio when exporting.v2.15.169
Otherwise if there is non available we'll insert silence and potentially
push the audio out of sync (late). May help with #2098.
Diffstat (limited to 'test')
| -rw-r--r-- | test/butler_test.cc | 2 | ||||
| -rw-r--r-- | test/dcp_playback_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/butler_test.cc b/test/butler_test.cc index e57779334..3d524a3b2 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE (butler_test1) /* XXX: check the frame contents */ float buffer[256 * 6]; - BOOST_REQUIRE (butler.get_audio(buffer, 256) == DCPTime()); + BOOST_REQUIRE (butler.get_audio(Butler::Behaviour::BLOCKING, buffer, 256) == DCPTime()); for (int i = 0; i < 256; ++i) { BOOST_REQUIRE_EQUAL (buffer[i * 6 + 0], 0); BOOST_REQUIRE_EQUAL (buffer[i * 6 + 1], 0); diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 0e57acae4..66a735798 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) break; } /* assuming DCP is 24fps/48kHz */ - butler->get_audio (audio_buffer, 2000); + butler->get_audio (Butler::Behaviour::BLOCKING, audio_buffer, 2000); p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true); } delete[] audio_buffer; |