projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
test
/
seek_zero_test.cc
diff --git
a/test/seek_zero_test.cc
b/test/seek_zero_test.cc
index 682fa93555742461f93f556cd714231685c51c23..f1f137d3864b00ef0c57ceb534e9e00309b024fe 100644
(file)
--- a/
test/seek_zero_test.cc
+++ b/
test/seek_zero_test.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-30,7
+31,11
@@
#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 "test.h"
+#include <iostream>
using std::cout;
using std::list;
using std::cout;
using std::list;
@@
-45,22
+50,22
@@
BOOST_AUTO_TEST_CASE (seek_zero_test)
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
- content->set_scale (VideoContentScale (Ratio::from_id ("185")));
film->examine_and_add_content (content);
wait_for_jobs ();
film->examine_and_add_content (content);
wait_for_jobs ();
+ 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.
*/
- ContentTime video_delay = content->first_video().get() - content->
audio_stream
()->first_audio.get();
+ ContentTime video_delay = content->first_video().get() - content->
ffmpeg_audio_streams().front
()->first_audio.get();
if (video_delay < ContentTime ()) {
video_delay = ContentTime ();
}
if (video_delay < ContentTime ()) {
video_delay = ContentTime ();
}
-
VideoFrame const first_frame = video_delay.round_up (content->video_frame_rate ()).frames (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());
- list<ContentVideo> a = decoder.
get_video
(first_frame, true);
+ FFmpegDecoder decoder (content, film->log()
, false
);
+ 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);
}