Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/modules/core/filter_resize.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,17 @@ static uint8_t *frame_resize_image(mlt_frame frame, int owidth, int oheight, mlt
// Now update the frame
mlt_frame_set_image(frame, output, owidth * (oheight + 1) * bpp, mlt_pool_release);

// An opaque image without an alpha mask gets one, so that the padding can be
// transparent. This gives the same result as padding an rgba image, without
// converting the image to rgba and back.
if (format == mlt_image_yuv422 && !alpha
&& mlt_properties_get_int(properties, "fix_background_alpha")) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This creates an undocumented coupling between transtion_luma and filter_resize. And "fix_background_alpha" doesn't mean anything in this filter. Can you think of a different way to accomplish this? I wonder if we could just infer that the alpha should be created if resize_alpha != 255. In fact, if we did this, it would remove the need for the fix_background_alpha property on transition_luma.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, but the default for "resize_alpha" is 0 since it does not exist by default. Only certain things set it to 255. So, the logic should be to create the alpha if it does not exist and the "resize_alpha" property exists on the frame. And use the property value instead of hard-code 255 in the memset.

The "fix_background_alpha" property exists on transition luma to version the behavior. Are you saying that 3.5 years is long enough, and the fidelity of old projects no longer relevant?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the "fix" property has gone on lone enough. If there are old projects that currently do not set fix_background_alpha=1, then they are getting inconsistent results depending on whether an upstream service is requesting RGB or YUV. In my opinion, that is a bug that should be fixed.

Current Behavior:

  • If an upstream service is requesting RGB, then they are getting transparent alpha every time.
  • If an upstream service is requesting YUV, then they are getting opaque or transparent depending on fix_background_alpha.

Proposed Behavior:

  • The transition should operate on transparent background regardless of the format requested

That could be accomplished by always setting "resize_alpha=0" in the transition and then conditionally creating the alpha in filter_resize if the "resize_alpha" property exists and not 255.

alpha_size = iwidth * iheight;
alpha = mlt_pool_alloc(alpha_size);
memset(alpha, 255, alpha_size);
mlt_frame_set_alpha(frame, alpha, alpha_size, mlt_pool_release);
}

// We should resize the alpha too
if (format != mlt_image_rgba && alpha && alpha_size >= iwidth * iheight) {
alpha = resize_alpha(alpha, owidth, oheight, iwidth, iheight, alpha_value);
Expand Down
63 changes: 44 additions & 19 deletions src/modules/core/transition_luma.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,16 @@ static int dissolve_slice_yuv422(int id, int index, int count, void *context)
return 0;
}

// Gives a frame an opaque alpha mask, as converting it to rgba and back does.
static uint8_t *add_opaque_alpha(mlt_frame frame, int width, int height)
{
int size = width * height;
uint8_t *alpha = mlt_pool_alloc(size);
memset(alpha, 255, size);
mlt_frame_set_alpha(frame, alpha, size, mlt_pool_release);
return alpha;
}

