From 82d82203f68eb1afbf65ac7d91721c8f65ebc005 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 26 Aug 2011 14:20:30 +0200 Subject: [PATCH] base: fix for allocation methods rename --- gst/videoconvert/gstvideoconvert.c | 6 +++--- gst/videoscale/gstvideoscale.c | 8 ++++---- gst/videotestsrc/gstvideotestsrc.c | 6 +++--- sys/ximage/ximagesink.c | 6 +++--- sys/xvimage/xvimagesink.c | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gst/videoconvert/gstvideoconvert.c b/gst/videoconvert/gstvideoconvert.c index d9df100..b920fdd 100644 --- a/gst/videoconvert/gstvideoconvert.c +++ b/gst/videoconvert/gstvideoconvert.c @@ -161,7 +161,7 @@ gst_video_convert_transform_caps (GstBaseTransform * btrans, } static gboolean -gst_video_convert_setup_allocation (GstBaseTransform * trans, GstQuery * query) +gst_video_convert_decide_allocation (GstBaseTransform * trans, GstQuery * query) { GstBufferPool *pool = NULL; guint size, min, max, prefix, alignment; @@ -370,8 +370,8 @@ gst_video_convert_class_init (GstVideoConvertClass * klass) GST_DEBUG_FUNCPTR (gst_video_convert_set_caps); gstbasetransform_class->get_unit_size = GST_DEBUG_FUNCPTR (gst_video_convert_get_unit_size); - gstbasetransform_class->setup_allocation = - GST_DEBUG_FUNCPTR (gst_video_convert_setup_allocation); + gstbasetransform_class->decide_allocation = + GST_DEBUG_FUNCPTR (gst_video_convert_decide_allocation); gstbasetransform_class->transform = GST_DEBUG_FUNCPTR (gst_video_convert_transform); diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c index 06e4681..66b8f3c 100644 --- a/gst/videoscale/gstvideoscale.c +++ b/gst/videoscale/gstvideoscale.c @@ -180,7 +180,7 @@ static gboolean gst_video_scale_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out); static gboolean gst_video_scale_get_unit_size (GstBaseTransform * trans, GstCaps * caps, gsize * size); -static gboolean gst_video_scale_setup_allocation (GstBaseTransform * trans, +static gboolean gst_video_scale_decide_allocation (GstBaseTransform * trans, GstQuery * query); static GstFlowReturn gst_video_scale_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out); @@ -231,8 +231,8 @@ gst_video_scale_class_init (GstVideoScaleClass * klass) trans_class->set_caps = GST_DEBUG_FUNCPTR (gst_video_scale_set_caps); trans_class->get_unit_size = GST_DEBUG_FUNCPTR (gst_video_scale_get_unit_size); - trans_class->setup_allocation = - GST_DEBUG_FUNCPTR (gst_video_scale_setup_allocation); + trans_class->decide_allocation = + GST_DEBUG_FUNCPTR (gst_video_scale_decide_allocation); trans_class->transform = GST_DEBUG_FUNCPTR (gst_video_scale_transform); trans_class->fixate_caps = GST_DEBUG_FUNCPTR (gst_video_scale_fixate_caps); trans_class->src_event = GST_DEBUG_FUNCPTR (gst_video_scale_src_event); @@ -353,7 +353,7 @@ gst_video_scale_transform_caps (GstBaseTransform * trans, static gboolean -gst_video_scale_setup_allocation (GstBaseTransform * trans, GstQuery * query) +gst_video_scale_decide_allocation (GstBaseTransform * trans, GstQuery * query) { GstBufferPool *pool = NULL; guint size, min, max, prefix, alignment; diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c index 895f976..022eb46 100644 --- a/gst/videotestsrc/gstvideotestsrc.c +++ b/gst/videotestsrc/gstvideotestsrc.c @@ -101,7 +101,7 @@ static gboolean gst_video_test_src_query (GstBaseSrc * bsrc, GstQuery * query); static void gst_video_test_src_get_times (GstBaseSrc * basesrc, GstBuffer * buffer, GstClockTime * start, GstClockTime * end); -static gboolean gst_video_test_src_setup_allocation (GstBaseSrc * bsrc, +static gboolean gst_video_test_src_decide_allocation (GstBaseSrc * bsrc, GstQuery * query); static GstFlowReturn gst_video_test_src_fill (GstPushSrc * psrc, GstBuffer * buffer); @@ -281,7 +281,7 @@ gst_video_test_src_class_init (GstVideoTestSrcClass * klass) gstbasesrc_class->get_times = gst_video_test_src_get_times; gstbasesrc_class->start = gst_video_test_src_start; gstbasesrc_class->stop = gst_video_test_src_stop; - gstbasesrc_class->setup_allocation = gst_video_test_src_setup_allocation; + gstbasesrc_class->decide_allocation = gst_video_test_src_decide_allocation; gstpushsrc_class->fill = gst_video_test_src_fill; } @@ -602,7 +602,7 @@ no_framerate: } static gboolean -gst_video_test_src_setup_allocation (GstBaseSrc * bsrc, GstQuery * query) +gst_video_test_src_decide_allocation (GstBaseSrc * bsrc, GstQuery * query) { GstVideoTestSrc *videotestsrc; GstBufferPool *pool; diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c index 1ee33d9..a0a1420 100644 --- a/sys/ximage/ximagesink.c +++ b/sys/ximage/ximagesink.c @@ -1426,7 +1426,7 @@ gst_ximagesink_event (GstBaseSink * sink, GstEvent * event) } static gboolean -gst_ximagesink_setup_allocation (GstBaseSink * bsink, GstQuery * query) +gst_ximagesink_propose_allocation (GstBaseSink * bsink, GstQuery * query) { GstXImageSink *ximagesink = GST_XIMAGESINK (bsink); GstBufferPool *pool; @@ -1977,8 +1977,8 @@ gst_ximagesink_class_init (GstXImageSinkClass * klass) gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_ximagesink_getcaps); gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_ximagesink_setcaps); gstbasesink_class->get_times = GST_DEBUG_FUNCPTR (gst_ximagesink_get_times); - gstbasesink_class->setup_allocation = - GST_DEBUG_FUNCPTR (gst_ximagesink_setup_allocation); + gstbasesink_class->propose_allocation = + GST_DEBUG_FUNCPTR (gst_ximagesink_propose_allocation); gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_ximagesink_event); videosink_class->show_frame = GST_DEBUG_FUNCPTR (gst_ximagesink_show_frame); diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index e5e0345..a4a5bc5 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -1941,7 +1941,7 @@ gst_xvimagesink_event (GstBaseSink * sink, GstEvent * event) } static gboolean -gst_xvimagesink_setup_allocation (GstBaseSink * bsink, GstQuery * query) +gst_xvimagesink_propose_allocation (GstBaseSink * bsink, GstQuery * query) { GstXvImageSink *xvimagesink = GST_XVIMAGESINK (bsink); GstBufferPool *pool; @@ -2947,8 +2947,8 @@ gst_xvimagesink_class_init (GstXvImageSinkClass * klass) gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_xvimagesink_getcaps); gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_xvimagesink_setcaps); gstbasesink_class->get_times = GST_DEBUG_FUNCPTR (gst_xvimagesink_get_times); - gstbasesink_class->setup_allocation = - GST_DEBUG_FUNCPTR (gst_xvimagesink_setup_allocation); + gstbasesink_class->propose_allocation = + GST_DEBUG_FUNCPTR (gst_xvimagesink_propose_allocation); gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_xvimagesink_event); videosink_class->show_frame = GST_DEBUG_FUNCPTR (gst_xvimagesink_show_frame); -- 2.7.4