X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fpixel_formats_test.cc;h=da675f5a8535791aa321d168909b9b07a5e5dbff;hb=ccbe9126407eb31abaf991c39bcac6d3aec1b852;hp=e8ad725ff5f85b83cbfa7152eefabecd97051b51;hpb=fdd63a4c9925f0339089dce3a52f0d6ed0d97880;p=dcpomatic.git

diff --git a/test/pixel_formats_test.cc b/test/pixel_formats_test.cc
index e8ad725ff..da675f5a8 100644
--- a/test/pixel_formats_test.cc
+++ b/test/pixel_formats_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,14 +17,33 @@
 
 */
 
+/** @file  src/pixel_formats_test.cc
+ *  @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
+ */
+
+#include <boost/test/unit_test.hpp>
+#include <list>
+extern "C" {
+#include <libavutil/pixfmt.h>
+#include <libavcodec/avcodec.h>
+}
+#include "lib/image.h"
+#include <iostream>
+
 using std::list;
 using std::cout;
 
+/** @struct Case
+ *  @brief  A test case for pixel_formats_test.
+ */
 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;
@@ -33,9 +52,9 @@ struct Case
 		bpp[1] = b1;
 		bpp[2] = b2;
 	}
-	
+
 	AVPixelFormat format;
-	int components;
+	int planes;
 	int lines[3];
 	float bpp[3];
 };
@@ -43,9 +62,6 @@ struct Case
 
 BOOST_AUTO_TEST_CASE (pixel_formats_test)
 {
-	/* This needs to happen in the first test */
-	dvdomatic_setup ();
-
 	list<Case> cases;
 	cases.push_back(Case(AV_PIX_FMT_RGB24,       1, 480, 480, 480, 3, 0,   0  ));
 	cases.push_back(Case(AV_PIX_FMT_RGBA,        1, 480, 480, 480, 4, 0,   0  ));
@@ -65,11 +81,12 @@ BOOST_AUTO_TEST_CASE (pixel_formats_test)
 		f->width = 640;
 		f->height = 480;
 		f->format = static_cast<int> (i->format);
-		FrameImage t (f, true);
-		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]);
+		av_frame_get_buffer (f, true);
+		Image t (f);
+		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]);