Remove some left-over JSON bits.

[dcpomatic.git] / test / ffmpeg_pts_offset.cc

diff --git a/test/ffmpeg_pts_offset.cc b/test/ffmpeg_pts_offset.cc
index 0ed8f66d899d22753661029f31af2cd18596a3ed..6caf0d07a2a9d2cf9277afa69f5320b774ce24ae 100644 (file)
--- a/test/ffmpeg_pts_offset.cc
+++ b/test/ffmpeg_pts_offset.cc
@@ -17,6 +17,14 @@
 
 */
 
+#include <boost/test/unit_test.hpp>
+#include "lib/film.h"
+#include "lib/ffmpeg_decoder.h"
+#include "lib/ffmpeg_content.h"
+#include "test.h"
+
+using boost::shared_ptr;
+
 BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 {
        shared_ptr<Film> film = new_test_film ("ffmpeg_pts_offset_test");
@@ -29,8 +37,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
                content->_first_video = 0;
                content->_audio_stream->first_audio = 0;
                FFmpegDecoder decoder (film, content, true, true);
-               BOOST_CHECK_EQUAL (decoder._video_pts_offset, 0);
-               BOOST_CHECK_EQUAL (decoder._audio_pts_offset, 0);
+               BOOST_CHECK_EQUAL (decoder._pts_offset, 0);
+               BOOST_CHECK_EQUAL (decoder._pts_offset, 0);
        }
 
        {
@@ -38,8 +46,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
                content->_first_video = 600;
                content->_audio_stream->first_audio = 600;
                FFmpegDecoder decoder (film, content, true, true);
-               BOOST_CHECK_EQUAL (decoder._video_pts_offset, -600);
-               BOOST_CHECK_EQUAL (decoder._audio_pts_offset, -600);
+               BOOST_CHECK_EQUAL (decoder._pts_offset, -600);
+               BOOST_CHECK_EQUAL (decoder._pts_offset, -600);
        }
 
        {
@@ -47,8 +55,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
                content->_first_video = 1.0 / 24.0;
                content->_audio_stream->first_audio = 0;
                FFmpegDecoder decoder (film, content, true, true);
-               BOOST_CHECK_EQUAL (decoder._video_pts_offset, 0);
-               BOOST_CHECK_EQUAL (decoder._audio_pts_offset, 0);
+               BOOST_CHECK_EQUAL (decoder._pts_offset, 0);
+               BOOST_CHECK_EQUAL (decoder._pts_offset, 0);
        }
 
        {
@@ -57,8 +65,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
                content->_first_video = frame + 0.0215;
                content->_audio_stream->first_audio = 0;
                FFmpegDecoder decoder (film, content, true, true);
-               BOOST_CHECK_EQUAL (decoder._video_pts_offset, (frame - 0.0215));
-               BOOST_CHECK_EQUAL (decoder._audio_pts_offset, (frame - 0.0215));
+               BOOST_CHECK_CLOSE (decoder._pts_offset, (frame - 0.0215), 0.00001);
+               BOOST_CHECK_CLOSE (decoder._pts_offset, (frame - 0.0215), 0.00001);
        }
 
        {
@@ -67,7 +75,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
                content->_first_video = frame + 0.0215 + 4.1;
                content->_audio_stream->first_audio = 4.1;
                FFmpegDecoder decoder (film, content, true, true);
-               BOOST_CHECK_EQUAL (decoder._video_pts_offset, (frame - 0.0215) - 4.1);
-               BOOST_CHECK_EQUAL (decoder._audio_pts_offset, (frame - 0.0215) - 4.1);
+               BOOST_CHECK_EQUAL (decoder._pts_offset, (frame - 0.0215) - 4.1);
+               BOOST_CHECK_EQUAL (decoder._pts_offset, (frame - 0.0215) - 4.1);
        }
 }