diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-04-22 15:35:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-04-22 15:35:34 +0100 |
| commit | 9c9890b9ff89af710db21145c03a09993c629e3e (patch) | |
| tree | 9e96f24e230c7d75a3d0adeff4137e6d8305c710 /test/image_test.cc | |
| parent | 78c599cd7447ecfa33cc9f223d4fc6ba8b3879af (diff) | |
Actually use YUV->RGB setting when converting.
Diffstat (limited to 'test/image_test.cc')
| -rw-r--r-- | test/image_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/image_test.cc b/test/image_test.cc index b622b250d..9aca9878d 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE (crop_image_test2) image = image->crop (crop, true); /* Convert it back to RGB to make comparison to black easier */ - image = image->scale (image->size(), PIX_FMT_RGB24, true); + image = image->scale (image->size(), dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true); /* Check that its still black after the crop */ uint8_t* p = image->data()[0]; @@ -250,13 +250,13 @@ crop_scale_window_single (AVPixelFormat in_format, dcp::Size in_size, Crop crop, /* Convert using separate methods */ boost::shared_ptr<Image> sep = test->crop (crop, true); - sep = sep->scale (inter_size, PIX_FMT_RGB24, true); + sep = sep->scale (inter_size, dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true); boost::shared_ptr<Image> sep_container (new Image (PIX_FMT_RGB24, out_size, true)); sep_container->make_black (); sep_container->copy (sep, Position<int> ((out_size.width - inter_size.width) / 2, (out_size.height - inter_size.height) / 2)); /* Convert using the all-in-one method */ - shared_ptr<Image> all = test->crop_scale_window (crop, inter_size, out_size, PIX_FMT_RGB24, true); + shared_ptr<Image> all = test->crop_scale_window (crop, inter_size, out_size, dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true); /* Compare */ BOOST_CHECK_EQUAL (sep_container->size().width, all->size().width); |