diff options
| -rwxr-xr-x | run/tests | 2 | ||||
| -rw-r--r-- | src/lib/image.cc | 5 | ||||
| -rw-r--r-- | test/image_test.cc | 2 |
3 files changed, 6 insertions, 3 deletions
@@ -3,7 +3,7 @@ # e.g. --run_tests=foo set -e -PRIVATE_GIT="26097a7868332dec4175328cb9a9a793fe6d287f" +PRIVATE_GIT="6907609af727a53bbdc2a967eede4e167a978f92" if [ "$1" == "--check" ]; then shift 1 diff --git a/src/lib/image.cc b/src/lib/image.cc index 6feea10ca..2588d9f21 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -862,7 +862,7 @@ alpha_blend_onto_yuv420p10(TargetParams const& target, OtherParams const& other, static void -alpha_blend_onto_yuv422p10le(TargetParams const& target, OtherParams const& other, uint8_t* const* alpha_data, int const* alpha_stride) +alpha_blend_onto_yuv422p9or10le(TargetParams const& target, OtherParams const& other, uint8_t* const* alpha_data, int const* alpha_stride) { auto const ts = target.size; auto const os = other.size; @@ -1006,12 +1006,13 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position) alpha_blend_onto_yuv420p10(target_params, other_params, other->data(), other->stride()); break; } + case AV_PIX_FMT_YUV422P9LE: case AV_PIX_FMT_YUV422P10LE: { auto yuv = other->convert_pixel_format (dcp::YUVToRGB::REC709, _pixel_format, Alignment::COMPACT, false); other_params.data = yuv->data(); other_params.stride = yuv->stride(); - alpha_blend_onto_yuv422p10le(target_params, other_params, other->data(), other->stride()); + alpha_blend_onto_yuv422p9or10le(target_params, other_params, other->data(), other->stride()); break; } default: diff --git a/test/image_test.cc b/test/image_test.cc index 77ee7d898..899961f50 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -242,6 +242,7 @@ BOOST_AUTO_TEST_CASE (alpha_blend_test) alpha_blend_test_bgra_onto(AV_PIX_FMT_RGB48LE, "rgb48le"); alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV420P, "yuv420p"); alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV420P10, "yuv420p10"); + alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV422P10LE, "yuv422p9le"); alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV422P10LE, "yuv422p10le"); alpha_blend_test_rgba64be_onto(AV_PIX_FMT_RGB24, "rgb24"); @@ -250,6 +251,7 @@ BOOST_AUTO_TEST_CASE (alpha_blend_test) alpha_blend_test_rgba64be_onto(AV_PIX_FMT_RGB48LE, "rgb48le"); alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV420P, "yuv420p"); alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV420P10, "yuv420p10"); + alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV422P10LE, "yuv422p9le"); alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV422P10LE, "yuv422p10le"); } |