mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-24 02:31:03 +00:00
surface: use unscaled overlay rectangle for blending.
This commit is contained in:
parent
010f94b85d
commit
b014567502
1 changed files with 27 additions and 11 deletions
|
@ -836,26 +836,42 @@ gst_vaapi_surface_update_composition(
|
||||||
for (n = 0; n < nb_rectangles; ++n) {
|
for (n = 0; n < nb_rectangles; ++n) {
|
||||||
GstBuffer *buf;
|
GstBuffer *buf;
|
||||||
GstVideoOverlayRectangle *rect;
|
GstVideoOverlayRectangle *rect;
|
||||||
guint stride;
|
guint width, height, stride;
|
||||||
|
GstVaapiImageFormat format;
|
||||||
GstVaapiImage *subtitle_image;
|
GstVaapiImage *subtitle_image;
|
||||||
GstVaapiRectangle sub_rect;
|
GstVaapiRectangle sub_rect;
|
||||||
GstVaapiSubpicture *subpicture;
|
GstVaapiSubpicture *subpicture;
|
||||||
|
GstVaapiImageRaw raw_image;
|
||||||
|
|
||||||
rect = gst_video_overlay_composition_get_rectangle (composition, n);
|
rect = gst_video_overlay_composition_get_rectangle (composition, n);
|
||||||
buf = gst_video_overlay_rectangle_get_pixels_argb (rect,
|
buf = gst_video_overlay_rectangle_get_pixels_unscaled_argb (rect,
|
||||||
&stride, GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE);
|
&width, &height, &stride, GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE);
|
||||||
|
|
||||||
|
/* XXX: use gst_vaapi_image_format_from_video() */
|
||||||
|
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
|
||||||
|
format = GST_VAAPI_IMAGE_BGRA;
|
||||||
|
#else
|
||||||
|
format = GST_VAAPI_IMAGE_ARGB;
|
||||||
|
#endif
|
||||||
|
subtitle_image = gst_vaapi_image_new (display, format, width, height);
|
||||||
|
if (!subtitle_image)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
raw_image.format = format;
|
||||||
|
raw_image.width = width;
|
||||||
|
raw_image.height = height;
|
||||||
|
raw_image.num_planes = 1;
|
||||||
|
raw_image.pixels[0] = GST_BUFFER_DATA(buf);
|
||||||
|
raw_image.stride[0] = stride;
|
||||||
|
if (!gst_vaapi_image_update_from_raw (subtitle_image, &raw_image, NULL)) {
|
||||||
|
GST_WARNING ("could not update VA image with subtitle data");
|
||||||
|
g_object_unref (subtitle_image);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
gst_video_overlay_rectangle_get_render_rectangle (rect,
|
gst_video_overlay_rectangle_get_render_rectangle (rect,
|
||||||
(gint *)&sub_rect.x, (gint *)&sub_rect.y,
|
(gint *)&sub_rect.x, (gint *)&sub_rect.y,
|
||||||
&sub_rect.width, &sub_rect.height);
|
&sub_rect.width, &sub_rect.height);
|
||||||
subtitle_image = gst_vaapi_image_new (display,
|
|
||||||
GST_VAAPI_IMAGE_RGBA, sub_rect.width, sub_rect.height);
|
|
||||||
|
|
||||||
if (!gst_vaapi_image_update_from_buffer (subtitle_image, buf, &sub_rect)) {
|
|
||||||
GST_WARNING ("could not update VA image with subtitle data");
|
|
||||||
g_object_unref (subtitle_image);
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
subpicture = gst_vaapi_subpicture_new (subtitle_image);
|
subpicture = gst_vaapi_subpicture_new (subtitle_image);
|
||||||
g_object_unref (subtitle_image);
|
g_object_unref (subtitle_image);
|
||||||
|
|
Loading…
Reference in a new issue