projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use ScopeGuard for _no_check_selection
[dcpomatic.git]
/
test
/
ffmpeg_pts_offset_test.cc
diff --git
a/test/ffmpeg_pts_offset_test.cc
b/test/ffmpeg_pts_offset_test.cc
index 1d36192194e597bb96e117802fffe44f20609cbb..1f994374d2d23b2fc19a94cd64f785ca472b59ed 100644
(file)
--- a/
test/ffmpeg_pts_offset_test.cc
+++ b/
test/ffmpeg_pts_offset_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,29
+18,35
@@
*/
*/
+
/** @file test/ffmpeg_pts_offset_test.cc
* @brief Check the computation of _pts_offset in FFmpegDecoder.
/** @file test/ffmpeg_pts_offset_test.cc
* @brief Check the computation of _pts_offset in FFmpegDecoder.
- * @ingroup s
pecific
+ * @ingroup s
elfcontained
*/
*/
-#include <boost/test/unit_test.hpp>
-#include "lib/film.h"
-#include "lib/ffmpeg_decoder.h"
-#include "lib/ffmpeg_content.h"
-#include "lib/ffmpeg_audio_stream.h"
+
#include "lib/audio_content.h"
#include "lib/audio_content.h"
+#include "lib/ffmpeg_audio_stream.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/ffmpeg_decoder.h"
+#include "lib/film.h"
#include "test.h"
#include "test.h"
+#include <boost/test/unit_test.hpp>
+
+
+using std::make_shared;
+using std::shared_ptr;
+using namespace dcpomatic;
-using boost::shared_ptr;
BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
{
BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
{
-
shared_ptr<Film>
film = new_test_film ("ffmpeg_pts_offset_test");
-
shared_ptr<FFmpegContent> content (new FFmpegContent ("test/data/test.mp4")
);
+
auto
film = new_test_film ("ffmpeg_pts_offset_test");
+
auto content = make_shared<FFmpegContent>("test/data/test.mp4"
);
film->examine_and_add_content (content);
film->examine_and_add_content (content);
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
- content->audio
.reset (new AudioContent (content.get()
));
+ content->audio
= make_shared<AudioContent>(content.get(
));
content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
content->_video_frame_rate = 24;
content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
content->_video_frame_rate = 24;