projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font ID allocation from DCP when there are subs and ccaps using the same IDs...
[dcpomatic.git]
/
test
/
required_disk_space_test.cc
diff --git
a/test/required_disk_space_test.cc
b/test/required_disk_space_test.cc
index 6a177fd712b6d07d9685d6cc8692ed64ff2758a7..b704ccef2d13557fa923bbadbb288a0853d3c626 100644
(file)
--- a/
test/required_disk_space_test.cc
+++ b/
test/required_disk_space_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,19
+18,23
@@
*/
*/
+
/** @file test/required_disk_space_test.cc
* @brief Check Film::required_disk_space
/** @file test/required_disk_space_test.cc
* @brief Check Film::required_disk_space
- * @ingroup s
pecific
+ * @ingroup s
elfcontained
*/
*/
+
#include "lib/content_factory.h"
#include "lib/content_factory.h"
-#include "lib/film.h"
#include "lib/dcp_content.h"
#include "lib/dcp_content.h"
+#include "lib/film.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
#include "test.h"
#include <boost/test/unit_test.hpp>
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+
+using std::dynamic_pointer_cast;
+using std::make_shared;
+
void check_within_n (int64_t a, int64_t b, int64_t n)
{
void check_within_n (int64_t a, int64_t b, int64_t n)
{
@@
-40,22
+44,22
@@
void check_within_n (int64_t a, int64_t b, int64_t n)
BOOST_AUTO_TEST_CASE (required_disk_space_test)
{
BOOST_AUTO_TEST_CASE (required_disk_space_test)
{
-
shared_ptr<Film>
film = new_test_film ("required_disk_space_test");
+
auto
film = new_test_film ("required_disk_space_test");
film->set_j2k_bandwidth (100000000);
film->set_j2k_bandwidth (100000000);
- film->set_audio_channels
(6
);
- film->set_reel_type (R
EELTYPE_
BY_VIDEO_CONTENT);
-
shared_ptr<Content> content_a = content_factory("test/data/flat_blue.png").front()
;
+ film->set_audio_channels
(8
);
+ film->set_reel_type (R
eelType::
BY_VIDEO_CONTENT);
+
auto content_a = content_factory("test/data/flat_blue.png")[0]
;
BOOST_REQUIRE (content_a);
film->examine_and_add_content (content_a);
BOOST_REQUIRE (content_a);
film->examine_and_add_content (content_a);
-
shared_ptr<DCPContent> content_b (new DCPContent("test/data/burnt_subtitle_test_dcp")
);
+
auto content_b = make_shared<DCPContent>("test/data/burnt_subtitle_test_dcp"
);
film->examine_and_add_content (content_b);
BOOST_REQUIRE (!wait_for_jobs());
film->write_metadata ();
check_within_n (
film->required_disk_space(),
film->examine_and_add_content (content_b);
BOOST_REQUIRE (!wait_for_jobs());
film->write_metadata ();
check_within_n (
film->required_disk_space(),
- 28
9
LL * (100000000 / 8) / 24 + // video
- 28
9LL * 48000 * 6
* 3 / 24 + // audio
+ 28
8
LL * (100000000 / 8) / 24 + // video
+ 28
8LL * 48000 * 8
* 3 / 24 + // audio
65536, // extra
16
);
65536, // extra
16
);
@@
-65,17
+69,19
@@
BOOST_AUTO_TEST_CASE (required_disk_space_test)
check_within_n (
film->required_disk_space(),
240LL * (100000000 / 8) / 24 + // video
check_within_n (
film->required_disk_space(),
240LL * (100000000 / 8) / 24 + // video
- 28
9LL * 48000 * 6
* 3 / 24 + // audio
+ 28
8LL * 48000 * 8
* 3 / 24 + // audio
65536, // extra
16
);
65536, // extra
16
);
+ std::string why_not;
+ BOOST_CHECK(content_b->can_reference_audio(film, why_not));
content_b->set_reference_audio (true);
check_within_n (
film->required_disk_space(),
240LL * (100000000 / 8) / 24 + // video
content_b->set_reference_audio (true);
check_within_n (
film->required_disk_space(),
240LL * (100000000 / 8) / 24 + // video
- 240LL * 48000 *
6
* 3 / 24 + // audio
+ 240LL * 48000 *
8
* 3 / 24 + // audio
65536, // extra
16
);
65536, // extra
16
);