mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

alpha: don't set up stuff before the input and output formats are known

Browse source 
Fixes crash on startup.
This commit is contained in:
Tim-Philipp Müller 2012-04-30 23:57:28 +01:00
parent 175f666293
commit b072c78270
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gst/alpha/gstalpha.c
View file

@ -171,7 +171,7 @@ static GstFlowReturn gst_alpha_transform_frame (GstVideoFilter * filter,
static void gst_alpha_init_params_full (GstAlpha * alpha,
const GstVideoFormatInfo * in_info, const GstVideoFormatInfo * out_info);
static void gst_alpha_init_params (GstAlpha * alpha);
static gboolean gst_alpha_set_process_function (GstAlpha * alpha);
static void gst_alpha_set_process_function (GstAlpha * alpha);
static gboolean gst_alpha_set_process_function_full (GstAlpha * alpha,
GstVideoInfo * in_info, GstVideoInfo * out_info);
@ -2363,8 +2363,16 @@ gst_alpha_init_params_full (GstAlpha * alpha,
static void
gst_alpha_init_params (GstAlpha * alpha)
{
gst_alpha_init_params_full (alpha, GST_VIDEO_FILTER (alpha)->in_info.finfo,
GST_VIDEO_FILTER (alpha)->out_info.finfo);
const GstVideoFormatInfo *finfo_in, *finfo_out;
finfo_in = GST_VIDEO_FILTER (alpha)->in_info.finfo;
finfo_out = GST_VIDEO_FILTER (alpha)->out_info.finfo;
if (finfo_in != NULL && finfo_out != NULL) {
gst_alpha_init_params_full (alpha, finfo_in, finfo_out);
} else {
GST_DEBUG_OBJECT (alpha, "video formats not set yet");
}
}
/* Protected with the alpha lock */
@ -2543,12 +2551,19 @@ gst_alpha_set_process_function_full (GstAlpha * alpha, GstVideoInfo * in_info,
return alpha->process != NULL;
}
static gboolean
static void
gst_alpha_set_process_function (GstAlpha * alpha)
{
return gst_alpha_set_process_function_full (alpha,
&GST_VIDEO_FILTER_CAST (alpha)->in_info,
&GST_VIDEO_FILTER_CAST (alpha)->out_info);
GstVideoInfo *info_in, *info_out;
info_in = &GST_VIDEO_FILTER (alpha)->in_info;
info_out = &GST_VIDEO_FILTER (alpha)->out_info;
if (info_in->finfo != NULL && info_out->finfo != NULL) {
gst_alpha_set_process_function_full (alpha, info_in, info_out);
} else {
GST_DEBUG_OBJECT (alpha, "video formats not set yet");
}
}
static void