From 43b4e55710271c797b5d251c891047ed4da20e10 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 13 Jun 2013 21:24:56 +0100 Subject: [PATCH] Add somewhat empirical support for YUVJ42{0,2,4}P pixels. --- src/lib/image.cc | 14 +++++++++++--- test/make_black_test.cc | 6 ++++++ test/test.cc | 3 +++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/lib/image.cc b/src/lib/image.cc index bd527e91e..f28652d4e 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -273,11 +273,11 @@ void Image::make_black () { /* U/V black value for 8-bit colour */ - static uint8_t const eight_bit_uv = (1 << 7) - 1; + static uint8_t const eight_bit_uv = (1 << 7) - 1; /* U/V black value for 9-bit colour */ - static uint16_t const nine_bit_uv = (1 << 8) - 1; + static uint16_t const nine_bit_uv = (1 << 8) - 1; /* U/V black value for 10-bit colour */ - static uint16_t const ten_bit_uv = (1 << 9) - 1; + static uint16_t const ten_bit_uv = (1 << 9) - 1; /* U/V black value for 16-bit colour */ static uint16_t const sixteen_bit_uv = (1 << 15) - 1; @@ -290,6 +290,14 @@ Image::make_black () memset (data()[2], eight_bit_uv, lines(2) * stride()[2]); break; + case PIX_FMT_YUVJ420P: + case PIX_FMT_YUVJ422P: + case PIX_FMT_YUVJ444P: + memset (data()[0], 0, lines(0) * stride()[0]); + memset (data()[1], eight_bit_uv + 1, lines(1) * stride()[1]); + memset (data()[2], eight_bit_uv + 1, lines(2) * stride()[2]); + break; + case PIX_FMT_YUV422P9LE: case PIX_FMT_YUV444P9LE: yuv_16_black (nine_bit_uv); diff --git a/test/make_black_test.cc b/test/make_black_test.cc index 3c0b979ff..714621762 100644 --- a/test/make_black_test.cc +++ b/test/make_black_test.cc @@ -35,6 +35,9 @@ BOOST_AUTO_TEST_CASE (make_black_test) pix_fmts.push_back (AV_PIX_FMT_YUV444P10LE); pix_fmts.push_back (AV_PIX_FMT_YUV444P10BE); pix_fmts.push_back (AV_PIX_FMT_UYVY422); + pix_fmts.push_back (AV_PIX_FMT_YUVJ420P); + pix_fmts.push_back (AV_PIX_FMT_YUVJ422P); + pix_fmts.push_back (AV_PIX_FMT_YUVJ444P); int N = 0; for (list::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) { @@ -46,6 +49,9 @@ BOOST_AUTO_TEST_CASE (make_black_test) for (int y = 0; y < bar->size().height; ++y) { uint8_t* q = p; for (int x = 0; x < bar->line_size()[0]; ++x) { + if (*q != 0) { + std::cerr << "x=" << x << ", (x%3)=" << (x%3) << "\n"; + } BOOST_CHECK_EQUAL (*q++, 0); } p += bar->stride()[0]; diff --git a/test/test.cc b/test/test.cc index 91c876412..65b1f9056 100644 --- a/test/test.cc +++ b/test/test.cc @@ -62,6 +62,8 @@ struct TestConfig Config::instance()->set_servers (vector ()); Config::instance()->set_server_port (61920); Config::instance()->set_default_dci_metadata (DCIMetadata ()); + Config::instance()->set_default_format (static_cast (0)); + Config::instance()->set_default_dcp_content_type (static_cast (0)); } }; @@ -101,3 +103,4 @@ new_test_film (string name) #include "job_test.cc" #include "client_server_test.cc" #include "image_test.cc" + -- 2.30.2