/** @file test/time_calculation_test.cc
* @brief Test calculation of timings when frame rates change.
/** @file test/time_calculation_test.cc
* @brief Test calculation of timings when frame rates change.
/* 25fps content, 25fps DCP */
film->set_video_frame_rate (25);
/* 25fps content, 25fps DCP */
film->set_video_frame_rate (25);
/* 24fps content, 24fps DCP */
film->set_video_frame_rate (24);
/* 24fps content, 24fps DCP */
film->set_video_frame_rate (24);
BOOST_CHECK_EQUAL (content->full_length(film).get(), DCPTime::from_seconds(1).get());
/* 25fps content, 25fps DCP */
film->set_video_frame_rate (25);
BOOST_CHECK_EQUAL (content->full_length(film).get(), DCPTime::from_seconds(1).get());
/* 25fps content, 25fps DCP */
film->set_video_frame_rate (25);
BOOST_CHECK_EQUAL (content->full_length(film).get(), DCPTime::from_seconds(1).get());
/* 25fps content, 24fps DCP; length should be increased */
film->set_video_frame_rate (24);
BOOST_CHECK_EQUAL (content->full_length(film).get(), DCPTime::from_seconds(1).get());
/* 25fps content, 24fps DCP; length should be increased */
film->set_video_frame_rate (24);
/* Position 0, no trim, content rate = DCP rate */
content->set_position (film, DCPTime());
/* Position 0, no trim, content rate = DCP rate */
content->set_position (film, DCPTime());
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
- shared_ptr<Piece> piece = player->_pieces.front ();
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
+ auto piece = player->_pieces.front();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 12);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (3.0)), 72);
/* Position 3s, no trim, content rate = DCP rate */
content->set_position (film, DCPTime::from_seconds(3));
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 12);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (3.0)), 72);
/* Position 3s, no trim, content rate = DCP rate */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
/* Position 3s, 1.5s trim, content rate = DCP rate */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, 1.5s trim, content rate = DCP rate */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime::from_seconds (1.5));
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime::from_seconds(1.5));
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
fast (at 25fps) in this case, this means 75 frames of content video will be used.
*/
content->set_position (film, DCPTime());
fast (at 25fps) in this case, this means 75 frames of content video will be used.
*/
content->set_position (film, DCPTime());
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.6)), 15);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.6)), 15);
/* Position 3s, no trim, content rate 24, DCP rate 25 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, no trim, content rate 24, DCP rate 25 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.60)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.60)), 0);
some of these results are not quite what you'd perhaps expect.
*/
content->set_position (film, DCPTime::from_seconds(3));
some of these results are not quite what you'd perhaps expect.
*/
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime::from_seconds (1.6));
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime::from_seconds(1.6));
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.60)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.60)), 0);
content rate = DCP rate case.
*/
content->set_position (film, DCPTime());
content rate = DCP rate case.
*/
content->set_position (film, DCPTime());
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 12);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 12);
/* Position 3s, no trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, no trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime::from_seconds (1.5));
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime::from_seconds(1.5));
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
be used to make 3 * 24 frames of DCP video.
*/
content->set_position (film, DCPTime());
be used to make 3 * 24 frames of DCP video.
*/
content->set_position (film, DCPTime());
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (48);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 48);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 24);
/* Position 3s, no trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, no trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (48);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 48);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime::from_seconds (1.5));
- content->set_video_frame_rate (48);
+ content->set_trim_start(film, ContentTime::from_seconds(1.5));
+ content->set_video_frame_rate(film, 48);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)), 0);
/* Position 0s, no trim, content rate 29.9978733, DCP rate 30 */
content->set_position (film, DCPTime::from_seconds(0));
/* Position 0s, no trim, content rate 29.9978733, DCP rate 30 */
content->set_position (film, DCPTime::from_seconds(0));
- content->set_trim_start (ContentTime::from_seconds (0));
- content->set_video_frame_rate (29.9978733);
+ content->set_trim_start(film, ContentTime::from_seconds (0));
+ content->set_video_frame_rate(film, 29.9978733);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime (3200)), 1);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime (3200)), 1);
/* Position 0, no trim, content rate = DCP rate */
content->set_position (film, DCPTime());
/* Position 0, no trim, content rate = DCP rate */
content->set_position (film, DCPTime());
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
- shared_ptr<Piece> piece = player->_pieces.front ();
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
+ auto piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 12).get(), DCPTime::from_seconds(0.5).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 72).get(), DCPTime::from_seconds(3.0).get());
/* Position 3s, no trim, content rate = DCP rate */
content->set_position (film, DCPTime::from_seconds(3));
BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 12).get(), DCPTime::from_seconds(0.5).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 72).get(), DCPTime::from_seconds(3.0).get());
/* Position 3s, no trim, content rate = DCP rate */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
/* Position 3s, 1.5s trim, content rate = DCP rate */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, 1.5s trim, content rate = DCP rate */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime::from_seconds (1.5));
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime::from_seconds(1.5));
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
fast (at 25fps) in this case, this means 75 frames of content video will be used.
*/
content->set_position (film, DCPTime());
fast (at 25fps) in this case, this means 75 frames of content video will be used.
*/
content->set_position (film, DCPTime());
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 15).get(), DCPTime::from_seconds(0.6).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 15).get(), DCPTime::from_seconds(0.6).get());
/* Position 3s, no trim, content rate 24, DCP rate 25 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, no trim, content rate 24, DCP rate 25 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 40).get(), DCPTime::from_seconds(4.60).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 40).get(), DCPTime::from_seconds(4.60).get());
/* Position 3s, 1.6s trim, content rate 24, DCP rate 25, so the 1.6s trim is at 24fps */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, 1.6s trim, content rate 24, DCP rate 25, so the 1.6s trim is at 24fps */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime::from_seconds (1.6));
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime::from_seconds(1.6));
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 142080);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 40).get(), 295680);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 142080);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 40).get(), 295680);
content rate = DCP rate case.
*/
content->set_position (film, DCPTime());
content rate = DCP rate case.
*/
content->set_position (film, DCPTime());
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 12).get(), DCPTime::from_seconds(0.5).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 12).get(), DCPTime::from_seconds(0.5).get());
/* Position 3s, no trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, no trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime::from_seconds (1.5));
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime::from_seconds(1.5));
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
be used to make 3 * 24 frames of DCP video.
*/
content->set_position (film, DCPTime());
be used to make 3 * 24 frames of DCP video.
*/
content->set_position (film, DCPTime());
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (48);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 48);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 24).get(), DCPTime::from_seconds(0.5).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 24).get(), DCPTime::from_seconds(0.5).get());
/* Position 3s, no trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, no trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (48);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 48);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(4.50).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(4.50).get());
/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime::from_seconds (1.5));
- content->set_video_frame_rate (48);
+ content->set_trim_start(film, ContentTime::from_seconds(1.5));
+ content->set_video_frame_rate(film, 48);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(3.00).get());
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(3.00).get());
- shared_ptr<FFmpegContent> content (new FFmpegContent(doc, film->state_version(), notes));
- AudioStreamPtr stream = content->audio->streams().front();
+ auto content = make_shared<FFmpegContent>(doc, film->state_version(), notes);
+ auto stream = content->audio->streams().front();
/* Position 0, no trim, video/audio content rate = video/audio DCP rate */
content->set_position (film, DCPTime());
/* Position 0, no trim, video/audio content rate = video/audio DCP rate */
content->set_position (film, DCPTime());
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
- BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
- shared_ptr<Piece> piece = player->_pieces.front ();
+ BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
+ auto piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.0)), 144000);
/* Position 3s, no trim, video/audio content rate = video/audio DCP rate */
content->set_position (film, DCPTime::from_seconds (3));
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (3.0)), 144000);
/* Position 3s, no trim, video/audio content rate = video/audio DCP rate */
content->set_position (film, DCPTime::from_seconds (3));
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
/* Position 3s, 1.5s trim, video/audio content rate = video/audio DCP rate */
content->set_position (film, DCPTime::from_seconds (3));
/* Position 3s, 1.5s trim, video/audio content rate = video/audio DCP rate */
content->set_position (film, DCPTime::from_seconds (3));
- content->set_trim_start (ContentTime::from_seconds (1.5));
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime::from_seconds(1.5));
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
/* Position 0, no trim, content video rate 24, DCP video rate 25, both audio rates still 48k */
content->set_position (film, DCPTime());
/* Position 0, no trim, content video rate 24, DCP video rate 25, both audio rates still 48k */
content->set_position (film, DCPTime());
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.6)), 28800);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.6)), 28800);
/* Position 3s, no trim, content video rate 24, DCP rate 25, both audio rates still 48k. */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, no trim, content video rate 24, DCP rate 25, both audio rates still 48k. */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)), 0);
1s of content is 46080 samples after resampling.
*/
content->set_position (film, DCPTime::from_seconds(3));
1s of content is 46080 samples after resampling.
*/
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime::from_seconds (1.6));
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime::from_seconds(1.6));
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)), 0);
The results should be the same as the content rate = DCP rate case.
*/
content->set_position (film, DCPTime());
The results should be the same as the content rate = DCP rate case.
*/
content->set_position (film, DCPTime());
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
/* Position 3s, no trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, no trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime::from_seconds (1.5));
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime::from_seconds(1.5));
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
with skipped frames in this case, audio samples should map straight through.
*/
content->set_position (film, DCPTime());
with skipped frames in this case, audio samples should map straight through.
*/
content->set_position (film, DCPTime());
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
/* Position 3s, no trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, no trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime::from_seconds (1.5));
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime::from_seconds(1.5));
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
/* Position 0, no trim, video content rate = video DCP rate, content audio rate = 44.1k */
content->set_position (film, DCPTime());
/* Position 0, no trim, video content rate = video DCP rate, content audio rate = 44.1k */
content->set_position (film, DCPTime());
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)), 24000);
/* Position 3s, no trim, video content rate = video DCP rate, content audio rate = 44.1k */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, no trim, video content rate = video DCP rate, content audio rate = 44.1k */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime ());
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime());
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
/* Position 3s, 1.5s trim, video content rate = video DCP rate, content audio rate = 44.1k */
content->set_position (film, DCPTime::from_seconds(3));
/* Position 3s, 1.5s trim, video content rate = video DCP rate, content audio rate = 44.1k */
content->set_position (film, DCPTime::from_seconds(3));
- content->set_trim_start (ContentTime::from_seconds (1.5));
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime::from_seconds(1.5));
+ content->set_video_frame_rate(film, 24);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
piece = player->_pieces.front ();
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)), 0);
/* Check with a large start trim */
content->set_position (film, DCPTime::from_seconds(0));
/* Check with a large start trim */
content->set_position (film, DCPTime::from_seconds(0));
- content->set_trim_start (ContentTime::from_seconds (54143));
- content->set_video_frame_rate (24);
+ content->set_trim_start(film, ContentTime::from_seconds(54143));
+ content->set_video_frame_rate(film, 24);