base: fix for allocation methods rename

This commit is contained in:
Wim Taymans 2011-08-26 14:20:30 +02:00
parent 94c2206c75
commit 82d82203f6
5 changed files with 16 additions and 16 deletions

View file

@ -161,7 +161,7 @@ gst_video_convert_transform_caps (GstBaseTransform * btrans,
} }
static gboolean static gboolean
gst_video_convert_setup_allocation (GstBaseTransform * trans, GstQuery * query) gst_video_convert_decide_allocation (GstBaseTransform * trans, GstQuery * query)
{ {
GstBufferPool *pool = NULL; GstBufferPool *pool = NULL;
guint size, min, max, prefix, alignment; 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); GST_DEBUG_FUNCPTR (gst_video_convert_set_caps);
gstbasetransform_class->get_unit_size = gstbasetransform_class->get_unit_size =
GST_DEBUG_FUNCPTR (gst_video_convert_get_unit_size); GST_DEBUG_FUNCPTR (gst_video_convert_get_unit_size);
gstbasetransform_class->setup_allocation = gstbasetransform_class->decide_allocation =
GST_DEBUG_FUNCPTR (gst_video_convert_setup_allocation); GST_DEBUG_FUNCPTR (gst_video_convert_decide_allocation);
gstbasetransform_class->transform = gstbasetransform_class->transform =
GST_DEBUG_FUNCPTR (gst_video_convert_transform); GST_DEBUG_FUNCPTR (gst_video_convert_transform);

View file

@ -180,7 +180,7 @@ static gboolean gst_video_scale_set_caps (GstBaseTransform * trans,
GstCaps * in, GstCaps * out); GstCaps * in, GstCaps * out);
static gboolean gst_video_scale_get_unit_size (GstBaseTransform * trans, static gboolean gst_video_scale_get_unit_size (GstBaseTransform * trans,
GstCaps * caps, gsize * size); GstCaps * caps, gsize * size);
static gboolean gst_video_scale_setup_allocation (GstBaseTransform * trans, static gboolean gst_video_scale_decide_allocation (GstBaseTransform * trans,
GstQuery * query); GstQuery * query);
static GstFlowReturn gst_video_scale_transform (GstBaseTransform * trans, static GstFlowReturn gst_video_scale_transform (GstBaseTransform * trans,
GstBuffer * in, GstBuffer * out); 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->set_caps = GST_DEBUG_FUNCPTR (gst_video_scale_set_caps);
trans_class->get_unit_size = trans_class->get_unit_size =
GST_DEBUG_FUNCPTR (gst_video_scale_get_unit_size); GST_DEBUG_FUNCPTR (gst_video_scale_get_unit_size);
trans_class->setup_allocation = trans_class->decide_allocation =
GST_DEBUG_FUNCPTR (gst_video_scale_setup_allocation); GST_DEBUG_FUNCPTR (gst_video_scale_decide_allocation);
trans_class->transform = GST_DEBUG_FUNCPTR (gst_video_scale_transform); trans_class->transform = GST_DEBUG_FUNCPTR (gst_video_scale_transform);
trans_class->fixate_caps = GST_DEBUG_FUNCPTR (gst_video_scale_fixate_caps); trans_class->fixate_caps = GST_DEBUG_FUNCPTR (gst_video_scale_fixate_caps);
trans_class->src_event = GST_DEBUG_FUNCPTR (gst_video_scale_src_event); 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 static gboolean
gst_video_scale_setup_allocation (GstBaseTransform * trans, GstQuery * query) gst_video_scale_decide_allocation (GstBaseTransform * trans, GstQuery * query)
{ {
GstBufferPool *pool = NULL; GstBufferPool *pool = NULL;
guint size, min, max, prefix, alignment; guint size, min, max, prefix, alignment;

View file

@ -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, static void gst_video_test_src_get_times (GstBaseSrc * basesrc,
GstBuffer * buffer, GstClockTime * start, GstClockTime * end); 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); GstQuery * query);
static GstFlowReturn gst_video_test_src_fill (GstPushSrc * psrc, static GstFlowReturn gst_video_test_src_fill (GstPushSrc * psrc,
GstBuffer * buffer); 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->get_times = gst_video_test_src_get_times;
gstbasesrc_class->start = gst_video_test_src_start; gstbasesrc_class->start = gst_video_test_src_start;
gstbasesrc_class->stop = gst_video_test_src_stop; 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; gstpushsrc_class->fill = gst_video_test_src_fill;
} }
@ -602,7 +602,7 @@ no_framerate:
} }
static gboolean static gboolean
gst_video_test_src_setup_allocation (GstBaseSrc * bsrc, GstQuery * query) gst_video_test_src_decide_allocation (GstBaseSrc * bsrc, GstQuery * query)
{ {
GstVideoTestSrc *videotestsrc; GstVideoTestSrc *videotestsrc;
GstBufferPool *pool; GstBufferPool *pool;

View file

@ -1426,7 +1426,7 @@ gst_ximagesink_event (GstBaseSink * sink, GstEvent * event)
} }
static gboolean static gboolean
gst_ximagesink_setup_allocation (GstBaseSink * bsink, GstQuery * query) gst_ximagesink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
{ {
GstXImageSink *ximagesink = GST_XIMAGESINK (bsink); GstXImageSink *ximagesink = GST_XIMAGESINK (bsink);
GstBufferPool *pool; GstBufferPool *pool;
@ -1977,8 +1977,8 @@ gst_ximagesink_class_init (GstXImageSinkClass * klass)
gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_ximagesink_getcaps); gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_ximagesink_getcaps);
gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_ximagesink_setcaps); gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_ximagesink_setcaps);
gstbasesink_class->get_times = GST_DEBUG_FUNCPTR (gst_ximagesink_get_times); gstbasesink_class->get_times = GST_DEBUG_FUNCPTR (gst_ximagesink_get_times);
gstbasesink_class->setup_allocation = gstbasesink_class->propose_allocation =
GST_DEBUG_FUNCPTR (gst_ximagesink_setup_allocation); GST_DEBUG_FUNCPTR (gst_ximagesink_propose_allocation);
gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_ximagesink_event); gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_ximagesink_event);
videosink_class->show_frame = GST_DEBUG_FUNCPTR (gst_ximagesink_show_frame); videosink_class->show_frame = GST_DEBUG_FUNCPTR (gst_ximagesink_show_frame);

