projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version
[dcpomatic.git]
/
test
/
seek_zero_test.cc
diff --git
a/test/seek_zero_test.cc
b/test/seek_zero_test.cc
index ad8ecb09f7730b7c7913f887e9045c7d0cde9093..33561206c1d8906a2f2c175b1472d4f64b2d7db6 100644
(file)
--- a/
test/seek_zero_test.cc
+++ b/
test/seek_zero_test.cc
@@
-30,6
+30,9
@@
#include "lib/ffmpeg_decoder.h"
#include "lib/ffmpeg_audio_stream.h"
#include "lib/content_video.h"
#include "lib/ffmpeg_decoder.h"
#include "lib/ffmpeg_audio_stream.h"
#include "lib/content_video.h"
+#include "lib/video_content_scale.h"
+#include "lib/video_content.h"
+#include "lib/video_decoder.h"
#include "test.h"
#include <iostream>
#include "test.h"
#include <iostream>
@@
-48,7
+51,7
@@
BOOST_AUTO_TEST_CASE (seek_zero_test)
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
film->examine_and_add_content (content);
wait_for_jobs ();
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
film->examine_and_add_content (content);
wait_for_jobs ();
- content->set_scale (VideoContentScale (Ratio::from_id ("185")));
+ content->
video->
set_scale (VideoContentScale (Ratio::from_id ("185")));
/* Work out the first video frame index that we will be given, taking into account
* the difference between first video and first audio.
/* Work out the first video frame index that we will be given, taking into account
* the difference between first video and first audio.
@@
-58,10
+61,10
@@
BOOST_AUTO_TEST_CASE (seek_zero_test)
video_delay = ContentTime ();
}
video_delay = ContentTime ();
}
- Frame const first_frame = video_delay.round_up (content->
video_frame_rate ()).frames_round (content->
video_frame_rate ());
+ Frame const first_frame = video_delay.round_up (content->
active_video_frame_rate ()).frames_round (content->active_
video_frame_rate ());
FFmpegDecoder decoder (content, film->log(), false);
FFmpegDecoder decoder (content, film->log(), false);
- list<ContentVideo> a = decoder.
get_video
(first_frame, true);
+ list<ContentVideo> a = decoder.
video->get
(first_frame, true);
BOOST_CHECK (a.size() == 1);
BOOST_CHECK_EQUAL (a.front().frame, first_frame);
}
BOOST_CHECK (a.size() == 1);
BOOST_CHECK_EQUAL (a.front().frame, first_frame);
}