mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

video-converter: avoid making scalers for outsize == 0

Browse source
This commit is contained in:
Wim Taymans 2015-03-02 16:42:23 +01:00
parent b2a7ac2766
commit 4643d34a7a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst-libs/gst/video/video-converter.c
View file

@ -3901,7 +3901,7 @@ setup_scale (GstVideoConverter * convert)
gst_video_scaler_free (y_scaler);
gst_video_scaler_free (uv_scaler);
} else {
if (in_width != out_width)
if (in_width != out_width && in_width != 0 && out_width != 0)
convert->fh_scaler[0] =
gst_video_scaler_new (method, GST_VIDEO_SCALER_FLAG_NONE, taps,
in_width, out_width, convert->config);
@ -3915,7 +3915,7 @@ setup_scale (GstVideoConverter * convert)
stride = MAX (stride, GST_VIDEO_INFO_PLANE_STRIDE (in_info, 0));
stride = MAX (stride, GST_VIDEO_INFO_PLANE_STRIDE (out_info, 0));
if (in_height != out_height) {
if (in_height != out_height && in_height != 0 && out_height != 0) {
convert->fv_scaler[0] =
gst_video_scaler_new (method, GST_VIDEO_SCALER_FLAG_NONE, taps,
in_height, out_height, convert->config);
@ -3924,7 +3924,6 @@ setup_scale (GstVideoConverter * convert)
convert->fv_scaler[0] = NULL;
}
convert->fin_y[0] = convert->in_y;
convert->fout_y[0] = convert->out_y;
convert->fout_width[0] = out_width;
@ -4059,13 +4058,13 @@ setup_scale (GstVideoConverter * convert)
}
}
if (need_h_scaler) {
if (need_h_scaler && iw != 0 && ow != 0) {
convert->fh_scaler[i] = gst_video_scaler_new (resample_method,
GST_VIDEO_SCALER_FLAG_NONE, taps, iw, ow, config);
} else
convert->fh_scaler[i] = NULL;
if (need_v_scaler) {
if (need_v_scaler && ih != 0 && oh != 0) {
convert->fv_scaler[i] = gst_video_scaler_new (resample_method,
GST_VIDEO_SCALER_FLAG_NONE, taps, ih, oh, config);
gst_video_scaler_get_coeff (convert->fv_scaler[i], 0, NULL, &n_taps);