Move video frame rate ('prepared-for') into Content.

[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 83fe7c7089dd9568bf550b21a2ef0b5f7871a606..db9e751d5523e51b53bc68c31989fad0fc9a024e 100644 (file)
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -25,6 +25,8 @@
 #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"
 
 using boost::shared_ptr;
@@ -33,30 +35,30 @@ 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"));
-       content->_audio_stream.reset (new FFmpegAudioStream);
+       content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
        content->_video_frame_rate = 24;
 
        {
                /* Sound == video so no offset required */
                content->_first_video = ContentTime ();
-               content->_audio_stream->first_audio = ContentTime ();
-               FFmpegDecoder decoder (content, film->log());
+               content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
+               FFmpegDecoder decoder (content, film->log(), false);
                BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ());
        }
 
        {
                /* Common offset should be removed */
                content->_first_video = ContentTime::from_seconds (600);
-               content->_audio_stream->first_audio = ContentTime::from_seconds (600);
-               FFmpegDecoder decoder (content, film->log());
+               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));
        }
 
        {
                /* Video is on a frame boundary */
                content->_first_video = ContentTime::from_frames (1, 24);
-               content->_audio_stream->first_audio = ContentTime ();
-               FFmpegDecoder decoder (content, film->log());
+               content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
+               FFmpegDecoder decoder (content, film->log(), false);
                BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ());
        }
 
@@ -64,8 +66,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
                /* Video is off a frame boundary */
                double const frame = 1.0 / 24.0;
                content->_first_video = ContentTime::from_seconds (frame + 0.0215);
-               content->_audio_stream->first_audio = ContentTime ();
-               FFmpegDecoder decoder (content, film->log());
+               content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
+               FFmpegDecoder decoder (content, film->log(), false);
                BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215), 0.00001);
        }
 
@@ -73,8 +75,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
                /* Video is off a frame boundary and both have a common offset */
                double const frame = 1.0 / 24.0;
                content->_first_video = ContentTime::from_seconds (frame + 0.0215 + 4.1);
-               content->_audio_stream->first_audio = ContentTime::from_seconds (4.1);
-               FFmpegDecoder decoder (content, film->log());
+               content->ffmpeg_audio_streams().front()->first_audio = ContentTime::from_seconds (4.1);
+               FFmpegDecoder decoder (content, film->log(), false);
                BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215) - 4.1, 0.1);
        }
 }