static inline int dissolve_yuv422(mlt_frame frame,
mlt_frame that,
float weight,
Expand All @@ -140,27 +150,35 @@ static inline int dissolve_yuv422(mlt_frame frame,
int ret = 0;
int i = height + 1;
int width_src = width, height_src = height;
mlt_image_format format = (fix_background_alpha && mlt_frame_has_convert_image(frame))
? mlt_image_rgba
: mlt_image_yuv422;
mlt_image_format format = mlt_image_yuv422;
uint8_t *p_src, *p_dest;
uint8_t *alpha_src;
uint8_t *alpha_dst;
int mix = weight * (1 << 16);

if (fix_background_alpha) {
// Tell filter_resize to make the padding transparent (see filter_resize.c).
mlt_properties_set_int(MLT_FRAME_PROPERTIES(frame), "fix_background_alpha", 1);
mlt_properties_set_int(MLT_FRAME_PROPERTIES(that), "fix_background_alpha", 1);
}

mlt_frame_get_image(frame, &p_dest, &format, &width, &height, 1);
if (fix_background_alpha && mlt_frame_has_convert_image(frame))
mlt_frame_convert_image(frame, &p_dest, &format, mlt_image_yuv422);
alpha_dst = mlt_frame_get_alpha(frame);
if (fix_background_alpha && mlt_frame_has_convert_image(that))
format = mlt_image_rgba;
format = mlt_image_yuv422;
mlt_frame_get_image(that, &p_src, &format, &width_src, &height_src, 0);
if (mlt_frame_has_convert_image(that))
mlt_frame_convert_image(that, &p_src, &format, mlt_image_yuv422);
alpha_src = mlt_frame_get_alpha(that);
int is_translucent = (alpha_dst && !is_opaque(alpha_dst, width, height))
|| (alpha_src && !is_opaque(alpha_src, width_src, height_src));

// An opaque frame without an alpha mask must get one when the other frame is
// translucent, so that the alpha of the result is computed (see alpha_over).
if (fix_background_alpha && is_translucent) {
if (!alpha_dst)
alpha_dst = add_opaque_alpha(frame, width, height);
if (!alpha_src)
alpha_src = add_opaque_alpha(that, width_src, height_src);
}

// Pick the lesser of two evils ;-)
width_src = width_src > width ? width : width_src;
height_src = height_src > height ? height : height_src;
Expand Down Expand Up @@ -341,29 +359,27 @@ static void luma_composite_yuv422(mlt_frame a_frame,
{
int width_src = *width, height_src = *height;
int width_dest = *width, height_dest = *height;
mlt_image_format format_src = (fix_background_alpha && mlt_frame_has_convert_image(a_frame))
? mlt_image_rgba
: mlt_image_yuv422;
mlt_image_format format_dest = (fix_background_alpha && mlt_frame_has_convert_image(b_frame))
? mlt_image_rgba
: mlt_image_yuv422;
mlt_image_format format_src = mlt_image_yuv422;
mlt_image_format format_dest = mlt_image_yuv422;
uint8_t *p_src, *p_dest;
uint8_t *alpha_src, *alpha_dest;
int i, j;
int stride_src;
int stride_dest;

if (fix_background_alpha) {
// Tell filter_resize to make the padding transparent (see filter_resize.c).
mlt_properties_set_int(MLT_FRAME_PROPERTIES(a_frame), "fix_background_alpha", 1);
mlt_properties_set_int(MLT_FRAME_PROPERTIES(b_frame), "fix_background_alpha", 1);
}

if (mlt_properties_get(&a_frame->parent, "distort"))
mlt_properties_set(&b_frame->parent,
"distort",
mlt_properties_get(&a_frame->parent, "distort"));
mlt_frame_get_image(a_frame, &p_dest, &format_dest, &width_dest, &height_dest, 1);
if (fix_background_alpha && mlt_frame_has_convert_image(a_frame))
mlt_frame_convert_image(a_frame, &p_dest, &format_dest, mlt_image_yuv422);
alpha_dest = mlt_frame_get_alpha(a_frame);
mlt_frame_get_image(b_frame, &p_src, &format_src, &width_src, &height_src, 0);
if (fix_background_alpha && mlt_frame_has_convert_image(b_frame))
mlt_frame_convert_image(b_frame, &p_src, &format_src, mlt_image_yuv422);
alpha_src = mlt_frame_get_alpha(b_frame);

if (*width == 0 || *height == 0)
Expand All @@ -372,6 +388,15 @@ static void luma_composite_yuv422(mlt_frame a_frame,
int is_translucent = (alpha_dest && !is_opaque(alpha_dest, width_dest, height_dest))
|| (alpha_src && !is_opaque(alpha_src, width_src, height_src));

// An opaque frame without an alpha mask must get one when the other frame is
// translucent, so that the alpha of the result is computed (see alpha_over).
if (fix_background_alpha && is_translucent) {
if (!alpha_dest)
alpha_dest = add_opaque_alpha(a_frame, width_dest, height_dest);
if (!alpha_src)
alpha_src = add_opaque_alpha(b_frame, width_src, height_src);
}

// Pick the lesser of two evils ;-)
width_src = width_src > width_dest ? width_dest : width_src;
height_src = height_src > height_dest ? height_dest : height_src;
Expand Down