diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-27 20:55:51 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-02 13:38:21 +0100 |
| commit | 0a93237cb5e4642d3b698ff9b7d0cfae5401478c (patch) | |
| tree | b0d5255ae2b90d1c9ef489e78239c2f081ea0a9e /test/ffmpeg_pts_offset_test.cc | |
| parent | 608c146eb09fac2a8fc60e1a72591f6bb8364e1f (diff) | |
Handle multiple audio streams in a single piece of content
in a similar way to the V1 patch.
Diffstat (limited to 'test/ffmpeg_pts_offset_test.cc')
| -rw-r--r-- | test/ffmpeg_pts_offset_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc index 94e7223ab..0ded56431 100644 --- a/test/ffmpeg_pts_offset_test.cc +++ b/test/ffmpeg_pts_offset_test.cc @@ -34,13 +34,13 @@ 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_streams.push_back (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 (); + content->_audio_streams.front()->first_audio = ContentTime (); FFmpegDecoder decoder (content, film->log()); BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ()); } @@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test) { /* Common offset should be removed */ content->_first_video = ContentTime::from_seconds (600); - content->_audio_stream->first_audio = ContentTime::from_seconds (600); + content->_audio_streams.front()->first_audio = ContentTime::from_seconds (600); FFmpegDecoder decoder (content, film->log()); BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime::from_seconds (-600)); } @@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test) { /* Video is on a frame boundary */ content->_first_video = ContentTime::from_frames (1, 24); - content->_audio_stream->first_audio = ContentTime (); + content->_audio_streams.front()->first_audio = ContentTime (); FFmpegDecoder decoder (content, film->log()); BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ()); } @@ -65,7 +65,7 @@ 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 (); + content->_audio_streams.front()->first_audio = ContentTime (); FFmpegDecoder decoder (content, film->log()); BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215), 0.00001); } @@ -74,7 +74,7 @@ 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); + content->_audio_streams.front()->first_audio = ContentTime::from_seconds (4.1); FFmpegDecoder decoder (content, film->log()); BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215) - 4.1, 0.1); } |