projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix incorrect path.
[dcpomatic.git]
/
test
/
frame_rate_test.cc
diff --git
a/test/frame_rate_test.cc
b/test/frame_rate_test.cc
index cf3dc261275ee64d6b4c746b814e2ecc523aeed4..9521e3909f750fa7412284279b4351a74141c73b 100644
(file)
--- a/
test/frame_rate_test.cc
+++ b/
test/frame_rate_test.cc
@@
-1,25
+1,27
@@
/*
/*
- Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
6
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/frame_rate_test.cc
* @brief Tests for FrameRateChange and the computation of the best
* frame rate for the DCP.
*/
/** @file test/frame_rate_test.cc
* @brief Tests for FrameRateChange and the computation of the best
* frame rate for the DCP.
+ * @ingroup specific
*/
#include <boost/test/unit_test.hpp>
*/
#include <boost/test/unit_test.hpp>
@@
-29,6
+31,8
@@
#include "lib/playlist.h"
#include "lib/ffmpeg_audio_stream.h"
#include "lib/frame_rate_change.h"
#include "lib/playlist.h"
#include "lib/ffmpeg_audio_stream.h"
#include "lib/frame_rate_change.h"
+#include "lib/video_content.h"
+#include "lib/audio_content.h"
#include "test.h"
using boost::shared_ptr;
#include "test.h"
using boost::shared_ptr;
@@
-41,11
+45,11
@@
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
shared_ptr<Film> film = new_test_film ("best_dcp_frame_rate_test_single");
/* Get any piece of content, it doesn't matter what */
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/test.mp4"));
shared_ptr<Film> film = new_test_film ("best_dcp_frame_rate_test_single");
/* Get any piece of content, it doesn't matter what */
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/test.mp4"));
- film->add_content (content);
+ film->
examine_and_
add_content (content);
wait_for_jobs ();
wait_for_jobs ();
-
+
/* Run some tests with a limited range of allowed rates */
/* Run some tests with a limited range of allowed rates */
-
+
std::list<int> afr;
afr.push_back (24);
afr.push_back (25);
std::list<int> afr;
afr.push_back (24);
afr.push_back (25);
@@
-60,7
+64,7
@@
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
BOOST_CHECK_EQUAL (frc.repeat, 1);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
BOOST_CHECK_EQUAL (frc.repeat, 1);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
-
+
content->_video_frame_rate = 50;
best = film->best_video_frame_rate ();
frc = FrameRateChange (50, best);
content->_video_frame_rate = 50;
best = film->best_video_frame_rate ();
frc = FrameRateChange (50, best);
@@
-96,7
+100,7
@@
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
BOOST_CHECK_EQUAL (frc.repeat, 1);
BOOST_CHECK_EQUAL (frc.change_speed, true);
BOOST_CHECK_CLOSE (frc.speed_up, 30 / 29.97, 0.1);
BOOST_CHECK_EQUAL (frc.repeat, 1);
BOOST_CHECK_EQUAL (frc.change_speed, true);
BOOST_CHECK_CLOSE (frc.speed_up, 30 / 29.97, 0.1);
-
+
content->_video_frame_rate = 25;
best = film->best_video_frame_rate ();
frc = FrameRateChange (25, best);
content->_video_frame_rate = 25;
best = film->best_video_frame_rate ();
frc = FrameRateChange (25, best);
@@
-168,7
+172,7
@@
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
BOOST_CHECK_EQUAL (frc.repeat, 1);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
BOOST_CHECK_EQUAL (frc.repeat, 1);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
-
+
content->_video_frame_rate = 50;
best = film->best_video_frame_rate ();
frc = FrameRateChange (50, best);
content->_video_frame_rate = 50;
best = film->best_video_frame_rate ();
frc = FrameRateChange (50, best);
@@
-188,7
+192,7
@@
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
/* Check some out-there conversions (not the best) */
BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
/* Check some out-there conversions (not the best) */
-
+
frc = FrameRateChange (14.99, 24);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (frc.repeat, 2);
frc = FrameRateChange (14.99, 24);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (frc.repeat, 2);
@@
-219,13
+223,13
@@
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
shared_ptr<Film> film = new_test_film ("best_dcp_frame_rate_test_double");
/* Get any old content, it doesn't matter what */
shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/test.mp4"));
shared_ptr<Film> film = new_test_film ("best_dcp_frame_rate_test_double");
/* Get any old content, it doesn't matter what */
shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/test.mp4"));
- film->add_content (A);
+ film->
examine_and_
add_content (A);
shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
- film->add_content (B);
+ film->
examine_and_
add_content (B);
wait_for_jobs ();
/* Run some tests with a limited range of allowed rates */
wait_for_jobs ();
/* Run some tests with a limited range of allowed rates */
-
+
std::list<int> afr;
afr.push_back (24);
afr.push_back (25);
std::list<int> afr;
afr.push_back (24);
afr.push_back (25);
@@
-235,6
+239,14
@@
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
A->_video_frame_rate = 30;
B->_video_frame_rate = 24;
BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 25);
A->_video_frame_rate = 30;
B->_video_frame_rate = 24;
BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 25);
+
+ A->_video_frame_rate = 24;
+ B->_video_frame_rate = 24;
+ BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 24);
+
+ A->_video_frame_rate = 24;
+ B->_video_frame_rate = 48;
+ BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 24);
}
BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
}
BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
@@
-244,54
+256,55
@@
BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/test.mp4"));
film->examine_and_add_content (content);
wait_for_jobs ();
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/test.mp4"));
film->examine_and_add_content (content);
wait_for_jobs ();
-
+
std::list<int> afr;
afr.push_back (24);
afr.push_back (25);
afr.push_back (30);
Config::instance()->set_allowed_dcp_frame_rates (afr);
std::list<int> afr;
afr.push_back (24);
afr.push_back (25);
afr.push_back (30);
Config::instance()->set_allowed_dcp_frame_rates (afr);
- shared_ptr<FFmpegAudioStream> stream (new FFmpegAudioStream ("foo", 0, 0, 0));
- content->_audio_streams.push_back (stream);
+ shared_ptr<FFmpegAudioStream> stream (new FFmpegAudioStream ("foo", 0, 0, 0, 0));
+ content->audio.reset (new AudioContent (content.get()));
+ content->audio->add_stream (stream);
content->_video_frame_rate = 24;
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
content->_video_frame_rate = 24;
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
- BOOST_CHECK_EQUAL (content->
resampled_audio
_frame_rate(), 48000);
+ BOOST_CHECK_EQUAL (content->
audio->resampled
_frame_rate(), 48000);
stream->_frame_rate = 44100;
stream->_frame_rate = 44100;
- BOOST_CHECK_EQUAL (content->
resampled_audio
_frame_rate(), 48000);
+ BOOST_CHECK_EQUAL (content->
audio->resampled
_frame_rate(), 48000);
stream->_frame_rate = 80000;
stream->_frame_rate = 80000;
- BOOST_CHECK_EQUAL (content->
resampled_audio
_frame_rate(), 96000);
+ BOOST_CHECK_EQUAL (content->
audio->resampled
_frame_rate(), 96000);
content->_video_frame_rate = 23.976;
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
content->_video_frame_rate = 23.976;
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
- BOOST_CHECK_EQUAL (content->
resampled_audio
_frame_rate(), 47952);
+ BOOST_CHECK_EQUAL (content->
audio->resampled
_frame_rate(), 47952);
content->_video_frame_rate = 29.97;
film->set_video_frame_rate (30);
BOOST_CHECK_EQUAL (film->video_frame_rate (), 30);
stream->_frame_rate = 48000;
content->_video_frame_rate = 29.97;
film->set_video_frame_rate (30);
BOOST_CHECK_EQUAL (film->video_frame_rate (), 30);
stream->_frame_rate = 48000;
- BOOST_CHECK_EQUAL (content->
resampled_audio
_frame_rate(), 47952);
+ BOOST_CHECK_EQUAL (content->
audio->resampled
_frame_rate(), 47952);
content->_video_frame_rate = 25;
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
content->_video_frame_rate = 25;
film->set_video_frame_rate (24);
stream->_frame_rate = 48000;
- BOOST_CHECK_EQUAL (content->
resampled_audio
_frame_rate(), 50000);
+ BOOST_CHECK_EQUAL (content->
audio->resampled
_frame_rate(), 50000);
content->_video_frame_rate = 25;
film->set_video_frame_rate (24);
stream->_frame_rate = 44100;
content->_video_frame_rate = 25;
film->set_video_frame_rate (24);
stream->_frame_rate = 44100;
- BOOST_CHECK_EQUAL (content->
resampled_audio
_frame_rate(), 50000);
+ BOOST_CHECK_EQUAL (content->
audio->resampled
_frame_rate(), 50000);
/* Check some out-there conversions (not the best) */
/* Check some out-there conversions (not the best) */
-
+
content->_video_frame_rate = 14.99;
film->set_video_frame_rate (25);
stream->_frame_rate = 16000;
content->_video_frame_rate = 14.99;
film->set_video_frame_rate (25);
stream->_frame_rate = 16000;
- /* The FrameRateChange within resampled_
audio_
frame_rate should choose to double-up
+ /* The FrameRateChange within resampled_frame_rate should choose to double-up
the 14.99 fps video to 30 and then run it slow at 25.
*/
the 14.99 fps video to 30 and then run it slow at 25.
*/
- BOOST_CHECK_EQUAL (content->
resampled_audio_frame_rate(),
rint (48000 * 2 * 14.99 / 25));
+ BOOST_CHECK_EQUAL (content->
audio->resampled_frame_rate(), l
rint (48000 * 2 * 14.99 / 25));
}
}