projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better tidy_for_filename that doesn't screw up with UTF-8.
[dcpomatic.git]
/
test
/
frame_rate_test.cc
diff --git
a/test/frame_rate_test.cc
b/test/frame_rate_test.cc
index 5cdea8c6b6ca7de934f9967c85f61416566e5507..592b7af8b5ca4ce17228fb3f4ec88f72b55cfc98 100644
(file)
--- a/
test/frame_rate_test.cc
+++ b/
test/frame_rate_test.cc
@@
-1,30
+1,42
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2016
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.
+ */
+
#include <boost/test/unit_test.hpp>
#include "lib/film.h"
#include "lib/config.h"
#include <boost/test/unit_test.hpp>
#include "lib/film.h"
#include "lib/config.h"
+#include "lib/ffmpeg_content.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;
-/* Test Playlist::best_dcp_frame_rate and FrameRateC
onversion
+/* Test Playlist::best_dcp_frame_rate and FrameRateC
hange
with a single piece of content.
*/
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
with a single piece of content.
*/
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
@@
-32,11
+44,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);
@@
-44,92
+56,103
@@
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
Config::instance()->set_allowed_dcp_frame_rates (afr);
content->_video_frame_rate = 60;
Config::instance()->set_allowed_dcp_frame_rates (afr);
content->_video_frame_rate = 60;
- int best = film->
playlist()->best_dcp
_frame_rate ();
- FrameRateC
onversion frc = FrameRateConversion
(60, best);
+ int best = film->
best_video
_frame_rate ();
+ FrameRateC
hange frc = FrameRateChange
(60, best);
BOOST_CHECK_EQUAL (best, 30);
BOOST_CHECK_EQUAL (frc.skip, true);
BOOST_CHECK_EQUAL (best, 30);
BOOST_CHECK_EQUAL (frc.skip, true);
- BOOST_CHECK_EQUAL (frc.repeat,
false
);
+ BOOST_CHECK_EQUAL (frc.repeat,
1
);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_EQUAL (frc.change_speed, false);
-
+ BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
+
content->_video_frame_rate = 50;
content->_video_frame_rate = 50;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(50, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(50, best);
BOOST_CHECK_EQUAL (best, 25);
BOOST_CHECK_EQUAL (frc.skip, true);
BOOST_CHECK_EQUAL (best, 25);
BOOST_CHECK_EQUAL (frc.skip, true);
- BOOST_CHECK_EQUAL (frc.repeat,
false
);
+ BOOST_CHECK_EQUAL (frc.repeat,
1
);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_EQUAL (frc.change_speed, false);
+ BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
content->_video_frame_rate = 48;
content->_video_frame_rate = 48;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(48, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(48, best);
BOOST_CHECK_EQUAL (best, 24);
BOOST_CHECK_EQUAL (frc.skip, true);
BOOST_CHECK_EQUAL (best, 24);
BOOST_CHECK_EQUAL (frc.skip, true);
- BOOST_CHECK_EQUAL (frc.repeat,
false
);
+ BOOST_CHECK_EQUAL (frc.repeat,
1
);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_EQUAL (frc.change_speed, false);
+ BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
content->_video_frame_rate = 30;
content->_video_frame_rate = 30;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(30, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(30, best);
BOOST_CHECK_EQUAL (best, 30);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (best, 30);
BOOST_CHECK_EQUAL (frc.skip, false);
- BOOST_CHECK_EQUAL (frc.repeat,
false
);
+ BOOST_CHECK_EQUAL (frc.repeat,
1
);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_EQUAL (frc.change_speed, false);
+ BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
content->_video_frame_rate = 29.97;
content->_video_frame_rate = 29.97;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(29.97, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(29.97, best);
BOOST_CHECK_EQUAL (best, 30);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (best, 30);
BOOST_CHECK_EQUAL (frc.skip, false);
- BOOST_CHECK_EQUAL (frc.repeat,
false
);
+ BOOST_CHECK_EQUAL (frc.repeat,
1
);
BOOST_CHECK_EQUAL (frc.change_speed, true);
BOOST_CHECK_EQUAL (frc.change_speed, true);
-
+ BOOST_CHECK_CLOSE (frc.speed_up, 30 / 29.97, 0.1);
+
content->_video_frame_rate = 25;
content->_video_frame_rate = 25;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(25, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(25, best);
BOOST_CHECK_EQUAL (best, 25);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (best, 25);
BOOST_CHECK_EQUAL (frc.skip, false);
- BOOST_CHECK_EQUAL (frc.repeat,
false
);
+ BOOST_CHECK_EQUAL (frc.repeat,
1
);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_EQUAL (frc.change_speed, false);
+ BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
content->_video_frame_rate = 24;
content->_video_frame_rate = 24;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(24, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(24, best);
BOOST_CHECK_EQUAL (best, 24);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (best, 24);
BOOST_CHECK_EQUAL (frc.skip, false);
- BOOST_CHECK_EQUAL (frc.repeat,
false
);
+ BOOST_CHECK_EQUAL (frc.repeat,
1
);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_EQUAL (frc.change_speed, false);
+ BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
content->_video_frame_rate = 14.5;
content->_video_frame_rate = 14.5;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(14.5, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(14.5, best);
BOOST_CHECK_EQUAL (best, 30);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (best, 30);
BOOST_CHECK_EQUAL (frc.skip, false);
- BOOST_CHECK_EQUAL (frc.repeat,
true
);
+ BOOST_CHECK_EQUAL (frc.repeat,
2
);
BOOST_CHECK_EQUAL (frc.change_speed, true);
BOOST_CHECK_EQUAL (frc.change_speed, true);
+ BOOST_CHECK_CLOSE (frc.speed_up, 15 / 14.5, 0.1);
content->_video_frame_rate = 12.6;
content->_video_frame_rate = 12.6;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(12.6, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(12.6, best);
BOOST_CHECK_EQUAL (best, 25);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (best, 25);
BOOST_CHECK_EQUAL (frc.skip, false);
- BOOST_CHECK_EQUAL (frc.repeat,
true
);
+ BOOST_CHECK_EQUAL (frc.repeat,
2
);
BOOST_CHECK_EQUAL (frc.change_speed, true);
BOOST_CHECK_EQUAL (frc.change_speed, true);
+ BOOST_CHECK_CLOSE (frc.speed_up, 25 / 25.2, 0.1);
content->_video_frame_rate = 12.4;
content->_video_frame_rate = 12.4;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(12.4, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(12.4, best);
BOOST_CHECK_EQUAL (best, 25);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (best, 25);
BOOST_CHECK_EQUAL (frc.skip, false);
- BOOST_CHECK_EQUAL (frc.repeat,
true
);
+ BOOST_CHECK_EQUAL (frc.repeat,
2
);
BOOST_CHECK_EQUAL (frc.change_speed, true);
BOOST_CHECK_EQUAL (frc.change_speed, true);
+ BOOST_CHECK_CLOSE (frc.speed_up, 25 / 24.8, 0.1);
content->_video_frame_rate = 12;
content->_video_frame_rate = 12;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(12, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(12, best);
BOOST_CHECK_EQUAL (best, 24);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (best, 24);
BOOST_CHECK_EQUAL (frc.skip, false);
- BOOST_CHECK_EQUAL (frc.repeat,
true
);
+ BOOST_CHECK_EQUAL (frc.repeat,
2
);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_EQUAL (frc.change_speed, false);
+ BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
/* Now add some more rates and see if it will use them
in preference to skip/repeat.
/* Now add some more rates and see if it will use them
in preference to skip/repeat.
@@
-141,35
+164,39
@@
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
Config::instance()->set_allowed_dcp_frame_rates (afr);
content->_video_frame_rate = 60;
Config::instance()->set_allowed_dcp_frame_rates (afr);
content->_video_frame_rate = 60;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(60, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(60, best);
BOOST_CHECK_EQUAL (best, 60);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (best, 60);
BOOST_CHECK_EQUAL (frc.skip, false);
- BOOST_CHECK_EQUAL (frc.repeat,
false
);
+ BOOST_CHECK_EQUAL (frc.repeat,
1
);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_EQUAL (frc.change_speed, false);
-
+ BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
+
content->_video_frame_rate = 50;
content->_video_frame_rate = 50;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(50, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(50, best);
BOOST_CHECK_EQUAL (best, 50);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (best, 50);
BOOST_CHECK_EQUAL (frc.skip, false);
- BOOST_CHECK_EQUAL (frc.repeat,
false
);
+ BOOST_CHECK_EQUAL (frc.repeat,
1
);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_EQUAL (frc.change_speed, false);
+ BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
content->_video_frame_rate = 48;
content->_video_frame_rate = 48;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(48, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(48, best);
BOOST_CHECK_EQUAL (best, 48);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (best, 48);
BOOST_CHECK_EQUAL (frc.skip, false);
- BOOST_CHECK_EQUAL (frc.repeat,
false
);
+ BOOST_CHECK_EQUAL (frc.repeat,
1
);
BOOST_CHECK_EQUAL (frc.change_speed, false);
BOOST_CHECK_EQUAL (frc.change_speed, false);
+ BOOST_CHECK_CLOSE (frc.speed_up, 1, 0.1);
/* Check some out-there conversions (not the best) */
/* Check some out-there conversions (not the best) */
-
- frc = FrameRateC
onversion
(14.99, 24);
+
+ frc = FrameRateC
hange
(14.99, 24);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (frc.skip, false);
- BOOST_CHECK_EQUAL (frc.repeat,
true
);
+ BOOST_CHECK_EQUAL (frc.repeat,
2
);
BOOST_CHECK_EQUAL (frc.change_speed, true);
BOOST_CHECK_EQUAL (frc.change_speed, true);
+ BOOST_CHECK_CLOSE (frc.speed_up, 24 / (2 * 14.99), 0.1);
/* Check some conversions with limited DCP targets */
/* Check some conversions with limited DCP targets */
@@
-178,15
+205,16
@@
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
Config::instance()->set_allowed_dcp_frame_rates (afr);
content->_video_frame_rate = 25;
Config::instance()->set_allowed_dcp_frame_rates (afr);
content->_video_frame_rate = 25;
- best = film->
playlist()->best_dcp
_frame_rate ();
- frc = FrameRateC
onversion
(25, best);
+ best = film->
best_video
_frame_rate ();
+ frc = FrameRateC
hange
(25, best);
BOOST_CHECK_EQUAL (best, 24);
BOOST_CHECK_EQUAL (frc.skip, false);
BOOST_CHECK_EQUAL (best, 24);
BOOST_CHECK_EQUAL (frc.skip, false);
- BOOST_CHECK_EQUAL (frc.repeat,
false
);
+ BOOST_CHECK_EQUAL (frc.repeat,
1
);
BOOST_CHECK_EQUAL (frc.change_speed, true);
BOOST_CHECK_EQUAL (frc.change_speed, true);
+ BOOST_CHECK_CLOSE (frc.speed_up, 24.0 / 25, 0.1);
}
}
-/* Test Playlist::best_dcp_frame_rate and FrameRateC
onversion
+/* Test Playlist::best_dcp_frame_rate and FrameRateC
hange
with two pieces of content.
*/
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
with two pieces of content.
*/
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
@@
-194,13
+222,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);
@@
-209,64
+237,73
@@
BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
A->_video_frame_rate = 30;
B->_video_frame_rate = 24;
A->_video_frame_rate = 30;
B->_video_frame_rate = 24;
- BOOST_CHECK_EQUAL (film->playlist()->best_dcp_frame_rate(), 25);
-}
+ 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)
{
shared_ptr<Film> film = new_test_film ("audio_sampling_rate_test");
/* Get any piece of content, it doesn't matter what */
shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/test.mp4"));
BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
{
shared_ptr<Film> film = new_test_film ("audio_sampling_rate_test");
/* 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 ();
-
+
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, 0));
+ content->audio.reset (new AudioContent (content.get()));
+ content->audio->add_stream (stream);
content->_video_frame_rate = 24;
film->set_video_frame_rate (24);
content->_video_frame_rate = 24;
film->set_video_frame_rate (24);
-
content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)))
;
- BOOST_CHECK_EQUAL (content->
output_audio
_frame_rate(), 48000);
+
stream->_frame_rate = 48000
;
+ BOOST_CHECK_EQUAL (content->
audio->resampled
_frame_rate(), 48000);
-
content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0)))
;
- BOOST_CHECK_EQUAL (content->
output_audio
_frame_rate(), 48000);
+
stream->_frame_rate = 44100
;
+ BOOST_CHECK_EQUAL (content->
audio->resampled
_frame_rate(), 48000);
-
content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 80000, 0)))
;
- BOOST_CHECK_EQUAL (content->
output_audio
_frame_rate(), 96000);
+
stream->_frame_rate = 80000
;
+ BOOST_CHECK_EQUAL (content->
audio->resampled
_frame_rate(), 96000);
content->_video_frame_rate = 23.976;
film->set_video_frame_rate (24);
content->_video_frame_rate = 23.976;
film->set_video_frame_rate (24);
-
content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)))
;
- BOOST_CHECK_EQUAL (content->
output_audio
_frame_rate(), 47952);
+
stream->_frame_rate = 48000
;
+ 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);
content->_video_frame_rate = 29.97;
film->set_video_frame_rate (30);
BOOST_CHECK_EQUAL (film->video_frame_rate (), 30);
-
content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)))
;
- BOOST_CHECK_EQUAL (content->
output_audio
_frame_rate(), 47952);
+
stream->_frame_rate = 48000
;
+ BOOST_CHECK_EQUAL (content->
audio->resampled
_frame_rate(), 47952);
content->_video_frame_rate = 25;
film->set_video_frame_rate (24);
content->_video_frame_rate = 25;
film->set_video_frame_rate (24);
-
content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)))
;
- BOOST_CHECK_EQUAL (content->
output_audio
_frame_rate(), 50000);
+
stream->_frame_rate = 48000
;
+ BOOST_CHECK_EQUAL (content->
audio->resampled
_frame_rate(), 50000);
content->_video_frame_rate = 25;
film->set_video_frame_rate (24);
content->_video_frame_rate = 25;
film->set_video_frame_rate (24);
-
content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0)))
;
- BOOST_CHECK_EQUAL (content->
output_audio
_frame_rate(), 50000);
+
stream->_frame_rate = 44100
;
+ 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);
content->_video_frame_rate = 14.99;
film->set_video_frame_rate (25);
-
content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 16000, 0)))
;
- /* The FrameRateC
onversion within output_audio
_frame_rate should choose to double-up
+
stream->_frame_rate = 16000
;
+ /* The FrameRateC
hange 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->
output_audio_frame_rate(),
rint (48000 * 2 * 14.99 / 25));
+ BOOST_CHECK_EQUAL (content->
audio->resampled_frame_rate(), l
rint (48000 * 2 * 14.99 / 25));
}
}
-