projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle multiple audio streams in a single piece of content
[dcpomatic.git]
/
test
/
ffmpeg_decoder_sequential_test.cc
diff --git
a/test/ffmpeg_decoder_sequential_test.cc
b/test/ffmpeg_decoder_sequential_test.cc
index c5f43173ea57b55ada9eb972c2da0cdd8845a008..b4f37dd0bb6ffa197c0589022b6eae9a74a9e640 100644
(file)
--- a/
test/ffmpeg_decoder_sequential_test.cc
+++ b/
test/ffmpeg_decoder_sequential_test.cc
@@
-50,22
+50,22
@@
test (boost::filesystem::path file, float fps, int gaps)
film->examine_and_add_content (content);
wait_for_jobs ();
shared_ptr<Log> log (new NullLog);
film->examine_and_add_content (content);
wait_for_jobs ();
shared_ptr<Log> log (new NullLog);
-
FFmpegDecoder decoder (content, log
);
+
shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log)
);
- BOOST_CHECK_CLOSE (decoder
.
video_content()->video_frame_rate(), fps, 0.01);
+ BOOST_CHECK_CLOSE (decoder
->
video_content()->video_frame_rate(), fps, 0.01);
-
VideoFrame const N = decoder.video_content()->video_length().frames (decoder.video_content()->video_frame_rate ()
);
+
Frame const N = decoder->video_content()->video_length(
);
#ifdef DCPOMATIC_DEBUG
#ifdef DCPOMATIC_DEBUG
- decoder
.
test_gaps = 0;
+ decoder
->
test_gaps = 0;
#endif
#endif
- for (
Video
Frame i = 0; i < N; ++i) {
+ for (Frame i = 0; i < N; ++i) {
list<ContentVideo> v;
list<ContentVideo> v;
- v = decoder
.
get_video (i, true);
+ v = decoder
->
get_video (i, true);
BOOST_CHECK_EQUAL (v.size(), 1);
BOOST_CHECK_EQUAL (v.front().frame, i);
}
#ifdef DCPOMATIC_DEBUG
BOOST_CHECK_EQUAL (v.size(), 1);
BOOST_CHECK_EQUAL (v.front().frame, i);
}
#ifdef DCPOMATIC_DEBUG
- BOOST_CHECK_EQUAL (decoder
.
test_gaps, gaps);
+ BOOST_CHECK_EQUAL (decoder
->
test_gaps, gaps);
#endif
}
#endif
}