projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b52c940
)
Fix test logging setup to actually work.
author
Carl Hetherington
<cth@carlh.net>
Thu, 14 Oct 2021 22:30:27 +0000
(
00:30
+0200)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 15 Oct 2021 17:44:40 +0000
(19:44 +0200)
test/ffmpeg_encoder_test.cc
patch
|
blob
|
history
diff --git
a/test/ffmpeg_encoder_test.cc
b/test/ffmpeg_encoder_test.cc
index c3e8c9a81a8ccafa2713eac29325be836c8dbf41..993da4d2348a84e32d9a681900092b81bad1c846 100644
(file)
--- a/
test/ffmpeg_encoder_test.cc
+++ b/
test/ffmpeg_encoder_test.cc
@@
-24,6
+24,7
@@
#include "lib/config.h"
#include "lib/content_factory.h"
#include "lib/dcp_content.h"
#include "lib/config.h"
#include "lib/content_factory.h"
#include "lib/dcp_content.h"
+#include "lib/dcpomatic_log.h"
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_encoder.h"
#include "lib/ffmpeg_examiner.h"
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_encoder.h"
#include "lib/ffmpeg_examiner.h"
@@
-471,8
+472,8
@@
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_1)
/** Regression test for Butler video buffers reached 480 frames (audio is 0) (#2101) */
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
{
/** Regression test for Butler video buffers reached 480 frames (audio is 0) (#2101) */
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
{
- auto logs =
Config::instance()->log_
types();
-
Config::instance()->set_log
_types(logs | LogEntry::TYPE_DEBUG_PLAYER);
+ auto logs =
dcpomatic_log->
types();
+
dcpomatic_log->set
_types(logs | LogEntry::TYPE_DEBUG_PLAYER);
auto content = content_factory(TestPaths::private_data() / "tge_clip.mkv").front();
auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_2", { content });
auto content = content_factory(TestPaths::private_data() / "tge_clip.mkv").front();
auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_2", { content });
@@
-481,6
+482,6
@@
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_2.mov", ExportFormat::PRORES, false, true, false, 23);
encoder.go ();
FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_2.mov", ExportFormat::PRORES, false, true, false, 23);
encoder.go ();
-
Config::instance()->set_log
_types(logs);
+
dcpomatic_log->set
_types(logs);
}
}