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

gst/: API change fix.

Browse source 
Original commit message from CVS:
* gst/base/gstbasesink.c: (gst_base_sink_commit_state),
(gst_base_sink_handle_object), (gst_base_sink_query), (do_playing):
* gst/base/gstbasesrc.c: (gst_base_src_query):
* gst/elements/gstfilesink.c: (gst_file_sink_query):
* gst/elements/gsttypefindelement.c:
(gst_type_find_handle_src_query), (find_element_get_length),
(gst_type_find_element_activate):
API change fix.

* gst/gstquery.c: (gst_query_new_position),
(gst_query_set_position), (gst_query_parse_position),
(gst_query_new_duration), (gst_query_set_duration),
(gst_query_parse_duration), (gst_query_set_segment),
(gst_query_parse_segment):
* gst/gstquery.h:
Bundling query position/duration is not a good idea since duration
does not change much and we don't want to recalculate it for every
position query, so they are separated again..
Base value in segment query is not needed.

* gst/gstqueue.c: (gst_queue_handle_src_query):
* gst/gstutils.c: (gst_element_query_position),
(gst_element_query_duration), (gst_pad_query_position),
(gst_pad_query_duration):
* gst/gstutils.h:
Updates for query API change.
Added some docs here and there.
This commit is contained in:
Wim Taymans 2005-10-19 15:50:10 +00:00
parent 842007120e
commit 7612a38449
15 changed files with 298 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ChangeLog
View file

@ -1,3 +1,33 @@
2005-10-19 Wim Taymans <wim@fluendo.com>
* gst/base/gstbasesink.c: (gst_base_sink_commit_state),
(gst_base_sink_handle_object), (gst_base_sink_query), (do_playing):
* gst/base/gstbasesrc.c: (gst_base_src_query):
* gst/elements/gstfilesink.c: (gst_file_sink_query):
* gst/elements/gsttypefindelement.c:
(gst_type_find_handle_src_query), (find_element_get_length),
(gst_type_find_element_activate):
API change fix.
* gst/gstquery.c: (gst_query_new_position),
(gst_query_set_position), (gst_query_parse_position),
(gst_query_new_duration), (gst_query_set_duration),
(gst_query_parse_duration), (gst_query_set_segment),
(gst_query_parse_segment):
* gst/gstquery.h:
Bundling query position/duration is not a good idea since duration
does not change much and we don't want to recalculate it for every
position query, so they are separated again..
Base value in segment query is not needed.
* gst/gstqueue.c: (gst_queue_handle_src_query):
* gst/gstutils.c: (gst_element_query_position),
(gst_element_query_duration), (gst_pad_query_position),
(gst_pad_query_duration):
* gst/gstutils.h:
Updates for query API change.
Added some docs here and there.
2005-10-19 Thomas Vander Stichele <thomas at apestaart dot org>
* check/gst/gstbin.c: (GST_START_TEST):

4
gst/base/gstbasesink.c
View file

@ -1416,9 +1416,9 @@ gst_base_sink_query (GstElement * element, GstQuery * query)
break;
case GST_QUERY_SEGMENT:
{
/* FIXME, bring start/stop to stream time */
gst_query_set_segment (query, basesink->segment_rate,
GST_FORMAT_TIME, basesink->segment_start, basesink->segment_stop,
basesink->segment_time);
GST_FORMAT_TIME, basesink->segment_start, basesink->segment_stop);
break;
}
case GST_QUERY_CONVERT:

31
gst/base/gstbasesrc.c
View file

