Add VideoFrame class.

This puts a frame index with an Eyes, which simplifies code in
some areas.  I can't think of a better name for it,
unfortunately.

4 files changed, 14 insertions, 14 deletions

diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index 93c447591..8a854b01b 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -49,7 +49,7 @@ check (shared_ptr<FFmpegDecoder> decoder, int frame)
 	list<ContentVideo> v;
 	v = decoder->video->get (frame, true);
 	BOOST_CHECK (v.size() == 1);
-	BOOST_CHECK_EQUAL (v.front().frame, frame);
+	BOOST_CHECK_EQUAL (v.front().frame.index(), frame);
 }
 
 static void
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 7435a4af0..6a27d698f 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -66,7 +66,7 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
 		list<ContentVideo> v;
 		v = decoder->video->get (i, true);
 		BOOST_REQUIRE_EQUAL (v.size(), 1U);
-		BOOST_CHECK_EQUAL (v.front().frame, i);
+		BOOST_CHECK_EQUAL (v.front().frame.index(), i);
 	}
 #ifdef DCPOMATIC_DEBUG
 	BOOST_CHECK_EQUAL (decoder->video->test_gaps, gaps);
diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index f1f137d38..05bf1b5bf 100644
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -67,5 +67,5 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
 	FFmpegDecoder decoder (content, film->log(), false);
 	list<ContentVideo> a = decoder.video->get (first_frame, true);
 	BOOST_CHECK (a.size() == 1);
-	BOOST_CHECK_EQUAL (a.front().frame, first_frame);
+	BOOST_CHECK_EQUAL (a.front().frame.index(), first_frame);
 }
diff --git a/test/video_decoder_fill_test.cc b/test/video_decoder_fill_test.cc
index 737bc883c..2d783f52d 100644
--- a/test/video_decoder_fill_test.cc
+++ b/test/video_decoder_fill_test.cc
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test1)
 	BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 4U);
 	list<ContentVideo>::iterator i = decoder.video->_decoded.begin();
 	for (int j = 0; j < 4; ++j) {
-		BOOST_CHECK_EQUAL (i->frame, j);
+		BOOST_CHECK_EQUAL (i->frame.index(), j);
 		++i;
 	}
 
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test1)
 	BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 7);
 	i = decoder.video->_decoded.begin();
 	for (int j = 0; j < 7; ++j) {
-		BOOST_CHECK_EQUAL (i->frame, j);
+		BOOST_CHECK_EQUAL (i->frame.index(), j);
 		++i;
 	}
 }
@@ -62,32 +62,32 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test2)
 	shared_ptr<ImageContent> c (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
 	ImageDecoder decoder (c, film->log());
 
-	decoder.video->fill_both_eyes (0, EYES_LEFT, 4, EYES_LEFT);
+	decoder.video->fill_both_eyes (VideoFrame (0, EYES_LEFT), VideoFrame (4, EYES_LEFT));
 	BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 8);
 	list<ContentVideo>::iterator i = decoder.video->_decoded.begin();
 	for (int j = 0; j < 8; ++j) {
-		BOOST_CHECK_EQUAL (i->frame, j / 2);
-		BOOST_CHECK_EQUAL (i->eyes, (j % 2) == 0 ? EYES_LEFT : EYES_RIGHT);
+		BOOST_CHECK_EQUAL (i->frame.index(), j / 2);
+		BOOST_CHECK_EQUAL (i->frame.eyes(), (j % 2) == 0 ? EYES_LEFT : EYES_RIGHT);
 		++i;
 	}
 
 	decoder.video->_decoded.clear ();
-	decoder.video->fill_both_eyes (0, EYES_LEFT, 7, EYES_RIGHT);
+	decoder.video->fill_both_eyes (VideoFrame (0, EYES_LEFT), VideoFrame (7, EYES_RIGHT));
 	BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 15);
 	i = decoder.video->_decoded.begin();
 	for (int j = 0; j < 15; ++j) {
-		BOOST_CHECK_EQUAL (i->frame, j / 2);
-		BOOST_CHECK_EQUAL (i->eyes, (j % 2) == 0 ? EYES_LEFT : EYES_RIGHT);
+		BOOST_CHECK_EQUAL (i->frame.index(), j / 2);
+		BOOST_CHECK_EQUAL (i->frame.eyes(), (j % 2) == 0 ? EYES_LEFT : EYES_RIGHT);
 		++i;
 	}
 
 	decoder.video->_decoded.clear ();
-	decoder.video->fill_both_eyes (0, EYES_RIGHT, 7, EYES_RIGHT);
+	decoder.video->fill_both_eyes (VideoFrame (0, EYES_RIGHT), VideoFrame (7, EYES_RIGHT));
 	BOOST_CHECK_EQUAL (decoder.video->_decoded.size(), 14);
 	i = decoder.video->_decoded.begin();
 	for (int j = 0; j < 14; ++j) {
-		BOOST_CHECK_EQUAL (i->frame, (j + 1) / 2);
-		BOOST_CHECK_EQUAL (i->eyes, (j % 2) == 0 ? EYES_RIGHT : EYES_LEFT);
+		BOOST_CHECK_EQUAL (i->frame.index(), (j + 1) / 2);
+		BOOST_CHECK_EQUAL (i->frame.eyes(), (j % 2) == 0 ? EYES_RIGHT : EYES_LEFT);
 		++i;
 	}
 }