mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 08:17:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapioverlay: inline sinkpad scaling support

Browse source 
Often, users will need to scale inputs (e.g.
with vaapipostproc) before they are submitted
to the vaapioverlay.  However, this results in
multiple VPP passes/operations in the pipeline
which creates unnecessary process overhead.

This change allows for inputs to be submitted
at original scale to vaapioverlay with per-sinkpad
scale dimensions specified so they can be scaled
and blended/composited in a single VPP pass/operation
to avoid the unnecessary process overhead.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1380>
This commit is contained in:
Haihao Xiang 2021-11-19 18:47:24 -08:00 committed by U. Artie Eoff
parent 48b6404f8e
commit 55ceddff91
3 changed files with 41 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapiblend.c
View file

@ -273,6 +273,7 @@ gst_vaapi_blend_process_unlocked (GstVaapiBlend * blend,
param->surface_region = &src_rect;
param->output_region = &dst_rect;
param->output_background_color = 0xff000000;
param->filter_flags = VA_FILTER_SCALING_DEFAULT;
#if VA_CHECK_VERSION(1,1,0)
if (current->alpha < 1.0) {

43
subprojects/gstreamer-vaapi/gst/vaapi/gstvaapioverlay.c
View file

@ -98,6 +98,8 @@ struct _GstVaapiOverlaySurfaceGenerator
#define DEFAULT_PAD_XPOS 0
#define DEFAULT_PAD_YPOS 0
#define DEFAULT_PAD_ALPHA 1.0
#define DEFAULT_PAD_WIDTH 0
#define DEFAULT_PAD_HEIGHT 0
enum
{
@ -105,6 +107,8 @@ enum
PROP_PAD_XPOS,
PROP_PAD_YPOS,
PROP_PAD_ALPHA,
PROP_PAD_WIDTH,
PROP_PAD_HEIGHT,
};
static void
@ -123,6 +127,12 @@ gst_vaapi_overlay_sink_pad_get_property (GObject * object, guint prop_id,
case PROP_PAD_ALPHA:
g_value_set_double (value, pad->alpha);
break;
case PROP_PAD_WIDTH:
g_value_set_int (value, pad->width);
break;
case PROP_PAD_HEIGHT:
g_value_set_int (value, pad->height);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -145,6 +155,12 @@ gst_vaapi_overlay_sink_pad_set_property (GObject * object, guint prop_id,
case PROP_PAD_ALPHA:
pad->alpha = g_value_get_double (value);
break;
case PROP_PAD_WIDTH:
pad->width = g_value_get_int (value);
break;
case PROP_PAD_HEIGHT:
pad->height = g_value_get_int (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -180,6 +196,16 @@ gst_vaapi_overlay_sink_pad_class_init (GstVaapiOverlaySinkPadClass * klass)
g_param_spec_double ("alpha", "Alpha", "Alpha of the picture", 0.0, 1.0,
DEFAULT_PAD_ALPHA,
G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_PAD_WIDTH,
g_param_spec_int ("width", "Width",
"Width of the picture (0, to use the width of the input frame)",
0, G_MAXINT, DEFAULT_PAD_WIDTH,
G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_PAD_HEIGHT,
g_param_spec_int ("height", "Height",
"Height of the picture (0, to use the height of the input frame)",
0, G_MAXINT, DEFAULT_PAD_HEIGHT,
G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS));
}
static void
@ -188,6 +214,8 @@ gst_vaapi_overlay_sink_pad_init (GstVaapiOverlaySinkPad * pad)
pad->xpos = DEFAULT_PAD_XPOS;
pad->ypos = DEFAULT_PAD_YPOS;
pad->alpha = DEFAULT_PAD_ALPHA;
pad->width = DEFAULT_PAD_WIDTH;
pad->height = DEFAULT_PAD_HEIGHT;
pad->priv = gst_vaapi_pad_private_new ();
}
@ -404,8 +432,10 @@ gst_vaapi_overlay_surface_next (gpointer data)
blend_surface->crop = gst_vaapi_video_meta_get_render_rect (inbuf_meta);
blend_surface->target.x = pad->xpos;
blend_surface->target.y = pad->ypos;
blend_surface->target.width = GST_VIDEO_FRAME_WIDTH (inframe);
blend_surface->target.height = GST_VIDEO_FRAME_HEIGHT (inframe);
blend_surface->target.width = (pad->width == DEFAULT_PAD_WIDTH)
? GST_VIDEO_FRAME_WIDTH (inframe) : pad->width;
blend_surface->target.height = (pad->height == DEFAULT_PAD_HEIGHT)
? GST_VIDEO_FRAME_HEIGHT (inframe) : pad->height;
blend_surface->alpha = pad->alpha;
}
@ -524,8 +554,13 @@ gst_vaapi_overlay_fixate_src_caps (GstAggregator * agg, GstCaps * caps)
fps_n = GST_VIDEO_INFO_FPS_N (&vaggpad->info);
fps_d = GST_VIDEO_INFO_FPS_D (&vaggpad->info);
this_width = GST_VIDEO_INFO_WIDTH (&vaggpad->info) + MAX (pad->xpos, 0);
this_height = GST_VIDEO_INFO_HEIGHT (&vaggpad->info) + MAX (pad->ypos, 0);
this_width = (pad->width == DEFAULT_PAD_WIDTH)
? GST_VIDEO_INFO_WIDTH (&vaggpad->info) : pad->width;
this_height = (pad->height == DEFAULT_PAD_HEIGHT)
? GST_VIDEO_INFO_HEIGHT (&vaggpad->info) : pad->height;
this_width += MAX (pad->xpos, 0);
this_height += MAX (pad->ypos, 0);
if (best_width < this_width)
best_width = this_width;

1
subprojects/gstreamer-vaapi/gst/vaapi/gstvaapioverlay.h
View file

@ -79,6 +79,7 @@ struct _GstVaapiOverlaySinkPad
GstVideoAggregatorPad parent_instance;
gint xpos, ypos;
gint width, height;
gdouble alpha;
GstVaapiPadPrivate *priv;