@ -326,14 +326,11 @@ gst_base_src_query (GstPad * pad, GstQuery * query)
{
GstFormat format;
gst_query_parse_position (query, &format, NULL, NULL);
gst_query_parse_position (query, &format, NULL);
switch (format) {
case GST_FORMAT_DEFAULT:
case GST_FORMAT_BYTES:
b = gst_base_src_get_size (src, &ui64);
/* better to make get_size take an int64 */
i64 = b ? (gint64) ui64 : -1;
gst_query_set_position (query, GST_FORMAT_BYTES, src->offset, i64);
gst_query_set_position (query, GST_FORMAT_BYTES, src->offset);
return TRUE;
case GST_FORMAT_PERCENT:
b = gst_base_src_get_size (src, &ui64);
@ -341,8 +338,28 @@ gst_base_src_query (GstPad * pad, GstQuery * query)
if (b)
i64 *= gst_guint64_to_gdouble (src->offset)
/ gst_guint64_to_gdouble (ui64);
gst_query_set_position (query, GST_FORMAT_PERCENT,
i64, GST_FORMAT_PERCENT_MAX);
gst_query_set_position (query, GST_FORMAT_PERCENT, i64);
return TRUE;
default:
return FALSE;
}
}
case GST_QUERY_DURATION:
{
GstFormat format;
gst_query_parse_duration (query, &format, NULL);
switch (format) {
case GST_FORMAT_DEFAULT:
case GST_FORMAT_BYTES:
b = gst_base_src_get_size (src, &ui64);
/* better to make get_size take an int64 */
i64 = b ? (gint64) ui64 : -1;
gst_query_set_duration (query, GST_FORMAT_BYTES, i64);
return TRUE;
case GST_FORMAT_PERCENT:
gst_query_set_duration (query, GST_FORMAT_PERCENT,
GST_FORMAT_PERCENT_MAX);
return TRUE;
default:
return FALSE;

5
gst/elements/gstfilesink.c
View file

@ -279,12 +279,11 @@ gst_file_sink_query (GstPad * pad, GstQuery * query)
switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_POSITION:
gst_query_parse_position (query, &format, NULL, NULL);
gst_query_parse_position (query, &format, NULL);
switch (format) {
case GST_FORMAT_DEFAULT:
case GST_FORMAT_BYTES:
gst_query_set_position (query, GST_FORMAT_BYTES,
self->data_written, self->data_written);
gst_query_set_position (query, GST_FORMAT_BYTES, self->data_written);
return TRUE;
default:
return FALSE;

12
gst/elements/gsttypefindelement.c
View file

@ -313,13 +313,13 @@ gst_type_find_handle_src_query (GstPad * pad, GstQuery * query)
switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_POSITION:
{
gint64 peer_pos, peer_total;
gint64 peer_pos;
GstFormat format;
if (typefind->store == NULL)
return TRUE;
gst_query_parse_position (query, &format, &peer_pos, &peer_total);
gst_query_parse_position (query, &format, &peer_pos);
/* FIXME: this code assumes that there's no discont in the queue */
switch (format) {
@ -330,7 +330,7 @@ gst_type_find_handle_src_query (GstPad * pad, GstQuery * query)
/* FIXME */
break;
}
gst_query_set_position (query, format, peer_pos, peer_total);
gst_query_set_position (query, format, peer_pos);
break;
}
default:
@ -453,8 +453,8 @@ find_element_get_length (gpointer data)
return 0;
}
if (entry->self->stream_length == 0) {
if (!gst_pad_query_position (GST_PAD_PEER (entry->self->sink), &format,
NULL, (gint64 *) & entry->self->stream_length))
if (!gst_pad_query_duration (GST_PAD_PEER (entry->self->sink), &format,
(gint64 *) & entry->self->stream_length))
goto no_length;
if (format != GST_FORMAT_BYTES) {
@ -805,7 +805,7 @@ gst_type_find_element_activate (GstPad * pad)
gint64 size;
GstFormat format = GST_FORMAT_BYTES;
gst_pad_query_position (peer, &format, NULL, &size);
gst_pad_query_duration (peer, &format, &size);
found_caps = gst_type_find_helper (peer, (guint64) size);
gst_object_unref (peer);
}

98
gst/gstquery.c
View file

@ -55,7 +55,8 @@ static GHashTable *_query_type_to_nick = NULL;
static guint32 _n_values = 1; /* we start from 1 because 0 reserved for NONE */
static GstQueryTypeDefinition standard_definitions[] = {
{GST_QUERY_POSITION, "position", "Current position and total duration"},
{GST_QUERY_POSITION, "position", "Current position"},
{GST_QUERY_DURATION, "duration", "Total duration"},
{GST_QUERY_LATENCY, "latency", "Latency"},
{GST_QUERY_JITTER, "jitter", "Jitter"},
{GST_QUERY_RATE, "rate", "Configured rate 1000000 = 1"},
@ -342,8 +343,7 @@ gst_query_new_position (GstFormat format)
structure = gst_structure_new ("GstQueryPosition",
"format", GST_TYPE_FORMAT, format,
"cur", G_TYPE_INT64, (gint64) - 1,
"end", G_TYPE_INT64, (gint64) - 1, NULL);
"cur", G_TYPE_INT64, (gint64) - 1, NULL);
query = gst_query_new (GST_QUERY_POSITION, structure);
return query;
@ -354,13 +354,11 @@ gst_query_new_position (GstFormat format)
* @query: the query to fill in
* @format: the requested #GstFormat
* @cur: the current position
* @end: the end position
*
* Answer a position query by setting the requested values.
*/
void
gst_query_set_position (GstQuery * query, GstFormat format,
gint64 cur, gint64 end)
gst_query_set_position (GstQuery * query, GstFormat format, gint64 cur)
{
GstStructure *structure;
@ -368,8 +366,7 @@ gst_query_set_position (GstQuery * query, GstFormat format,
structure = gst_query_get_structure (query);
gst_structure_set (structure,
"format", GST_TYPE_FORMAT, format,
"cur", G_TYPE_INT64, cur, "end", G_TYPE_INT64, end, NULL);
"format", GST_TYPE_FORMAT, format, "cur", G_TYPE_INT64, cur, NULL);
}
/**
@ -377,13 +374,11 @@ gst_query_set_position (GstQuery * query, GstFormat format,
* @query: the query to parse
* @format: the storage for the #GstFormat of the position values
* @cur: the storage for the current position
* @end: the storage for the end position
*
* Parse a position query answer.
*/
void
gst_query_parse_position (GstQuery * query, GstFormat * format,
gint64 * cur, gint64 * end)
gst_query_parse_position (GstQuery * query, GstFormat * format, gint64 * cur)
{
GstStructure *structure;
@ -394,8 +389,75 @@ gst_query_parse_position (GstQuery * query, GstFormat * format,
*format = g_value_get_enum (gst_structure_get_value (structure, "format"));
if (cur)
*cur = g_value_get_int64 (gst_structure_get_value (structure, "cur"));
if (end)
*end = g_value_get_int64 (gst_structure_get_value (structure, "end"));
}
/**
* gst_query_new_duration:
* @format: the default #GstFormat for the new query
*
* Constructs a new stream duration query object. Use gst_query_unref()
* when done with it.
*
* Returns: A new #GstQuery
*/
GstQuery *
gst_query_new_duration (GstFormat format)
{
GstQuery *query;
GstStructure *structure;
structure = gst_structure_new ("GstQueryDuration",
"format", GST_TYPE_FORMAT, format,
"duration", G_TYPE_INT64, (gint64) - 1, NULL);
query = gst_query_new (GST_QUERY_DURATION, structure);
return query;
}
/**
* gst_query_set_duration:
* @query: the query to fill in
* @format: the requested #GstFormat
* @duration: the total duration
*
* Answer a duration query by setting the requested values.
*/
void
gst_query_set_duration (GstQuery * query, GstFormat format, gint64 duration)
{
GstStructure *structure;
g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_DURATION);
structure = gst_query_get_structure (query);
gst_structure_set (structure,
"format", GST_TYPE_FORMAT, format,
"duration", G_TYPE_INT64, duration, NULL);
}
/**
* gst_query_parse_duration:
* @query: the query to parse
* @format: the storage for the #GstFormat of the duration value
* @duration: the storage for the total duration
*
* Parse a duration query answer.
*/
void
gst_query_parse_duration (GstQuery * query, GstFormat * format,
gint64 * duration)
{
GstStructure *structure;
g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_DURATION);
structure = gst_query_get_structure (query);
if (format)
*format = g_value_get_enum (gst_structure_get_value (structure, "format"));
if (duration)
*duration =
g_value_get_int64 (gst_structure_get_value (structure, "duration"));
}
/**
@ -515,13 +577,12 @@ gst_query_new_segment (GstFormat format)
* @format: the #GstFormat of the segment values
* @start_value: the start value
* @stop_value: the stop value
* @base: the base value
*
* Answer a segment query by setting the requested values.
*/
void
gst_query_set_segment (GstQuery * query, gdouble rate, GstFormat format,
gint64 start_value, gint64 stop_value, gint64 base)
gint64 start_value, gint64 stop_value)
{
GstStructure *structure;
@ -532,7 +593,7 @@ gst_query_set_segment (GstQuery * query, gdouble rate, GstFormat format,
"rate", G_TYPE_DOUBLE, rate,
"format", GST_TYPE_FORMAT, format,
"start_value", G_TYPE_INT64, start_value,
"stop_value", G_TYPE_INT64, stop_value, "base", G_TYPE_INT64, base, NULL);
"stop_value", G_TYPE_INT64, stop_value, NULL);
}
/**
@ -542,13 +603,12 @@ gst_query_set_segment (GstQuery * query, gdouble rate, GstFormat format,
* @format: the storage for the #GstFormat of the values
* @start_value: the storage for the start value
* @stop_value: the storage for the stop value
* @base: the storage for the base value
*
* Parse a segment query answer.
*/
void
gst_query_parse_segment (GstQuery * query, gdouble * rate, GstFormat * format,
gint64 * start_value, gint64 * stop_value, gint64 * base)
gint64 * start_value, gint64 * stop_value)
{
GstStructure *structure;
@ -565,8 +625,6 @@ gst_query_parse_segment (GstQuery * query, gdouble * rate, GstFormat * format,
if (stop_value)
*stop_value =
g_value_get_int64 (gst_structure_get_value (structure, "stop_value"));
if (base)
*base = g_value_get_int64 (gst_structure_get_value (structure, "base"));
}
/**

20
gst/gstquery.h
View file

@ -37,7 +37,8 @@ G_BEGIN_DECLS
/**
* GstQueryType:
* @GST_QUERY_NONE: invalid query type
* @GST_QUERY_POSITION: current/end position in stream
* @GST_QUERY_POSITION: current position in stream
* @GST_QUERY_DURATION: total duration of the stream
* @GST_QUERY_LATENCY: latency of stream
* @GST_QUERY_JITTER: current jitter of stream
* @GST_QUERY_RATE: current rate of the stream
@ -51,6 +52,7 @@ G_BEGIN_DECLS
typedef enum {
GST_QUERY_NONE = 0,
GST_QUERY_POSITION,
GST_QUERY_DURATION,
GST_QUERY_LATENCY,
GST_QUERY_JITTER, /* not in draft-query, necessary? */
GST_QUERY_RATE,
@ -142,10 +144,14 @@ GstIterator* gst_query_type_iterate_definitions (void);
/* position query */
GstQuery* gst_query_new_position (GstFormat format);
void gst_query_set_position (GstQuery *query, GstFormat format,
gint64 cur, gint64 end);
void gst_query_parse_position (GstQuery *query, GstFormat *format,
gint64 *cur, gint64 *end);
void gst_query_set_position (GstQuery *query, GstFormat format, gint64 cur);
void gst_query_parse_position (GstQuery *query, GstFormat *format, gint64 *cur);
/* duration query */
GstQuery* gst_query_new_duration (GstFormat format);
void gst_query_set_duration (GstQuery *query, GstFormat format, gint64 duration);
void gst_query_parse_duration (GstQuery *query, GstFormat *format, gint64 *duration);
/* convert query */
GstQuery* gst_query_new_convert (GstFormat src_fmt, gint64 value, GstFormat dest_fmt);
void gst_query_set_convert (GstQuery *query, GstFormat src_format, gint64 src_value,
@ -155,9 +161,9 @@ void gst_query_parse_convert (GstQuery *query, GstFormat *src_format, gint64 *
/* segment query */
GstQuery* gst_query_new_segment (GstFormat format);
void gst_query_set_segment (GstQuery *query, gdouble rate, GstFormat format,
gint64 start_value, gint64 stop_value, gint64 base);
gint64 start_value, gint64 stop_value);
void gst_query_parse_segment (GstQuery *query, gdouble *rate, GstFormat *format,
gint64 *start_value, gint64 *stop_value, gint64 *base);
gint64 *start_value, gint64 *stop_value);
/* application specific query */

12
gst/gstqueue.c
View file

@ -897,11 +897,11 @@ gst_queue_handle_src_query (GstPad * pad, GstQuery * query)
switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_POSITION:
{
gint64 peer_pos, peer_total;
gint64 peer_pos;
GstFormat format;
/* get peer position */
gst_query_parse_position (query, &format, &peer_pos, &peer_total);
gst_query_parse_position (query, &format, &peer_pos);
/* FIXME: this code assumes that there's no discont in the queue */
switch (format) {
@ -912,14 +912,14 @@ gst_queue_handle_src_query (GstPad * pad, GstQuery * query)
peer_pos -= queue->cur_level.time;
break;
default:
/* FIXME */
break;
return FALSE;
}
/* set updated positions */
gst_query_set_position (query, format, peer_pos, peer_total);
/* set updated position */
gst_query_set_position (query, format, peer_pos);
break;
}
default:
/* peer handled other queries */
break;
}

