Add video waveform viewer.

3 files changed, 14 insertions, 14 deletions

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index e326e00fb..db198e79c 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 	shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
 	uint8_t* p = image->data()[0];
 
-	for (int i = 0; i < image->components(); ++i) {
+	for (int i = 0; i < image->planes(); ++i) {
 		uint8_t* p = image->data()[i];
 		for (int j = 0; j < image->line_size()[i]; ++j) {
 			*p++ = j % 256;
diff --git a/test/image_test.cc b/test/image_test.cc
index cb1aa35d7..65a6c5ca7 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -35,7 +35,7 @@ using boost::shared_ptr;
 BOOST_AUTO_TEST_CASE (aligned_image_test)
 {
 	Image* s = new Image (PIX_FMT_RGB24, dcp::Size (50, 50), true);
-	BOOST_CHECK_EQUAL (s->components(), 1);
+	BOOST_CHECK_EQUAL (s->planes(), 1);
 	/* 160 is 150 aligned to the nearest 32 bytes */
 	BOOST_CHECK_EQUAL (s->stride()[0], 160);
 	BOOST_CHECK_EQUAL (s->line_size()[0], 150);
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 
 	/* copy constructor */
 	Image* t = new Image (*s);
-	BOOST_CHECK_EQUAL (t->components(), 1);
+	BOOST_CHECK_EQUAL (t->planes(), 1);
 	BOOST_CHECK_EQUAL (t->stride()[0], 160);
 	BOOST_CHECK_EQUAL (t->line_size()[0], 150);
 	BOOST_CHECK (t->data()[0]);
@@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 	/* assignment operator */
 	Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), false);
 	*u = *s;
-	BOOST_CHECK_EQUAL (u->components(), 1);
+	BOOST_CHECK_EQUAL (u->planes(), 1);
 	BOOST_CHECK_EQUAL (u->stride()[0], 160);
 	BOOST_CHECK_EQUAL (u->line_size()[0], 150);
 	BOOST_CHECK (u->data()[0]);
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 BOOST_AUTO_TEST_CASE (compact_image_test)
 {
 	Image* s = new Image (PIX_FMT_RGB24, dcp::Size (50, 50), false);
-	BOOST_CHECK_EQUAL (s->components(), 1);
+	BOOST_CHECK_EQUAL (s->planes(), 1);
 	BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3);
 	BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3);
 	BOOST_CHECK (s->data()[0]);
@@ -95,7 +95,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 
 	/* copy constructor */
 	Image* t = new Image (*s);
-	BOOST_CHECK_EQUAL (t->components(), 1);
+	BOOST_CHECK_EQUAL (t->planes(), 1);
 	BOOST_CHECK_EQUAL (t->stride()[0], 50 * 3);
 	BOOST_CHECK_EQUAL (t->line_size()[0], 50 * 3);
 	BOOST_CHECK (t->data()[0]);
@@ -112,7 +112,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 	/* assignment operator */
 	Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), true);
 	*u = *s;
-	BOOST_CHECK_EQUAL (u->components(), 1);
+	BOOST_CHECK_EQUAL (u->planes(), 1);
 	BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3);
 	BOOST_CHECK_EQUAL (u->line_size()[0], 50 * 3);
 	BOOST_CHECK (u->data()[0]);
diff --git a/test/pixel_formats_test.cc b/test/pixel_formats_test.cc
index f99bd717c..a104e620b 100644
--- a/test/pixel_formats_test.cc
+++ b/test/pixel_formats_test.cc
@@ -18,7 +18,7 @@
 */
 
 /** @file  src/pixel_formats_test.cc
- *  @brief Make sure that Image::lines() and Image::bytes_per_pixel() return the right
+ *  @brief Make sure that Image::sample_size() and Image::bytes_per_pixel() return the right
  *  things for various pixel formats.
  *
  *  @see test/image_test.cc
@@ -42,7 +42,7 @@ struct Case
 {
 	Case (AVPixelFormat f, int c, int l0, int l1, int l2, float b0, float b1, float b2)
 		: format(f)
-		, components(c)
+		, planes(c)
 	{
 		lines[0] = l0;
 		lines[1] = l1;
@@ -53,7 +53,7 @@ struct Case
 	}
 
 	AVPixelFormat format;
-	int components;
+	int planes;
 	int lines[3];
 	float bpp[3];
 };
@@ -82,10 +82,10 @@ BOOST_AUTO_TEST_CASE (pixel_formats_test)
 		f->format = static_cast<int> (i->format);
 		av_frame_get_buffer (f, true);
 		Image t (f);
-		BOOST_CHECK_EQUAL(t.components(), i->components);
-		BOOST_CHECK_EQUAL(t.lines(0), i->lines[0]);
-		BOOST_CHECK_EQUAL(t.lines(1), i->lines[1]);
-		BOOST_CHECK_EQUAL(t.lines(2), i->lines[2]);
+		BOOST_CHECK_EQUAL(t.planes(), i->planes);
+		BOOST_CHECK_EQUAL(t.sample_size(0).height, i->lines[0]);
+		BOOST_CHECK_EQUAL(t.sample_size(1).height, i->lines[1]);
+		BOOST_CHECK_EQUAL(t.sample_size(2).height, i->lines[2]);
 		BOOST_CHECK_EQUAL(t.bytes_per_pixel(0), i->bpp[0]);
 		BOOST_CHECK_EQUAL(t.bytes_per_pixel(1), i->bpp[1]);
 		BOOST_CHECK_EQUAL(t.bytes_per_pixel(2), i->bpp[2]);