videoaggregator: drop ABI compat in padding for new struct member
Don't really have to do that while it's in -bad and most users are in-tree anyway.
This commit is contained in:
parent
a9ffba8ce5
commit
dd7a90c48e
@ -521,7 +521,7 @@ gst_video_aggregator_find_best_format (GstVideoAggregator * vagg,
|
|||||||
GINT_TO_POINTER (format_number));
|
GINT_TO_POINTER (format_number));
|
||||||
|
|
||||||
/* If that pad is the first with alpha, set it as the new best format */
|
/* If that pad is the first with alpha, set it as the new best format */
|
||||||
if (!need_alpha && (pad->ABI.needs_alpha
|
if (!need_alpha && (pad->needs_alpha
|
||||||
&& (!GST_VIDEO_FORMAT_INFO_HAS_ALPHA (pad->info.finfo)))) {
|
&& (!GST_VIDEO_FORMAT_INFO_HAS_ALPHA (pad->info.finfo)))) {
|
||||||
need_alpha = TRUE;
|
need_alpha = TRUE;
|
||||||
/* Just fallback to ARGB in case we require alpha but the input pad
|
/* Just fallback to ARGB in case we require alpha but the input pad
|
||||||
|
@ -68,14 +68,14 @@ struct _GstVideoAggregatorPad
|
|||||||
guint zorder;
|
guint zorder;
|
||||||
gboolean ignore_eos;
|
gboolean ignore_eos;
|
||||||
|
|
||||||
|
/* Subclasses can force an alpha channel in the (input thus output)
|
||||||
|
* colorspace format */
|
||||||
|
gboolean needs_alpha;
|
||||||
|
|
||||||
/* < private > */
|
/* < private > */
|
||||||
GstVideoAggregatorPadPrivate *priv;
|
GstVideoAggregatorPadPrivate *priv;
|
||||||
union {
|
|
||||||
/* Subclasses can force an alpha channel in the (input thus output)
|
gpointer _gst_reserved[GST_PADDING];
|
||||||
* colorspace format */
|
|
||||||
gboolean needs_alpha;
|
|
||||||
gpointer _gst_reserved[GST_PADDING];
|
|
||||||
} ABI;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -195,7 +195,7 @@ gst_compositor_pad_set_property (GObject * object, guint prop_id,
|
|||||||
break;
|
break;
|
||||||
case PROP_PAD_CROSSFADE_RATIO:
|
case PROP_PAD_CROSSFADE_RATIO:
|
||||||
pad->crossfade = g_value_get_double (value);
|
pad->crossfade = g_value_get_double (value);
|
||||||
GST_VIDEO_AGGREGATOR_PAD (pad)->ABI.needs_alpha = pad->crossfade >= 0.0f;
|
GST_VIDEO_AGGREGATOR_PAD (pad)->needs_alpha = pad->crossfade >= 0.0f;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user