From: Tim-Philipp Müller <tim@centricular.net>
Date: Tue, 14 Aug 2012 00:20:19 +0000 (+0100)
Subject: deinterlace: fix not-negotiated errors on variable or missing framerate in input... 
X-Git-Tag: 1.19.3~509^2~6776
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d148d9c6f070b2ec0f5889fbd689181e96f1a13;p=platform%2Fupstream%2Fgstreamer.git

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

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.
---

diff --git a/gst/deinterlace/gstdeinterlace.c b/gst/deinterlace/gstdeinterlace.c
index ea8f011..de43808 100644
--- a/gst/deinterlace/gstdeinterlace.c
+++ b/gst/deinterlace/gstdeinterlace.c
@@ -2311,10 +2311,6 @@ gst_deinterlace_setcaps (GstDeinterlace * self, GstPad * pad, GstCaps * caps)
   if (!gst_video_info_from_caps (&self->vinfo, 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_d = GST_VIDEO_INFO_FPS_D (&self->vinfo);
 
@@ -2392,11 +2388,6 @@ invalid_caps:
   GST_ERROR_OBJECT (pad, "Invalid caps: %" GST_PTR_FORMAT, caps);
   goto done;
 
-no_framerate:
-  res = FALSE;
-  GST_ERROR_OBJECT (pad, "No framerate in caps: %" GST_PTR_FORMAT, caps);
-  goto done;
-
 caps_not_accepted:
   res = FALSE;
   GST_ERROR_OBJECT (pad, "Caps not accepted: %" GST_PTR_FORMAT, srccaps);