View file

@ -1941,7 +1941,7 @@ gst_xvimagesink_event (GstBaseSink * sink, GstEvent * event)
} }
static gboolean static gboolean
gst_xvimagesink_setup_allocation (GstBaseSink * bsink, GstQuery * query) gst_xvimagesink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
{ {
GstXvImageSink *xvimagesink = GST_XVIMAGESINK (bsink); GstXvImageSink *xvimagesink = GST_XVIMAGESINK (bsink);
GstBufferPool *pool; GstBufferPool *pool;
@ -2947,8 +2947,8 @@ gst_xvimagesink_class_init (GstXvImageSinkClass * klass)
gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_xvimagesink_getcaps); gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_xvimagesink_getcaps);
gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_xvimagesink_setcaps); gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_xvimagesink_setcaps);
gstbasesink_class->get_times = GST_DEBUG_FUNCPTR (gst_xvimagesink_get_times); gstbasesink_class->get_times = GST_DEBUG_FUNCPTR (gst_xvimagesink_get_times);
gstbasesink_class->setup_allocation = gstbasesink_class->propose_allocation =
GST_DEBUG_FUNCPTR (gst_xvimagesink_setup_allocation); GST_DEBUG_FUNCPTR (gst_xvimagesink_propose_allocation);
gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_xvimagesink_event); gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_xvimagesink_event);
videosink_class->show_frame = GST_DEBUG_FUNCPTR (gst_xvimagesink_show_frame); videosink_class->show_frame = GST_DEBUG_FUNCPTR (gst_xvimagesink_show_frame);