summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/ffmpeg_decoder_error_test.cc11
-rw-r--r--test/player_test.cc2
2 files changed, 12 insertions, 1 deletions
diff --git a/test/ffmpeg_decoder_error_test.cc b/test/ffmpeg_decoder_error_test.cc
index 368f54e3c..414c61384 100644
--- a/test/ffmpeg_decoder_error_test.cc
+++ b/test/ffmpeg_decoder_error_test.cc
@@ -22,6 +22,7 @@
#include "lib/content.h"
#include "lib/content_factory.h"
#include "lib/dcpomatic_time.h"
+#include "lib/player.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
@@ -46,3 +47,13 @@ BOOST_AUTO_TEST_CASE (check_exception_during_flush)
}
+
+BOOST_AUTO_TEST_CASE (check_exception_with_multiple_video_frames_per_packet)
+{
+ auto content = content_factory(TestPaths::private_data() / "chk.mkv").front();
+ auto film = new_test_film2 ("check_exception_with_multiple_video_frames_per_packet", { content });
+ auto player = std::make_shared<Player>(film, film->playlist());
+
+ while (!player->pass()) {}
+}
+
diff --git a/test/player_test.cc b/test/player_test.cc
index cafb14586..0d3af5f8c 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE (player_interleave_test)
player->Audio.connect (bind (&audio, _1, _2));
video_frames = audio_frames = 0;
while (!player->pass ()) {
- BOOST_CHECK (abs(video_frames - (audio_frames / 2000)) < 8);
+ BOOST_CHECK (abs(video_frames - (audio_frames / 2000)) <= 8);
}
}