mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

Update for renamed aggregator pad API

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=791204
This commit is contained in:
Tim-Philipp Müller 2018-01-23 09:01:00 +00:00
parent cfe030ad1b
commit c7e34a0b2f
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/audio/gstaudioaggregator.c
View file

@ -1780,7 +1780,7 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
if (!pad_eos) if (!pad_eos)
is_eos = FALSE; is_eos = FALSE;
pad->priv->input_buffer = gst_aggregator_pad_get_buffer (aggpad); pad->priv->input_buffer = gst_aggregator_pad_peek_buffer (aggpad);
GST_OBJECT_LOCK (pad); GST_OBJECT_LOCK (pad);
if (!pad->priv->input_buffer) { if (!pad->priv->input_buffer) {

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

@ -1077,7 +1077,7 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
if (!is_eos) if (!is_eos)
eos = FALSE; eos = FALSE;
buf = gst_aggregator_pad_get_buffer (bpad); buf = gst_aggregator_pad_peek_buffer (bpad);
if (buf) { if (buf) {
GstClockTime start_time, end_time; GstClockTime start_time, end_time;
@ -1122,7 +1122,7 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
continue; continue;
} }
gst_buffer_unref (buf); gst_buffer_unref (buf);
buf = gst_aggregator_pad_steal_buffer (bpad); buf = gst_aggregator_pad_pop_buffer (bpad);
gst_buffer_replace (&pad->buffer, buf); gst_buffer_replace (&pad->buffer, buf);
if (pad->priv->pending_vinfo.finfo) { if (pad->priv->pending_vinfo.finfo) {
pad->info = pad->priv->pending_vinfo; pad->info = pad->priv->pending_vinfo;

14
gst/mxf/mxfmux.c
View file

@ -489,7 +489,7 @@ gst_mxf_mux_create_metadata (GstMXFMux * mux)
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
buffer = gst_aggregator_pad_get_buffer (GST_AGGREGATOR_PAD (pad)); buffer = gst_aggregator_pad_peek_buffer (GST_AGGREGATOR_PAD (pad));
if (pad->writer->update_descriptor) if (pad->writer->update_descriptor)
pad->writer->update_descriptor (pad->descriptor, pad->writer->update_descriptor (pad->descriptor,
caps, pad->mapping_data, buffer); caps, pad->mapping_data, buffer);
@ -692,7 +692,7 @@ gst_mxf_mux_create_metadata (GstMXFMux * mux)
mux->metadata_list = g_list_prepend (mux->metadata_list, track); mux->metadata_list = g_list_prepend (mux->metadata_list, track);
caps = gst_pad_get_current_caps (GST_PAD_CAST (pad)); caps = gst_pad_get_current_caps (GST_PAD_CAST (pad));
buffer = gst_aggregator_pad_get_buffer (GST_AGGREGATOR_PAD (pad)); buffer = gst_aggregator_pad_peek_buffer (GST_AGGREGATOR_PAD (pad));
track->parent.track_id = n + 1; track->parent.track_id = n + 1;
track->parent.track_number = track->parent.track_number =
pad->writer->get_track_number_template (pad->descriptor, pad->writer->get_track_number_template (pad->descriptor,
@ -812,7 +812,7 @@ gst_mxf_mux_create_metadata (GstMXFMux * mux)
track->parent.track_number = 0; track->parent.track_number = 0;
caps = gst_pad_get_current_caps (GST_PAD_CAST (pad)); caps = gst_pad_get_current_caps (GST_PAD_CAST (pad));
buffer = gst_aggregator_pad_get_buffer (GST_AGGREGATOR_PAD (pad)); buffer = gst_aggregator_pad_peek_buffer (GST_AGGREGATOR_PAD (pad));
pad->writer->get_edit_rate (pad->descriptor, pad->writer->get_edit_rate (pad->descriptor,
caps, pad->mapping_data, caps, pad->mapping_data,
buffer, source_package, source_track, &track->edit_rate); buffer, source_package, source_track, &track->edit_rate);
@ -1208,7 +1208,7 @@ static const guint8 _gc_essence_element_ul[] = {
static GstFlowReturn static GstFlowReturn
gst_mxf_mux_handle_buffer (GstMXFMux * mux, GstMXFMuxPad * pad) gst_mxf_mux_handle_buffer (GstMXFMux * mux, GstMXFMuxPad * pad)
{ {
GstBuffer *buf = gst_aggregator_pad_get_buffer (GST_AGGREGATOR_PAD (pad)); GstBuffer *buf = gst_aggregator_pad_peek_buffer (GST_AGGREGATOR_PAD (pad));
GstBuffer *outbuf = NULL; GstBuffer *outbuf = NULL;
GstMapInfo map; GstMapInfo map;
gsize buf_size; gsize buf_size;
@ -1231,7 +1231,7 @@ gst_mxf_mux_handle_buffer (GstMXFMux * mux, GstMXFMuxPad * pad)
} else if (!flush) { } else if (!flush) {
if (buf) if (buf)
gst_buffer_unref (buf); gst_buffer_unref (buf);
buf = gst_aggregator_pad_steal_buffer (GST_AGGREGATOR_PAD (pad)); buf = gst_aggregator_pad_pop_buffer (GST_AGGREGATOR_PAD (pad));
} }
if (buf) { if (buf) {
@ -1466,7 +1466,7 @@ gst_mxf_mux_handle_eos (GstMXFMux * mux)
for (l = GST_ELEMENT_CAST (mux)->sinkpads; l; l = l->next) { for (l = GST_ELEMENT_CAST (mux)->sinkpads; l; l = l->next) {
GstMXFMuxPad *pad = l->data; GstMXFMuxPad *pad = l->data;
GstBuffer *buffer = GstBuffer *buffer =
gst_aggregator_pad_get_buffer (GST_AGGREGATOR_PAD (pad)); gst_aggregator_pad_peek_buffer (GST_AGGREGATOR_PAD (pad));
GstClockTime next_gc_timestamp = GstClockTime next_gc_timestamp =
gst_util_uint64_scale ((mux->last_gc_position + 1) * GST_SECOND, gst_util_uint64_scale ((mux->last_gc_position + 1) * GST_SECOND,
@ -1780,7 +1780,7 @@ gst_mxf_mux_aggregate (GstAggregator * aggregator, gboolean timeout)
if (!pad_eos) if (!pad_eos)
eos = FALSE; eos = FALSE;
buffer = gst_aggregator_pad_get_buffer (GST_AGGREGATOR_PAD (pad)); buffer = gst_aggregator_pad_peek_buffer (GST_AGGREGATOR_PAD (pad));
if ((!pad_eos || pad->have_complete_edit_unit || if ((!pad_eos || pad->have_complete_edit_unit ||
gst_adapter_available (pad->adapter) > 0 || buffer) gst_adapter_available (pad->adapter) > 0 || buffer)