mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 00:31:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: Rename get_output_buffer() to create_output_buffer()

Browse source 
For consistency with GstAudioAggregator.
This commit is contained in:
Sebastian Dröge 2018-05-06 16:05:28 +02:00
parent 429e6c8532
commit dbb21615c4
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/gl/gstglstereomix.c
View file

@ -142,8 +142,8 @@ static GstPad *gst_gl_stereo_mix_request_new_pad (GstElement * element,
GstPadTemplate * temp, const gchar * req_name, const GstCaps * caps); GstPadTemplate * temp, const gchar * req_name, const GstCaps * caps);
static void gst_gl_stereo_mix_release_pad (GstElement * element, GstPad * pad); static void gst_gl_stereo_mix_release_pad (GstElement * element, GstPad * pad);
static GstFlowReturn gst_gl_stereo_mix_get_output_buffer (GstVideoAggregator * static GstFlowReturn gst_gl_stereo_mix_create_output_buffer (GstVideoAggregator
videoaggregator, GstBuffer ** outbuf); * videoaggregator, GstBuffer ** outbuf);
static gboolean gst_gl_stereo_mix_stop (GstAggregator * agg); static gboolean gst_gl_stereo_mix_stop (GstAggregator * agg);
static gboolean gst_gl_stereo_mix_start (GstAggregator * agg); static gboolean gst_gl_stereo_mix_start (GstAggregator * agg);
static gboolean gst_gl_stereo_mix_src_query (GstAggregator * agg, static gboolean gst_gl_stereo_mix_src_query (GstAggregator * agg,
@ -205,8 +205,8 @@ gst_gl_stereo_mix_class_init (GstGLStereoMixClass * klass)
videoaggregator_class->aggregate_frames = gst_gl_stereo_mix_aggregate_frames; videoaggregator_class->aggregate_frames = gst_gl_stereo_mix_aggregate_frames;
videoaggregator_class->update_caps = _update_caps; videoaggregator_class->update_caps = _update_caps;
videoaggregator_class->get_output_buffer = videoaggregator_class->create_output_buffer =
gst_gl_stereo_mix_get_output_buffer; gst_gl_stereo_mix_create_output_buffer;
base_mix_class->supported_gl_api = base_mix_class->supported_gl_api =
GST_GL_API_GLES2 | GST_GL_API_OPENGL | GST_GL_API_OPENGL3; GST_GL_API_GLES2 | GST_GL_API_OPENGL | GST_GL_API_OPENGL3;
@ -263,7 +263,7 @@ gst_gl_stereo_mix_src_query (GstAggregator * agg, GstQuery * query)
static GstFlowReturn static GstFlowReturn
gst_gl_stereo_mix_get_output_buffer (GstVideoAggregator * videoaggregator, gst_gl_stereo_mix_create_output_buffer (GstVideoAggregator * videoaggregator,
GstBuffer ** outbuf) GstBuffer ** outbuf)
{ {
GstGLStereoMix *mix = GST_GL_STEREO_MIX (videoaggregator); GstGLStereoMix *mix = GST_GL_STEREO_MIX (videoaggregator);

8
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -1582,9 +1582,9 @@ gst_video_aggregator_do_aggregate (GstVideoAggregator * vagg,
GstVideoAggregatorClass *vagg_klass = (GstVideoAggregatorClass *) klass; GstVideoAggregatorClass *vagg_klass = (GstVideoAggregatorClass *) klass;
g_assert (vagg_klass->aggregate_frames != NULL); g_assert (vagg_klass->aggregate_frames != NULL);
g_assert (vagg_klass->get_output_buffer != NULL); g_assert (vagg_klass->create_output_buffer != NULL);
if ((ret = vagg_klass->get_output_buffer (vagg, outbuf)) != GST_FLOW_OK) { if ((ret = vagg_klass->create_output_buffer (vagg, outbuf)) != GST_FLOW_OK) {
GST_WARNING_OBJECT (vagg, "Could not get an output buffer, reason: %s", GST_WARNING_OBJECT (vagg, "Could not get an output buffer, reason: %s",
gst_flow_get_name (ret)); gst_flow_get_name (ret));
return ret; return ret;
@ -2278,7 +2278,7 @@ config_failed:
} }
static GstFlowReturn static GstFlowReturn
gst_video_aggregator_get_output_buffer (GstVideoAggregator * videoaggregator, gst_video_aggregator_create_output_buffer (GstVideoAggregator * videoaggregator,
GstBuffer ** outbuf) GstBuffer ** outbuf)
{ {
GstAggregator *aggregator = GST_AGGREGATOR (videoaggregator); GstAggregator *aggregator = GST_AGGREGATOR (videoaggregator);
@ -2499,7 +2499,7 @@ gst_video_aggregator_class_init (GstVideoAggregatorClass * klass)
agg_class->propose_allocation = gst_video_aggregator_propose_allocation; agg_class->propose_allocation = gst_video_aggregator_propose_allocation;
klass->find_best_format = gst_video_aggregator_find_best_format; klass->find_best_format = gst_video_aggregator_find_best_format;
klass->get_output_buffer = gst_video_aggregator_get_output_buffer; klass->create_output_buffer = gst_video_aggregator_create_output_buffer;
klass->update_caps = gst_video_aggregator_default_update_caps; klass->update_caps = gst_video_aggregator_default_update_caps;
/* Register the pad class */ /* Register the pad class */

4
gst-libs/gst/video/gstvideoaggregator.h
View file

@ -213,7 +213,7 @@ struct _GstVideoAggregator
* or directly use the #GstBuffer from GstVideoAggregatorPad.buffer * or directly use the #GstBuffer from GstVideoAggregatorPad.buffer
* if it needs to map the buffer in a special way. The result of the * if it needs to map the buffer in a special way. The result of the
* aggregation should land in @outbuffer. * aggregation should land in @outbuffer.
* @get_output_buffer: Optional. * @create_output_buffer: Optional.
* Lets subclasses provide a #GstBuffer to be used as @outbuffer of * Lets subclasses provide a #GstBuffer to be used as @outbuffer of
* the #aggregate_frames vmethod. * the #aggregate_frames vmethod.
* @negotiated_caps: Optional. * @negotiated_caps: Optional.
@ -231,7 +231,7 @@ struct _GstVideoAggregatorClass
GstCaps * caps); GstCaps * caps);
GstFlowReturn (*aggregate_frames) (GstVideoAggregator * videoaggregator, GstFlowReturn (*aggregate_frames) (GstVideoAggregator * videoaggregator,
GstBuffer * outbuffer); GstBuffer * outbuffer);
GstFlowReturn (*get_output_buffer) (GstVideoAggregator * videoaggregator, GstFlowReturn (*create_output_buffer) (GstVideoAggregator * videoaggregator,
GstBuffer ** outbuffer); GstBuffer ** outbuffer);
void (*find_best_format) (GstVideoAggregator * vagg, void (*find_best_format) (GstVideoAggregator * vagg,
GstCaps * downstream_caps, GstCaps * downstream_caps,