diff options
| author | Alessandro Decina <alessandro.d@gmail.com> | 2012-04-05 08:52:49 +0200 |
|---|---|---|
| committer | Alessandro Decina <alessandro.d@gmail.com> | 2012-04-05 09:08:14 +0200 |
| commit | 10387bd6290d1bf9c4444d09552beccb7f411981 (patch) | |
| tree | aab6b7a5106ab87d79c75f48c5ea48d313e8b8c2 /sys | |
| parent | cd21a6503186e1cab614ec219cf3ee0a0fc50f33 (diff) | |
| download | gstreamer-plugins-bad-10387bd6290d1bf9c4444d09552beccb7f411981.tar.gz | |
qtkitvideosrc: update after BaseSrc::fixate API change
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/applemedia/qtkitvideosrc.m | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sys/applemedia/qtkitvideosrc.m b/sys/applemedia/qtkitvideosrc.m index e0506e57f..05952deec 100644 --- a/sys/applemedia/qtkitvideosrc.m +++ b/sys/applemedia/qtkitvideosrc.m @@ -118,7 +118,7 @@ G_DEFINE_TYPE (GstQTKitVideoSrc, gst_qtkit_video_src, GST_TYPE_PUSH_SRC); - (BOOL)stop; - (BOOL)unlock; - (BOOL)unlockStop; -- (void)fixate:(GstCaps *)caps; +- (GstCaps *)fixate:(GstCaps *)caps; - (BOOL)query:(GstQuery *)query; - (GstStateChangeReturn)changeState:(GstStateChange)transition; - (GstFlowReturn)create:(GstBuffer **)buf; @@ -380,16 +380,18 @@ openFailed: return YES; } -- (void)fixate:(GstCaps *)caps +- (GstCaps *)fixate:(GstCaps *)caps { GstStructure *structure; - gst_caps_truncate (caps); + caps = gst_caps_truncate (caps); structure = gst_caps_get_structure (caps, 0); if (gst_structure_has_field (structure, "framerate")) { gst_structure_fixate_field_nearest_fraction (structure, "framerate", DEVICE_FPS_N, DEVICE_FPS_D); } + + return caps; } - (GstStateChangeReturn)changeState:(GstStateChange)transition @@ -517,7 +519,7 @@ static gboolean gst_qtkit_video_src_unlock (GstBaseSrc * basesrc); static gboolean gst_qtkit_video_src_unlock_stop (GstBaseSrc * basesrc); static GstFlowReturn gst_qtkit_video_src_create (GstPushSrc * pushsrc, GstBuffer ** buf); -static void gst_qtkit_video_src_fixate (GstBaseSrc * basesrc, GstCaps * caps); +static GstCaps * gst_qtkit_video_src_fixate (GstBaseSrc * basesrc, GstCaps * caps); static void gst_qtkit_video_src_class_init (GstQTKitVideoSrcClass * klass) @@ -718,10 +720,14 @@ gst_qtkit_video_src_create (GstPushSrc * pushsrc, GstBuffer ** buf) return ret; } -static void +static GstCaps * gst_qtkit_video_src_fixate (GstBaseSrc * basesrc, GstCaps * caps) { + GstCaps *ret; + OBJC_CALLOUT_BEGIN (); - [GST_QTKIT_VIDEO_SRC_IMPL (basesrc) fixate: caps]; + ret = [GST_QTKIT_VIDEO_SRC_IMPL (basesrc) fixate: caps]; OBJC_CALLOUT_END (); + + return ret; } |