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
/
ffmpeg_pts_offset_test.cc
diff --git
a/test/ffmpeg_pts_offset_test.cc
b/test/ffmpeg_pts_offset_test.cc
index 83fe7c7089dd9568bf550b21a2ef0b5f7871a606..f9371f74ca7196e769dcc869c8053498a12e157c 100644
(file)
--- a/
test/ffmpeg_pts_offset_test.cc
+++ b/
test/ffmpeg_pts_offset_test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-2014 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/>.
*/
*/
@@
-25,6
+26,8
@@
#include "lib/film.h"
#include "lib/ffmpeg_decoder.h"
#include "lib/ffmpeg_content.h"
#include "lib/film.h"
#include "lib/ffmpeg_decoder.h"
#include "lib/ffmpeg_content.h"
+#include "lib/ffmpeg_audio_stream.h"
+#include "lib/audio_content.h"
#include "test.h"
using boost::shared_ptr;
#include "test.h"
using boost::shared_ptr;
@@
-33,38
+36,42
@@
BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
{
shared_ptr<Film> film = new_test_film ("ffmpeg_pts_offset_test");
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/test.mp4"));
{
shared_ptr<Film> film = new_test_film ("ffmpeg_pts_offset_test");
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/test.mp4"));
- content->_audio_stream.reset (new FFmpegAudioStream);
+ film->examine_and_add_content (content);
+ wait_for_jobs ();
+
+ content->audio.reset (new AudioContent (content.get()));
+ content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
content->_video_frame_rate = 24;
{
/* Sound == video so no offset required */
content->_first_video = ContentTime ();
content->_video_frame_rate = 24;
{
/* Sound == video so no offset required */
content->_first_video = ContentTime ();
- content->
_audio_stream
->first_audio = ContentTime ();
+ content->
ffmpeg_audio_streams().front()
->first_audio = ContentTime ();
FFmpegDecoder decoder (content, film->log());
FFmpegDecoder decoder (content, film->log());
- BOOST_CHECK_EQUAL (decoder._pts_offset
, ContentTime ()
);
+ BOOST_CHECK_EQUAL (decoder._pts_offset
.get(), 0
);
}
{
/* Common offset should be removed */
content->_first_video = ContentTime::from_seconds (600);
}
{
/* Common offset should be removed */
content->_first_video = ContentTime::from_seconds (600);
- content->
_audio_stream
->first_audio = ContentTime::from_seconds (600);
+ content->
ffmpeg_audio_streams().front()
->first_audio = ContentTime::from_seconds (600);
FFmpegDecoder decoder (content, film->log());
FFmpegDecoder decoder (content, film->log());
- BOOST_CHECK_EQUAL (decoder._pts_offset
, ContentTime::from_seconds (-600
));
+ BOOST_CHECK_EQUAL (decoder._pts_offset
.get(), ContentTime::from_seconds(-600).get(
));
}
{
/* Video is on a frame boundary */
content->_first_video = ContentTime::from_frames (1, 24);
}
{
/* Video is on a frame boundary */
content->_first_video = ContentTime::from_frames (1, 24);
- content->
_audio_stream
->first_audio = ContentTime ();
+ content->
ffmpeg_audio_streams().front()
->first_audio = ContentTime ();
FFmpegDecoder decoder (content, film->log());
FFmpegDecoder decoder (content, film->log());
- BOOST_CHECK_EQUAL (decoder._pts_offset
, ContentTime ()
);
+ BOOST_CHECK_EQUAL (decoder._pts_offset
.get(), 0
);
}
{
/* Video is off a frame boundary */
double const frame = 1.0 / 24.0;
content->_first_video = ContentTime::from_seconds (frame + 0.0215);
}
{
/* Video is off a frame boundary */
double const frame = 1.0 / 24.0;
content->_first_video = ContentTime::from_seconds (frame + 0.0215);
- content->
_audio_stream
->first_audio = ContentTime ();
+ content->
ffmpeg_audio_streams().front()
->first_audio = ContentTime ();
FFmpegDecoder decoder (content, film->log());
BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215), 0.00001);
}
FFmpegDecoder decoder (content, film->log());
BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215), 0.00001);
}
@@
-73,7
+80,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
/* Video is off a frame boundary and both have a common offset */
double const frame = 1.0 / 24.0;
content->_first_video = ContentTime::from_seconds (frame + 0.0215 + 4.1);
/* Video is off a frame boundary and both have a common offset */
double const frame = 1.0 / 24.0;
content->_first_video = ContentTime::from_seconds (frame + 0.0215 + 4.1);
- content->
_audio_stream
->first_audio = ContentTime::from_seconds (4.1);
+ content->
ffmpeg_audio_streams().front()
->first_audio = ContentTime::from_seconds (4.1);
FFmpegDecoder decoder (content, film->log());
BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215) - 4.1, 0.1);
}
FFmpegDecoder decoder (content, film->log());
BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215) - 4.1, 0.1);
}