99
gst/gstutils.c
View file

@ -1583,9 +1583,20 @@ gst_element_unlink (GstElement * src, GstElement * dest)
}
}
/**
* gst_element_query_position:
* @element: a #GstElement to invoke the position query on.
* @format: a pointer to the #GstFormat asked for.
* On return contains the #GstFormat used.
* @cur: A location in which to store the current position, or NULL.
*
* Queries an element for the stream position.
*
* Returns: TRUE if the query could be performed.
*/
gboolean
gst_element_query_position (GstElement * element, GstFormat * format,
gint64 * cur, gint64 * end)
gint64 * cur)
{
GstQuery *query;
gboolean ret;
@ -1597,13 +1608,57 @@ gst_element_query_position (GstElement * element, GstFormat * format,
ret = gst_element_query (element, query);
if (ret)
gst_query_parse_position (query, format, cur, end);
gst_query_parse_position (query, format, cur);
gst_query_unref (query);
return ret;
}
/**
* gst_element_query_duration:
* @element: a #GstElement to invoke the duration query on.
* @format: a pointer to the #GstFormat asked for.
* On return contains the #GstFormat used.
* @cur: A location in which to store the total duration, or NULL.
*
* Queries an element for the total stream duration.
*
* Returns: TRUE if the query could be performed.
*/
gboolean
gst_element_query_duration (GstElement * element, GstFormat * format,
gint64 * duration)
{
GstQuery *query;
gboolean ret;
g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
g_return_val_if_fail (format != NULL, FALSE);
query = gst_query_new_duration (*format);
ret = gst_element_query (element, query);
if (ret)
gst_query_parse_duration (query, format, duration);
gst_query_unref (query);
return ret;
}
/**
* gst_element_query_convert:
* @element: a #GstElement to invoke the convert query on.
* @src_format: a #GstFormat to convert from.
* @src_val: a value to convert.
* @dest_format: a pointer to the #GstFormat to convert to.
* @dest_val: a pointer to the result.
*
* Queries an element to convert @src_val in @src_format to @dest_format.
*
* Returns: TRUE if the query could be performed.
*/
gboolean
gst_element_query_convert (GstElement * element, GstFormat src_format,
gint64 src_val, GstFormat * dest_fmt, gint64 * dest_val)
@ -1631,7 +1686,6 @@ gst_element_query_convert (GstElement * element, GstFormat src_format,
return ret;
}
/**
* gst_pad_can_link:
* @srcpad: the source #GstPad to link.
@ -2275,15 +2329,13 @@ pads_changed:
* @format: a pointer to the #GstFormat asked for.
* On return contains the #GstFormat used.
* @cur: A location in which to store the current position, or NULL.
* @end: A location in which to store the end position (length), or NULL.
*
* Queries a pad for the stream position and length.
* Queries a pad for the stream position.
*
* Returns: TRUE if the query could be performed.
*/
gboolean
gst_pad_query_position (GstPad * pad, GstFormat * format, gint64 * cur,
gint64 * end)
gst_pad_query_position (GstPad * pad, GstFormat * format, gint64 * cur)
{
GstQuery *query;
gboolean ret;
@ -2295,7 +2347,38 @@ gst_pad_query_position (GstPad * pad, GstFormat * format, gint64 * cur,
ret = gst_pad_query (pad, query);
if (ret)
gst_query_parse_position (query, format, cur, end);
gst_query_parse_position (query, format, cur);
gst_query_unref (query);
return ret;
}
/**
* gst_pad_query_duration:
* @pad: a #GstPad to invoke the duration query on.
* @format: a pointer to the #GstFormat asked for.
* On return contains the #GstFormat used.
* @cur: A location in which to store the total duration, or NULL.
*
* Queries a pad for the total stream duration.
*
* Returns: TRUE if the query could be performed.
*/
gboolean
gst_pad_query_duration (GstPad * pad, GstFormat * format, gint64 * duration)
{
GstQuery *query;
gboolean ret;
g_return_val_if_fail (GST_IS_PAD (pad), FALSE);
g_return_val_if_fail (format != NULL, FALSE);
query = gst_query_new_duration (*format);
ret = gst_pad_query (pad, query);
if (ret)
gst_query_parse_duration (query, format, duration);
gst_query_unref (query);

8
gst/gstutils.h
View file

@ -511,7 +511,9 @@ gboolean gst_element_factory_can_sink_caps(GstElementFactory *factory, const Gs
/* util query functions */
gboolean gst_element_query_position (GstElement *element, GstFormat *format,
gint64 *cur, gint64 *end);
gint64 *cur);
gboolean gst_element_query_duration (GstElement *element, GstFormat *format,
gint64 *duration);
gboolean gst_element_query_convert (GstElement *element, GstFormat src_format, gint64 src_val,
GstFormat *dest_fmt, gint64 *dest_val);
@ -531,7 +533,9 @@ GstElement* gst_pad_get_parent_element (GstPad *pad);
/* util query functions */
gboolean gst_pad_query_position (GstPad *pad, GstFormat *format,
gint64 *cur, gint64 *end);
gint64 *cur);
gboolean gst_pad_query_duration (GstPad *pad, GstFormat *format,
gint64 *duration);
gboolean gst_pad_query_convert (GstPad *pad, GstFormat src_format, gint64 src_val,
GstFormat *dest_format, gint64 *dest_val);

4
libs/gst/base/gstbasesink.c
View file

@ -1416,9 +1416,9 @@ gst_base_sink_query (GstElement * element, GstQuery * query)
break;
case GST_QUERY_SEGMENT:
{
/* FIXME, bring start/stop to stream time */
gst_query_set_segment (query, basesink->segment_rate,
GST_FORMAT_TIME, basesink->segment_start, basesink->segment_stop,
basesink->segment_time);
GST_FORMAT_TIME, basesink->segment_start, basesink->segment_stop);
break;
}
case GST_QUERY_CONVERT:

31
libs/gst/base/gstbasesrc.c
View file

@ -326,14 +326,11 @@ gst_base_src_query (GstPad * pad, GstQuery * query)
{
GstFormat format;
gst_query_parse_position (query, &format, NULL, NULL);
gst_query_parse_position (query, &format, NULL);
switch (format) {
case GST_FORMAT_DEFAULT:
case GST_FORMAT_BYTES:
b = gst_base_src_get_size (src, &ui64);
/* better to make get_size take an int64 */
i64 = b ? (gint64) ui64 : -1;
gst_query_set_position (query, GST_FORMAT_BYTES, src->offset, i64);
gst_query_set_position (query, GST_FORMAT_BYTES, src->offset);
return TRUE;
case GST_FORMAT_PERCENT:
b = gst_base_src_get_size (src, &ui64);
@ -341,8 +338,28 @@ gst_base_src_query (GstPad * pad, GstQuery * query)
if (b)
i64 *= gst_guint64_to_gdouble (src->offset)
/ gst_guint64_to_gdouble (ui64);
gst_query_set_position (query, GST_FORMAT_PERCENT,
i64, GST_FORMAT_PERCENT_MAX);
gst_query_set_position (query, GST_FORMAT_PERCENT, i64);
return TRUE;
default:
return FALSE;
}
}
case GST_QUERY_DURATION:
{
GstFormat format;
gst_query_parse_duration (query, &format, NULL);
switch (format) {
case GST_FORMAT_DEFAULT:
case GST_FORMAT_BYTES:
b = gst_base_src_get_size (src, &ui64);
/* better to make get_size take an int64 */
i64 = b ? (gint64) ui64 : -1;
gst_query_set_duration (query, GST_FORMAT_BYTES, i64);
return TRUE;
case GST_FORMAT_PERCENT:
gst_query_set_duration (query, GST_FORMAT_PERCENT,
GST_FORMAT_PERCENT_MAX);
return TRUE;
default:
return FALSE;

5
plugins/elements/gstfilesink.c
View file

@ -279,12 +279,11 @@ gst_file_sink_query (GstPad * pad, GstQuery * query)
switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_POSITION:
gst_query_parse_position (query, &format, NULL, NULL);
gst_query_parse_position (query, &format, NULL);
switch (format) {
case GST_FORMAT_DEFAULT:
case GST_FORMAT_BYTES:
gst_query_set_position (query, GST_FORMAT_BYTES,
self->data_written, self->data_written);
gst_query_set_position (query, GST_FORMAT_BYTES, self->data_written);
return TRUE;
default:
return FALSE;

12
plugins/elements/gstqueue.c
View file

@ -897,11 +897,11 @@ gst_queue_handle_src_query (GstPad * pad, GstQuery * query)
switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_POSITION:
{
gint64 peer_pos, peer_total;
gint64 peer_pos;
GstFormat format;
/* get peer position */
gst_query_parse_position (query, &format, &peer_pos, &peer_total);
gst_query_parse_position (query, &format, &peer_pos);
/* FIXME: this code assumes that there's no discont in the queue */
switch (format) {
@ -912,14 +912,14 @@ gst_queue_handle_src_query (GstPad * pad, GstQuery * query)
peer_pos -= queue->cur_level.time;
break;
default:
/* FIXME */
break;
return FALSE;
}
/* set updated positions */
gst_query_set_position (query, format, peer_pos, peer_total);
/* set updated position */
gst_query_set_position (query, format, peer_pos);
break;
}
default:
/* peer handled other queries */
break;
}

12
plugins/elements/gsttypefindelement.c
View file

@ -313,13 +313,13 @@ gst_type_find_handle_src_query (GstPad * pad, GstQuery * query)
switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_POSITION:
{
gint64 peer_pos, peer_total;
gint64 peer_pos;
GstFormat format;
if (typefind->store == NULL)
return TRUE;
gst_query_parse_position (query, &format, &peer_pos, &peer_total);
gst_query_parse_position (query, &format, &peer_pos);
/* FIXME: this code assumes that there's no discont in the queue */
switch (format) {
@ -330,7 +330,7 @@ gst_type_find_handle_src_query (GstPad * pad, GstQuery * query)
/* FIXME */
break;
}
gst_query_set_position (query, format, peer_pos, peer_total);
gst_query_set_position (query, format, peer_pos);
break;
}
default:
@ -453,8 +453,8 @@ find_element_get_length (gpointer data)
return 0;
}
if (entry->self->stream_length == 0) {
if (!gst_pad_query_position (GST_PAD_PEER (entry->self->sink), &format,
NULL, (gint64 *) & entry->self->stream_length))
if (!gst_pad_query_duration (GST_PAD_PEER (entry->self->sink), &format,
(gint64 *) & entry->self->stream_length))
goto no_length;
if (format != GST_FORMAT_BYTES) {
@ -805,7 +805,7 @@ gst_type_find_element_activate (GstPad * pad)
gint64 size;
GstFormat format = GST_FORMAT_BYTES;
gst_pad_query_position (peer, &format, NULL, &size);
gst_pad_query_duration (peer, &format, &size);
found_caps = gst_type_find_helper (peer, (guint64) size);
gst_object_unref (peer);
}