From fbaade900b1479fafe54bbbe904cf8483a577e94 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 10 Dec 2023 21:53:38 +0100 Subject: [PATCH] Run premultiply filter on still images that have alpha channels (more of #2681). --- src/lib/ffmpeg_image_proxy.cc | 16 +++++++++++++++- test/data | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc index f513eef2d..2fcd486df 100644 --- a/src/lib/ffmpeg_image_proxy.cc +++ b/src/lib/ffmpeg_image_proxy.cc @@ -27,6 +27,7 @@ #include "ffmpeg_image_proxy.h" #include "image.h" #include "memory_util.h" +#include "video_filter_graph.h" #include #include LIBDCP_DISABLE_WARNINGS @@ -206,7 +207,20 @@ FFmpegImageProxy::image (Image::Alignment alignment, optional) const throw DecodeError (N_("avcodec_receive_frame"), name_for_errors, r, *_path); } - _image = make_shared(frame, alignment); + if (av_pix_fmt_desc_get(context->pix_fmt)->flags & AV_PIX_FMT_FLAG_ALPHA) { + /* XXX: this repeated setup of a the filter graph could be really slow + * (haven't measured it though). + */ + VideoFilterGraph graph(dcp::Size(frame->width, frame->height), context->pix_fmt, dcp::Fraction(24, 1)); + auto filter = Filter::from_id("premultiply"); + DCPOMATIC_ASSERT(filter); + graph.setup({*filter}); + auto images = graph.process(frame); + DCPOMATIC_ASSERT(images.size() == 1); + _image = images.front().first; + } else { + _image = make_shared(frame, alignment); + } av_packet_unref (&packet); av_frame_free (&frame); diff --git a/test/data b/test/data index c40dcfabf..154eb8c75 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit c40dcfabfccce346822a662012fa86814206d6a8 +Subproject commit 154eb8c751e43e350dac04943dc48e6ab7f9c98f -- 2.30.2