projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font_id errors with files decoded by FFmpeg which have subtitles.
[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 a10e505dd0796946c46107dfd4c498276f3396dd..4aa4c1d9aadf387e2874d7a4e71d86591743398f 100644
(file)
--- a/
test/ffmpeg_pts_offset_test.cc
+++ b/
test/ffmpeg_pts_offset_test.cc
@@
-1,26
+1,30
@@
/*
/*
- Copyright (C) 2013-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
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/>.
*/
*/
+
/** @file test/ffmpeg_pts_offset_test.cc
* @brief Check the computation of _pts_offset in FFmpegDecoder.
/** @file test/ffmpeg_pts_offset_test.cc
* @brief Check the computation of _pts_offset in FFmpegDecoder.
+ * @ingroup selfcontained
*/
*/
+
#include <boost/test/unit_test.hpp>
#include "lib/film.h"
#include "lib/ffmpeg_decoder.h"
#include <boost/test/unit_test.hpp>
#include "lib/film.h"
#include "lib/ffmpeg_decoder.h"
@@
-29,16
+33,20
@@
#include "lib/audio_content.h"
#include "test.h"
#include "lib/audio_content.h"
#include "test.h"
-using boost::shared_ptr;
+
+using std::make_shared;
+using std::shared_ptr;
+using namespace dcpomatic;
+
BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
{
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")
);
+
auto
film = new_test_film ("ffmpeg_pts_offset_test");
+
auto content = make_shared<FFmpegContent>("test/data/test.mp4"
);
film->examine_and_add_content (content);
film->examine_and_add_content (content);
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
- content->audio
.reset (new AudioContent (content.get(), film
));
+ content->audio
= make_shared<AudioContent>(content.get(
));
content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
content->_video_frame_rate = 24;
content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
content->_video_frame_rate = 24;
@@
-46,24
+54,24
@@
BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
/* Sound == video so no offset required */
content->_first_video = ContentTime ();
content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
/* Sound == video so no offset required */
content->_first_video = ContentTime ();
content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
- FFmpegDecoder decoder (
content, film->log()
, false);
- BOOST_CHECK_EQUAL (decoder._pts_offset
, ContentTime ()
);
+ FFmpegDecoder decoder (
film, content
, false);
+ BOOST_CHECK_EQUAL (decoder._pts_offset
.get(), 0
);
}
{
/* Common offset should be removed */
content->_first_video = ContentTime::from_seconds (600);
content->ffmpeg_audio_streams().front()->first_audio = ContentTime::from_seconds (600);
}
{
/* Common offset should be removed */
content->_first_video = ContentTime::from_seconds (600);
content->ffmpeg_audio_streams().front()->first_audio = ContentTime::from_seconds (600);
- FFmpegDecoder decoder (
content, film->log()
, false);
- BOOST_CHECK_EQUAL (decoder._pts_offset
, ContentTime::from_seconds (-600
));
+ FFmpegDecoder decoder (
film, content
, false);
+ 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);
content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
}
{
/* Video is on a frame boundary */
content->_first_video = ContentTime::from_frames (1, 24);
content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
- FFmpegDecoder decoder (
content, film->log()
, false);
- BOOST_CHECK_EQUAL (decoder._pts_offset
, ContentTime ()
);
+ FFmpegDecoder decoder (
film, content
, false);
+ BOOST_CHECK_EQUAL (decoder._pts_offset
.get(), 0
);
}
{
}
{
@@
-71,7
+79,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
double const frame = 1.0 / 24.0;
content->_first_video = ContentTime::from_seconds (frame + 0.0215);
content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
double const frame = 1.0 / 24.0;
content->_first_video = ContentTime::from_seconds (frame + 0.0215);
content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
- FFmpegDecoder decoder (
content, film->log()
, false);
+ FFmpegDecoder decoder (
film, content
, false);
BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215), 0.00001);
}
BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215), 0.00001);
}
@@
-80,7
+88,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
double const frame = 1.0 / 24.0;
content->_first_video = ContentTime::from_seconds (frame + 0.0215 + 4.1);
content->ffmpeg_audio_streams().front()->first_audio = ContentTime::from_seconds (4.1);
double const frame = 1.0 / 24.0;
content->_first_video = ContentTime::from_seconds (frame + 0.0215 + 4.1);
content->ffmpeg_audio_streams().front()->first_audio = ContentTime::from_seconds (4.1);
- FFmpegDecoder decoder (
content, film->log()
, false);
+ FFmpegDecoder decoder (
film, content
, false);
BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215) - 4.1, 0.1);
}
}
BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215) - 4.1, 0.1);
}
}