system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 05:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

winegstreamer: Return void from align_video_info_planes.

Browse source 
Some older GStreamer versions return void from gst_video_info_align.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
This commit is contained in:
Rémi Bernon 2022-06-07 08:35:19 +02:00 committed by Alexandre Julliard
parent 4ecf938d67
commit 9f3eb4b7f0
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dlls/winegstreamer/wg_transform.c
View file

@ -70,7 +70,7 @@ static bool is_caps_video(GstCaps *caps)
return g_str_has_prefix(media_type, "video/");
}
static bool align_video_info_planes(gsize plane_align, GstVideoInfo *info, GstVideoAlignment *align)
static void align_video_info_planes(gsize plane_align, GstVideoInfo *info, GstVideoAlignment *align)
{
gst_video_alignment_reset(align);
@ -81,7 +81,7 @@ static bool align_video_info_planes(gsize plane_align, GstVideoInfo *info, GstVi
align->stride_align[2] = plane_align;
align->stride_align[3] = plane_align;
return gst_video_info_align(info, align);
gst_video_info_align(info, align);
}
static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer)
@ -130,10 +130,11 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery
break;
if (!gst_video_info_from_caps(&info, caps)
|| !align_video_info_planes(plane_align, &info, &align)
|| !(pool = gst_video_buffer_pool_new()))
break;
align_video_info_planes(plane_align, &info, &align);
if ((params = gst_structure_new("video-meta",
"padding-top", G_TYPE_UINT, align.padding_top,
"padding-bottom", G_TYPE_UINT, align.padding_bottom,
@ -546,11 +547,8 @@ static bool copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_alig
}
dst_info = src_info;
if (!align_video_info_planes(plane_align, &dst_info, &align))
{
GST_ERROR("Failed to align video info.");
return false;
}
align_video_info_planes(plane_align, &dst_info, &align);
if (sample->max_size < dst_info.size)
{
GST_ERROR("Output buffer is too small.");
@ -703,9 +701,10 @@ NTSTATUS wg_transform_read_data(void *args)
wg_format_from_caps(format, output_caps);
if (format->major_type == WG_MAJOR_TYPE_VIDEO
&& gst_video_info_from_caps(&info, output_caps)
&& align_video_info_planes(plane_align, &info, &align))
&& gst_video_info_from_caps(&info, output_caps))
{
align_video_info_planes(plane_align, &info, &align);
GST_INFO("Returning video alignment left %u, top %u, right %u, bottom %u.", align.padding_left,
align.padding_top, align.padding_right, align.padding_bottom);