videoaggregator: Rename get_output_buffer() to create_output_buffer()
authorSebastian Dröge <sebastian@centricular.com>
Sun, 6 May 2018 14:05:28 +0000 (16:05 +0200)
committerSebastian Dröge <sebastian@centricular.com>
Sun, 6 May 2018 14:05:28 +0000 (16:05 +0200)
For consistency with GstAudioAggregator.

ext/gl/gstglstereomix.c
gst-libs/gst/video/gstvideoaggregator.c
gst-libs/gst/video/gstvideoaggregator.h

index e9037beaf527423273c7087ba1dd61e03c73b9b4..e2bf105d95664e330afbafc983514c3c820bffa2 100644 (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);
 static void gst_gl_stereo_mix_release_pad (GstElement * element, GstPad * pad);
 
-static GstFlowReturn gst_gl_stereo_mix_get_output_buffer (GstVideoAggregator *
-    videoaggregator, GstBuffer ** outbuf);
+static GstFlowReturn gst_gl_stereo_mix_create_output_buffer (GstVideoAggregator
+    videoaggregator, GstBuffer ** outbuf);
 static gboolean gst_gl_stereo_mix_stop (GstAggregator * agg);
 static gboolean gst_gl_stereo_mix_start (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->update_caps = _update_caps;
-  videoaggregator_class->get_output_buffer =
-      gst_gl_stereo_mix_get_output_buffer;
+  videoaggregator_class->create_output_buffer =
+      gst_gl_stereo_mix_create_output_buffer;
 
   base_mix_class->supported_gl_api =
       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
-gst_gl_stereo_mix_get_output_buffer (GstVideoAggregator * videoaggregator,
+gst_gl_stereo_mix_create_output_buffer (GstVideoAggregator * videoaggregator,
     GstBuffer ** outbuf)
 {
   GstGLStereoMix *mix = GST_GL_STEREO_MIX (videoaggregator);
index 0aafb31ad6a591f72a13534b7ce3e4eed6304a31..5d4a3af41ef2b5b01e38c3507d693feed2ac70c4 100644 (file)
@@ -1582,9 +1582,9 @@ gst_video_aggregator_do_aggregate (GstVideoAggregator * vagg,
   GstVideoAggregatorClass *vagg_klass = (GstVideoAggregatorClass *) klass;
 
   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_flow_get_name (ret));
     return ret;
@@ -2278,7 +2278,7 @@ config_failed:
 }
 
 static GstFlowReturn
-gst_video_aggregator_get_output_buffer (GstVideoAggregator * videoaggregator,
+gst_video_aggregator_create_output_buffer (GstVideoAggregator * videoaggregator,
     GstBuffer ** outbuf)
 {
   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;
 
   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;
 
   /* Register the pad class */
index 611bd9c56ad15d7f528e4dfd25d6877fb2879154..5926660a169df377c259ecc49483037e05fbcf52 100644 (file)
@@ -213,7 +213,7 @@ struct _GstVideoAggregator
  *                            or directly use the #GstBuffer from GstVideoAggregatorPad.buffer
  *                            if it needs to map the buffer in a special way. The result of the
  *                            aggregation should land in @outbuffer.
- * @get_output_buffer:        Optional.
+ * @create_output_buffer:     Optional.
  *                            Lets subclasses provide a #GstBuffer to be used as @outbuffer of
  *                            the #aggregate_frames vmethod.
  * @negotiated_caps:          Optional.
@@ -231,7 +231,7 @@ struct _GstVideoAggregatorClass
                                                    GstCaps            *  caps);
   GstFlowReturn      (*aggregate_frames)          (GstVideoAggregator *  videoaggregator,
                                                    GstBuffer          *  outbuffer);
-  GstFlowReturn      (*get_output_buffer)         (GstVideoAggregator *  videoaggregator,
+  GstFlowReturn      (*create_output_buffer)      (GstVideoAggregator *  videoaggregator,
                                                    GstBuffer          ** outbuffer);
   void               (*find_best_format)          (GstVideoAggregator *  vagg,
                                                    GstCaps            *  downstream_caps,