mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

deinterlace: fix not-negotiated errors on variable or missing framerate in input caps

Browse source 
Remove some bogus code I added during porting that would error out
on missing or variable framerates in input caps. Handle this like
we do in 0.10

Fixes test_mode_disabled_passthrough unit test check.
This commit is contained in:
Tim-Philipp Müller 2012-08-14 01:20:19 +01:00
parent b19b914d3a
commit 0d148d9c6f
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/deinterlace/gstdeinterlace.c
View file

@ -2311,10 +2311,6 @@ gst_deinterlace_setcaps (GstDeinterlace * self, GstPad * pad, GstCaps * caps)
if (!gst_video_info_from_caps (&self->vinfo, caps)) if (!gst_video_info_from_caps (&self->vinfo, caps))
goto invalid_caps; goto invalid_caps;
if (GST_VIDEO_INFO_FPS_N (&self->vinfo) == 0 ||
GST_VIDEO_INFO_FLAG_IS_SET (&self->vinfo, GST_VIDEO_FLAG_VARIABLE_FPS))
goto no_framerate;
fps_n = GST_VIDEO_INFO_FPS_N (&self->vinfo); fps_n = GST_VIDEO_INFO_FPS_N (&self->vinfo);
fps_d = GST_VIDEO_INFO_FPS_D (&self->vinfo); fps_d = GST_VIDEO_INFO_FPS_D (&self->vinfo);
@ -2392,11 +2388,6 @@ invalid_caps:
GST_ERROR_OBJECT (pad, "Invalid caps: %" GST_PTR_FORMAT, caps); GST_ERROR_OBJECT (pad, "Invalid caps: %" GST_PTR_FORMAT, caps);
goto done; goto done;
no_framerate:
res = FALSE;
GST_ERROR_OBJECT (pad, "No framerate in caps: %" GST_PTR_FORMAT, caps);
goto done;
caps_not_accepted: caps_not_accepted:
res = FALSE; res = FALSE;
GST_ERROR_OBJECT (pad, "Caps not accepted: %" GST_PTR_FORMAT, srccaps); GST_ERROR_OBJECT (pad, "Caps not accepted: %" GST_PTR_FORMAT, srccaps);