_query_peer_*() -> _peer_query_*()

This commit is contained in:
Wim Taymans 2011-11-15 17:50:34 +01:00
parent 2358938dbd
commit e85198bc32
6 changed files with 21 additions and 21 deletions

View file

@ -1670,9 +1670,9 @@ gst_pad_query_default
gst_pad_query_position gst_pad_query_position
gst_pad_query_duration gst_pad_query_duration
gst_pad_query_convert gst_pad_query_convert
gst_pad_query_peer_position gst_pad_peer_query_position
gst_pad_query_peer_duration gst_pad_peer_query_duration
gst_pad_query_peer_convert gst_pad_peer_query_convert
gst_pad_set_query_function gst_pad_set_query_function
GstPadQueryFunction GstPadQueryFunction
gst_pad_set_iterate_internal_links_function gst_pad_set_iterate_internal_links_function

View file

@ -2881,7 +2881,7 @@ gst_pad_query_position (GstPad * pad, GstFormat format, gint64 * cur)
} }
/** /**
* gst_pad_query_peer_position: * gst_pad_peer_query_position:
* @pad: a #GstPad on whose peer to invoke the position query on. * @pad: a #GstPad on whose peer to invoke the position query on.
* Must be a sink pad. * Must be a sink pad.
* @format: the #GstFormat requested * @format: the #GstFormat requested
@ -2893,7 +2893,7 @@ gst_pad_query_position (GstPad * pad, GstFormat format, gint64 * cur)
* Returns: TRUE if the query could be performed. * Returns: TRUE if the query could be performed.
*/ */
gboolean gboolean
gst_pad_query_peer_position (GstPad * pad, GstFormat format, gint64 * cur) gst_pad_peer_query_position (GstPad * pad, GstFormat format, gint64 * cur)
{ {
GstQuery *query; GstQuery *query;
gboolean ret = FALSE; gboolean ret = FALSE;
@ -2939,7 +2939,7 @@ gst_pad_query_duration (GstPad * pad, GstFormat format, gint64 * duration)
} }
/** /**
* gst_pad_query_peer_duration: * gst_pad_peer_query_duration:
* @pad: a #GstPad on whose peer pad to invoke the duration query on. * @pad: a #GstPad on whose peer pad to invoke the duration query on.
* Must be a sink pad. * Must be a sink pad.
* @format: the #GstFormat requested * @format: the #GstFormat requested
@ -2951,7 +2951,7 @@ gst_pad_query_duration (GstPad * pad, GstFormat format, gint64 * duration)
* Returns: TRUE if the query could be performed. * Returns: TRUE if the query could be performed.
*/ */
gboolean gboolean
gst_pad_query_peer_duration (GstPad * pad, GstFormat format, gint64 * duration) gst_pad_peer_query_duration (GstPad * pad, GstFormat format, gint64 * duration)
{ {
GstQuery *query; GstQuery *query;
gboolean ret = FALSE; gboolean ret = FALSE;
@ -3005,7 +3005,7 @@ gst_pad_query_convert (GstPad * pad, GstFormat src_format, gint64 src_val,
} }
/** /**
* gst_pad_query_peer_convert: * gst_pad_peer_query_convert:
* @pad: a #GstPad, on whose peer pad to invoke the convert query on. * @pad: a #GstPad, on whose peer pad to invoke the convert query on.
* Must be a sink pad. * Must be a sink pad.
* @src_format: a #GstFormat to convert from. * @src_format: a #GstFormat to convert from.
@ -3019,7 +3019,7 @@ gst_pad_query_convert (GstPad * pad, GstFormat src_format, gint64 src_val,
* Returns: TRUE if the query could be performed. * Returns: TRUE if the query could be performed.
*/ */
gboolean gboolean
gst_pad_query_peer_convert (GstPad * pad, GstFormat src_format, gint64 src_val, gst_pad_peer_query_convert (GstPad * pad, GstFormat src_format, gint64 src_val,
GstFormat dest_format, gint64 * dest_val) GstFormat dest_format, gint64 * dest_val)
{ {
GstQuery *query; GstQuery *query;

View file

@ -902,9 +902,9 @@ gboolean gst_pad_query_duration (GstPad *pad, GstFormat
gboolean gst_pad_query_convert (GstPad *pad, GstFormat src_format, gint64 src_val, gboolean gst_pad_query_convert (GstPad *pad, GstFormat src_format, gint64 src_val,
GstFormat dest_format, gint64 *dest_val); GstFormat dest_format, gint64 *dest_val);
gboolean gst_pad_query_peer_position (GstPad *pad, GstFormat format, gint64 *cur); gboolean gst_pad_peer_query_position (GstPad *pad, GstFormat format, gint64 *cur);
gboolean gst_pad_query_peer_duration (GstPad *pad, GstFormat format, gint64 *duration); gboolean gst_pad_peer_query_duration (GstPad *pad, GstFormat format, gint64 *duration);
gboolean gst_pad_query_peer_convert (GstPad *pad, GstFormat src_format, gint64 src_val, gboolean gst_pad_peer_query_convert (GstPad *pad, GstFormat src_format, gint64 src_val,
GstFormat dest_format, gint64 *dest_val); GstFormat dest_format, gint64 *dest_val);
/* bin functions */ /* bin functions */

View file

@ -1588,7 +1588,7 @@ gst_base_parse_check_seekability (GstBaseParse * parse)
/* try harder to query upstream size if we didn't get it the first time */ /* try harder to query upstream size if we didn't get it the first time */
if (seekable && stop == -1) { if (seekable && stop == -1) {
GST_DEBUG_OBJECT (parse, "doing duration query to fix up unset stop"); GST_DEBUG_OBJECT (parse, "doing duration query to fix up unset stop");
gst_pad_query_peer_duration (parse->sinkpad, GST_FORMAT_BYTES, &stop); gst_pad_peer_query_duration (parse->sinkpad, GST_FORMAT_BYTES, &stop);
} }
/* if upstream doesn't know the size, it's likely that it's not seekable in /* if upstream doesn't know the size, it's likely that it's not seekable in
@ -1626,7 +1626,7 @@ gst_base_parse_check_upstream (GstBaseParse * parse)
{ {
gint64 stop; gint64 stop;
if (gst_pad_query_peer_duration (parse->sinkpad, GST_FORMAT_TIME, &stop)) if (gst_pad_peer_query_duration (parse->sinkpad, GST_FORMAT_TIME, &stop))
if (GST_CLOCK_TIME_IS_VALID (stop) && stop) { if (GST_CLOCK_TIME_IS_VALID (stop) && stop) {
/* upstream has one, accept it also, and no further updates */ /* upstream has one, accept it also, and no further updates */
gst_base_parse_set_duration (parse, GST_FORMAT_TIME, stop, 0); gst_base_parse_set_duration (parse, GST_FORMAT_TIME, stop, 0);

View file

@ -4313,7 +4313,7 @@ gst_base_sink_pad_activate_pull (GstPad * pad, gboolean active)
GST_OBJECT_UNLOCK (basesink); GST_OBJECT_UNLOCK (basesink);
/* get the peer duration in bytes */ /* get the peer duration in bytes */
result = gst_pad_query_peer_duration (pad, GST_FORMAT_BYTES, &duration); result = gst_pad_peer_query_duration (pad, GST_FORMAT_BYTES, &duration);
if (result) { if (result) {
GST_DEBUG_OBJECT (basesink, GST_DEBUG_OBJECT (basesink,
"setting duration in bytes to %" G_GINT64_FORMAT, duration); "setting duration in bytes to %" G_GINT64_FORMAT, duration);
@ -4682,7 +4682,7 @@ gst_base_sink_get_duration (GstBaseSink * basesink, GstFormat format,
* using our cached value because it might change. Duration caching * using our cached value because it might change. Duration caching
* should be done at a higher level. */ * should be done at a higher level. */
res = res =
gst_pad_query_peer_duration (basesink->sinkpad, GST_FORMAT_BYTES, gst_pad_peer_query_duration (basesink->sinkpad, GST_FORMAT_BYTES,
&uduration); &uduration);
if (res) { if (res) {
basesink->segment.duration = uduration; basesink->segment.duration = uduration;
@ -4739,7 +4739,7 @@ default_element_query (GstElement * element, GstQuery * query)
&upstream); &upstream);
if (!res && upstream) { if (!res && upstream) {
res = res =
gst_pad_query_peer_position (basesink->sinkpad, GST_FORMAT_TIME, gst_pad_peer_query_position (basesink->sinkpad, GST_FORMAT_TIME,
&cur); &cur);
} }
if (res) { if (res) {
@ -4747,7 +4747,7 @@ default_element_query (GstElement * element, GstQuery * query)
&upstream); &upstream);
if (!res && upstream) { if (!res && upstream) {
res = res =
gst_pad_query_peer_duration (basesink->sinkpad, gst_pad_peer_query_duration (basesink->sinkpad,
GST_FORMAT_TIME, &dur); GST_FORMAT_TIME, &dur);
} }
} }

View file

@ -777,7 +777,7 @@ update_buffering (GstQueue2 * queue)
mode = GST_BUFFERING_DOWNLOAD; mode = GST_BUFFERING_DOWNLOAD;
if (queue->byte_in_rate > 0) { if (queue->byte_in_rate > 0) {
if (gst_pad_query_peer_duration (queue->sinkpad, GST_FORMAT_BYTES, if (gst_pad_peer_query_duration (queue->sinkpad, GST_FORMAT_BYTES,
&duration)) { &duration)) {
buffering_left = buffering_left =
(gdouble) ((duration - (gdouble) ((duration -
@ -2475,7 +2475,7 @@ gst_queue2_handle_src_query (GstPad * pad, GstQuery * query)
duration = writing_pos; duration = writing_pos;
} else { } else {
/* get duration of upstream in bytes */ /* get duration of upstream in bytes */
peer_res = gst_pad_query_peer_duration (queue->sinkpad, peer_res = gst_pad_peer_query_duration (queue->sinkpad,
GST_FORMAT_BYTES, &duration); GST_FORMAT_BYTES, &duration);
} }
@ -2598,7 +2598,7 @@ gst_queue2_update_upstream_size (GstQueue2 * queue)
{ {
gint64 upstream_size = -1; gint64 upstream_size = -1;
if (gst_pad_query_peer_duration (queue->sinkpad, GST_FORMAT_BYTES, if (gst_pad_peer_query_duration (queue->sinkpad, GST_FORMAT_BYTES,
&upstream_size)) { &upstream_size)) {
GST_INFO_OBJECT (queue, "upstream size: %" G_GINT64_FORMAT, upstream_size); GST_INFO_OBJECT (queue, "upstream size: %" G_GINT64_FORMAT, upstream_size);
queue->upstream_size = upstream_size; queue->upstream_size = upstream_size;