summaryrefslogtreecommitdiff
path: root/gst/mpegtsmux
diff options
context:
space:
mode:
authorMathieu Duponchelle <mathieu@centricular.com>2020-07-10 17:13:47 +0200
committerGStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org>2020-07-10 20:12:11 +0000
commit13376f88fecee6a84412a64c81a69f567d4d34b3 (patch)
tree1dde7b877a38fdf7fd958ea16df15b4930faa36c /gst/mpegtsmux
parent510e8ef8cb36e5c489ba5081f00a6852d020e2a4 (diff)
downloadgstreamer-plugins-bad-13376f88fecee6a84412a64c81a69f567d4d34b3.tar.gz
basetsmux: make use of gst_aggregator_finish_buffer_list
Fixes #1276 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1429>
Diffstat (limited to 'gst/mpegtsmux')
-rw-r--r--gst/mpegtsmux/gstbasetsmux.c28
1 files changed, 3 insertions, 25 deletions
diff --git a/gst/mpegtsmux/gstbasetsmux.c b/gst/mpegtsmux/gstbasetsmux.c
index fe7d061ed..0972ba241 100644
--- a/gst/mpegtsmux/gstbasetsmux.c
+++ b/gst/mpegtsmux/gstbasetsmux.c
@@ -874,29 +874,6 @@ new_packet_common_init (GstBaseTsMux * mux, GstBuffer * buf, guint8 * data,
}
static GstFlowReturn
-finish_buffer_list (GstBaseTsMux * mux, GstBufferList * list)
-{
- guint i;
- guint l = gst_buffer_list_length (list);
- GstFlowReturn ret = GST_FLOW_OK;
-
- for (i = 0; i < l; i++) {
- GstBuffer *buf = gst_buffer_list_get (list, i);
-
- ret =
- gst_aggregator_finish_buffer (GST_AGGREGATOR (mux),
- gst_buffer_ref (buf));
-
- if (ret != GST_FLOW_OK)
- break;
- }
-
- gst_buffer_list_unref (list);
-
- return ret;
-}
-
-static GstFlowReturn
gst_base_ts_mux_push_packets (GstBaseTsMux * mux, gboolean force)
{
GstBufferList *buffer_list;
@@ -917,7 +894,8 @@ gst_base_ts_mux_push_packets (GstBaseTsMux * mux, gboolean force)
/* no alignment, just push all available data */
if (align == 0) {
buffer_list = gst_adapter_take_buffer_list (mux->out_adapter, av);
- return finish_buffer_list (mux, buffer_list);
+ return gst_aggregator_finish_buffer_list (GST_AGGREGATOR (mux),
+ buffer_list);
}
align *= packet_size;
@@ -993,7 +971,7 @@ gst_base_ts_mux_push_packets (GstBaseTsMux * mux, gboolean force)
gst_buffer_list_add (buffer_list, buf);
}
- return finish_buffer_list (mux, buffer_list);
+ return gst_aggregator_finish_buffer_list (GST_AGGREGATOR (mux), buffer_list);
}
static GstFlowReturn