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

aggregator: rename _get_buffer() -> _peek_buffer() and _steal -> _pop

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=791204
This commit is contained in:
Tim-Philipp Müller 2018-01-23 08:56:34 +00:00
parent db1d99db76
commit bce246f39f
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/libs/gstreamer-libs-sections.txt
View file

@ -241,8 +241,8 @@ gst_aggregator_get_type
<TITLE>GstAggregatorPad</TITLE> <TITLE>GstAggregatorPad</TITLE>
GstAggregatorPad GstAggregatorPad
GstAggregatorPadClass GstAggregatorPadClass
gst_aggregator_pad_steal_buffer gst_aggregator_pad_pop_buffer
gst_aggregator_pad_get_buffer gst_aggregator_pad_peek_buffer
gst_aggregator_pad_drop_buffer gst_aggregator_pad_drop_buffer
gst_aggregator_pad_is_eos gst_aggregator_pad_is_eos
<SUBSECTION Standard> <SUBSECTION Standard>

16
libs/gst/base/gstaggregator.c
View file

@ -41,9 +41,9 @@
* * When data is queued on all pads, the aggregate vmethod is called. * * When data is queued on all pads, the aggregate vmethod is called.
* *
* * One can peek at the data on any given GstAggregatorPad with the * * One can peek at the data on any given GstAggregatorPad with the
* gst_aggregator_pad_get_buffer () method, and take ownership of it * gst_aggregator_pad_peek_buffer () method, and remove it from the pad
* with the gst_aggregator_pad_steal_buffer () method. When a buffer * with the gst_aggregator_pad_pop_buffer () method. When a buffer
* has been taken with steal_buffer (), a new buffer can be queued * has been taken with pop_buffer (), a new buffer can be queued
* on that pad. * on that pad.
* *
* * If the subclass wishes to push a buffer downstream in its aggregate * * If the subclass wishes to push a buffer downstream in its aggregate
@ -2815,7 +2815,7 @@ gst_aggregator_pad_clip_buffer_unlocked (GstAggregatorPad * pad)
} }
/** /**
* gst_aggregator_pad_steal_buffer: * gst_aggregator_pad_pop_buffer:
* @pad: the pad to get buffer from * @pad: the pad to get buffer from
* *
* Steal the ref to the buffer currently queued in @pad. * Steal the ref to the buffer currently queued in @pad.
@ -2824,7 +2824,7 @@ gst_aggregator_pad_clip_buffer_unlocked (GstAggregatorPad * pad)
* queued. You should unref the buffer after usage. * queued. You should unref the buffer after usage.
*/ */
GstBuffer * GstBuffer *
gst_aggregator_pad_steal_buffer (GstAggregatorPad * pad) gst_aggregator_pad_pop_buffer (GstAggregatorPad * pad)
{ {
GstBuffer *buffer; GstBuffer *buffer;
@ -2858,7 +2858,7 @@ gst_aggregator_pad_drop_buffer (GstAggregatorPad * pad)
{ {
GstBuffer *buf; GstBuffer *buf;
buf = gst_aggregator_pad_steal_buffer (pad); buf = gst_aggregator_pad_pop_buffer (pad);
if (buf == NULL) if (buf == NULL)
return FALSE; return FALSE;
@ -2868,7 +2868,7 @@ gst_aggregator_pad_drop_buffer (GstAggregatorPad * pad)
} }
/** /**
* gst_aggregator_pad_get_buffer: * gst_aggregator_pad_peek_buffer:
* @pad: the pad to get buffer from * @pad: the pad to get buffer from
* *
* Returns: (transfer full): A reference to the buffer in @pad or * Returns: (transfer full): A reference to the buffer in @pad or
@ -2876,7 +2876,7 @@ gst_aggregator_pad_drop_buffer (GstAggregatorPad * pad)
* usage. * usage.
*/ */
GstBuffer * GstBuffer *
gst_aggregator_pad_get_buffer (GstAggregatorPad * pad) gst_aggregator_pad_peek_buffer (GstAggregatorPad * pad)
{ {
GstBuffer *buffer; GstBuffer *buffer;

4
libs/gst/base/gstaggregator.h
View file

@ -98,10 +98,10 @@ GType gst_aggregator_pad_get_type (void);
***************************/ ***************************/
GST_EXPORT GST_EXPORT
GstBuffer * gst_aggregator_pad_steal_buffer (GstAggregatorPad * pad); GstBuffer * gst_aggregator_pad_pop_buffer (GstAggregatorPad * pad);
GST_EXPORT GST_EXPORT
GstBuffer * gst_aggregator_pad_get_buffer (GstAggregatorPad * pad); GstBuffer * gst_aggregator_pad_peek_buffer (GstAggregatorPad * pad);
GST_EXPORT GST_EXPORT
gboolean gst_aggregator_pad_drop_buffer (GstAggregatorPad * pad); gboolean gst_aggregator_pad_drop_buffer (GstAggregatorPad * pad);

2
tests/check/libs/aggregator.c
View file

@ -90,7 +90,7 @@ gst_test_aggregator_aggregate (GstAggregator * aggregator, gboolean timeout)
all_eos = FALSE; all_eos = FALSE;
if (testagg->gap_expected == TRUE) { if (testagg->gap_expected == TRUE) {
buf = gst_aggregator_pad_get_buffer (pad); buf = gst_aggregator_pad_peek_buffer (pad);
fail_unless (buf); fail_unless (buf);
fail_unless (GST_BUFFER_PTS (buf) == TEST_GAP_PTS); fail_unless (GST_BUFFER_PTS (buf) == TEST_GAP_PTS);
fail_unless (GST_BUFFER_DURATION (buf) == TEST_GAP_DURATION); fail_unless (GST_BUFFER_DURATION (buf) == TEST_GAP_DURATION);

4
win32/common/libgstbase.def
View file

@ -36,10 +36,10 @@ EXPORTS
gst_aggregator_get_latency gst_aggregator_get_latency
gst_aggregator_get_type gst_aggregator_get_type
gst_aggregator_pad_drop_buffer gst_aggregator_pad_drop_buffer
gst_aggregator_pad_get_buffer
gst_aggregator_pad_get_type gst_aggregator_pad_get_type
gst_aggregator_pad_is_eos gst_aggregator_pad_is_eos
gst_aggregator_pad_steal_buffer gst_aggregator_pad_peek_buffer
gst_aggregator_pad_pop_buffer
gst_aggregator_set_latency gst_aggregator_set_latency
gst_aggregator_set_src_caps gst_aggregator_set_src_caps
gst_base_parse_add_index_entry gst_base_parse_add_index_entry