X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_pts_offset_test.cc;h=bdc46f6d91834474f9d125dfc609b4de06640b64;hb=5d0101e82f5f5d69bdb83d9a79f818dd97356276;hp=ccc2a10f2301238d9076304d5ca2bac7f65c4de7;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc index ccc2a10f2..bdc46f6d9 100644 --- a/test/ffmpeg_pts_offset_test.cc +++ b/test/ffmpeg_pts_offset_test.cc @@ -20,29 +20,27 @@ /** @file test/ffmpeg_pts_offset_test.cc * @brief Check the computation of _pts_offset in FFmpegDecoder. + * @ingroup specific */ +#include #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" -#include -#include using boost::shared_ptr; -using boost::make_shared; BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test) { shared_ptr film = new_test_film ("ffmpeg_pts_offset_test"); - shared_ptr content = make_shared (film, "test/data/test.mp4"); + shared_ptr content (new FFmpegContent (film, "test/data/test.mp4")); film->examine_and_add_content (content); wait_for_jobs (); content->audio.reset (new AudioContent (content.get())); - /* Can't use make_shared here */ content->audio->add_stream (shared_ptr (new FFmpegAudioStream)); content->_video_frame_rate = 24; @@ -51,7 +49,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test) 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 ()); + BOOST_CHECK_EQUAL (decoder._pts_offset.get(), 0); } { @@ -59,7 +57,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test) 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)); + BOOST_CHECK_EQUAL (decoder._pts_offset.get(), ContentTime::from_seconds(-600).get()); } { @@ -67,7 +65,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test) 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 ()); + BOOST_CHECK_EQUAL (decoder._pts_offset.get(), 0); } {