FCL/sf/mw/gstreamer: comparison gstreamer

equal deleted inserted replaced

-:567bb019e3e3
+:7e817e7e631c
 #include "gstinfo.h"
 #include "gstquery.h"
 #include "gstvalue.h"
 #include "gstenumtypes.h"
 #include "gstquark.h"
-#include "gsturi.h"
 #ifdef __SYMBIAN32__
 #include <glib_global.h>
 #endif
 GST_DEBUG_CATEGORY_STATIC (gst_query_debug);
 #define GST_CAT_DEFAULT gst_query_debug
+static void gst_query_class_init (gpointer g_class, gpointer class_data);
 static void gst_query_finalize (GstQuery * query);
 static GstQuery *_gst_query_copy (GstQuery * query);
 static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
 static GList *_gst_queries = NULL;
 {GST_QUERY_RATE, "rate", "Configured rate 1000000 = 1", 0},
 {GST_QUERY_SEEKING, "seeking", "Seeking capabilities and parameters", 0},
 {GST_QUERY_SEGMENT, "segment", "currently configured segment", 0},
 {GST_QUERY_CONVERT, "convert", "Converting between formats", 0},
 {GST_QUERY_FORMATS, "formats", "Supported formats for conversion", 0},
-{GST_QUERY_BUFFERING, "buffering", "Buffering status", 0},
-{GST_QUERY_CUSTOM, "custom", "Custom query", 0},
-{GST_QUERY_URI, "uri", "URI of the source or sink", 0},
 {0, NULL, NULL, 0}
 };
 #ifdef __SYMBIAN32__
 EXPORT_C
 #endif
 def = gst_query_type_get_details (query);
 return def->quark;
 }
+#ifdef __SYMBIAN32__
-G_DEFINE_TYPE (GstQuery, gst_query, GST_TYPE_MINI_OBJECT);
+EXPORT_C
+#endif
+GType
+gst_query_get_type (void)
+{
+static GType _gst_query_type;
+if (G_UNLIKELY (_gst_query_type == 0)) {
+static const GTypeInfo query_info = {
+sizeof (GstQueryClass),
+NULL,
+NULL,
+gst_query_class_init,
+NULL,
+NULL,
+sizeof (GstQuery),
+0,
+NULL,
+NULL
+};
+_gst_query_type = g_type_register_static (GST_TYPE_MINI_OBJECT,
+"GstQuery", &query_info, 0);
+}
+return _gst_query_type;
+}
 static void
-gst_query_class_init (GstQueryClass * klass)
+gst_query_class_init (gpointer g_class, gpointer class_data)
 {
-parent_class = g_type_class_peek_parent (klass);
+GstQueryClass *query_class = GST_QUERY_CLASS (g_class);
-klass->mini_object_class.copy = (GstMiniObjectCopyFunction) _gst_query_copy;
+parent_class = g_type_class_peek_parent (g_class);
-klass->mini_object_class.finalize =
+query_class->mini_object_class.copy =
+(GstMiniObjectCopyFunction) _gst_query_copy;
+query_class->mini_object_class.finalize =
 (GstMiniObjectFinalizeFunction) gst_query_finalize;
-}
-static void
-gst_query_init (GstQuery * query)
-{
 }
 static void
 gst_query_finalize (GstQuery * query)
 {
 if (query->structure) {
 gst_structure_set_parent_refcount (query->structure, NULL);
 gst_structure_free (query->structure);
 }
-/*   GST_MINI_OBJECT_CLASS (parent_class)->finalize (GST_MINI_OBJECT (query)); */
+GST_MINI_OBJECT_CLASS (parent_class)->finalize (GST_MINI_OBJECT (query));
 }
 static GstQuery *
 _gst_query_copy (GstQuery * query)
 {
 gst_query_new_position (GstFormat format)
 {
 GstQuery *query;
 GstStructure *structure;
-structure = gst_structure_id_new (GST_QUARK (QUERY_POSITION),
+structure = gst_structure_empty_new ("GstQueryPosition");
+gst_structure_id_set (structure,
 GST_QUARK (FORMAT), GST_TYPE_FORMAT, format,
-GST_QUARK (CURRENT), G_TYPE_INT64, G_GINT64_CONSTANT (-1), NULL);
+GST_QUARK (CURRENT), G_TYPE_INT64, (gint64) - 1, NULL);
 query = gst_query_new (GST_QUERY_POSITION, structure);
 return query;
 }
 gst_query_new_duration (GstFormat format)
 {
 GstQuery *query;
 GstStructure *structure;
-structure = gst_structure_id_new (GST_QUARK (QUERY_DURATION),
+structure = gst_structure_empty_new ("GstQueryDuration");
+gst_structure_id_set (structure,
 GST_QUARK (FORMAT), GST_TYPE_FORMAT, format,
-GST_QUARK (DURATION), G_TYPE_INT64, G_GINT64_CONSTANT (-1), NULL);
+GST_QUARK (DURATION), G_TYPE_INT64, (gint64) - 1, NULL);
 query = gst_query_new (GST_QUERY_DURATION, structure);
 return query;
 }
 gst_query_new_latency (void)
 {
 GstQuery *query;
 GstStructure *structure;
-structure = gst_structure_id_new (GST_QUARK (QUERY_LATENCY),
+structure = gst_structure_empty_new ("GstQueryLatency");
-GST_QUARK (LIVE), G_TYPE_BOOLEAN, FALSE,
+gst_structure_set (structure,
-GST_QUARK (MIN_LATENCY), G_TYPE_UINT64, G_GUINT64_CONSTANT (0),
+"live", G_TYPE_BOOLEAN, FALSE,
-GST_QUARK (MAX_LATENCY), G_TYPE_UINT64, G_GUINT64_CONSTANT (-1), NULL);
+"min-latency", G_TYPE_UINT64, (gint64) 0,
+"max-latency", G_TYPE_UINT64, (gint64) - 1, NULL);
 query = gst_query_new (GST_QUERY_LATENCY, structure);
 return query;
 }
 GstStructure *structure;
 g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_LATENCY);
 structure = gst_query_get_structure (query);
-gst_structure_id_set (structure,
+gst_structure_set (structure,
-GST_QUARK (LIVE), G_TYPE_BOOLEAN, live,
+"live", G_TYPE_BOOLEAN, live,
-GST_QUARK (MIN_LATENCY), G_TYPE_UINT64, min_latency,
+"min-latency", G_TYPE_UINT64, min_latency,
-GST_QUARK (MAX_LATENCY), G_TYPE_UINT64, max_latency, NULL);
+"max-latency", G_TYPE_UINT64, max_latency, NULL);
 }
 /**
 * gst_query_parse_latency:
 * @query: a #GstQuery
 g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_LATENCY);
 structure = gst_query_get_structure (query);
 if (live)
-*live =
+*live = g_value_get_boolean (gst_structure_get_value (structure, "live"));
-g_value_get_boolean (gst_structure_id_get_value (structure,
-GST_QUARK (LIVE)));
 if (min_latency)
-*min_latency = g_value_get_uint64 (gst_structure_id_get_value (structure,
+*min_latency = g_value_get_uint64 (gst_structure_get_value (structure,
-GST_QUARK (MIN_LATENCY)));
+"min-latency"));
 if (max_latency)
-*max_latency = g_value_get_uint64 (gst_structure_id_get_value (structure,
+*max_latency = g_value_get_uint64 (gst_structure_get_value (structure,
-GST_QUARK (MAX_LATENCY)));
+"max-latency"));
 }
 /**
 * gst_query_new_convert:
 * @src_format: the source #GstFormat for the new query
 GstFormat dest_format)
 {
 GstQuery *query;
 GstStructure *structure;
-structure = gst_structure_id_new (GST_QUARK (QUERY_CONVERT),
+g_return_val_if_fail (value >= 0, NULL);
+structure = gst_structure_empty_new ("GstQueryConvert");
+gst_structure_id_set (structure,
 GST_QUARK (SRC_FORMAT), GST_TYPE_FORMAT, src_format,
 GST_QUARK (SRC_VALUE), G_TYPE_INT64, value,
 GST_QUARK (DEST_FORMAT), GST_TYPE_FORMAT, dest_format,
-GST_QUARK (DEST_VALUE), G_TYPE_INT64, G_GINT64_CONSTANT (-1), NULL);
+GST_QUARK (DEST_VALUE), G_TYPE_INT64, (gint64) - 1, NULL);
 query = gst_query_new (GST_QUERY_CONVERT, structure);
 return query;
 }
 structure = gst_query_get_structure (query);
 gst_structure_id_set (structure,
 GST_QUARK (SRC_FORMAT), GST_TYPE_FORMAT, src_format,
 GST_QUARK (SRC_VALUE), G_TYPE_INT64, src_value,
 GST_QUARK (DEST_FORMAT), GST_TYPE_FORMAT, dest_format,
-GST_QUARK (DEST_VALUE), G_TYPE_INT64, dest_value, NULL);
+GST_QUARK (DEST_VALUE), G_TYPE_INT64, (gint64) dest_value, NULL);
 }
 /**
 * gst_query_parse_convert:
 * @query: a #GstQuery
 gst_query_new_segment (GstFormat format)
 {
 GstQuery *query;
 GstStructure *structure;
-structure = gst_structure_id_new (GST_QUARK (QUERY_SEGMENT),
+structure = gst_structure_empty_new ("GstQuerySegment");
+gst_structure_id_set (structure,
 GST_QUARK (RATE), G_TYPE_DOUBLE, (gdouble) 0.0,
 GST_QUARK (FORMAT), GST_TYPE_FORMAT, format,
-GST_QUARK (START_VALUE), G_TYPE_INT64, G_GINT64_CONSTANT (-1),
+GST_QUARK (START_VALUE), G_TYPE_INT64, (gint64) - 1,
-GST_QUARK (STOP_VALUE), G_TYPE_INT64, G_GINT64_CONSTANT (-1), NULL);
+GST_QUARK (STOP_VALUE), G_TYPE_INT64, (gint64) - 1, NULL);
 query = gst_query_new (GST_QUERY_SEGMENT, structure);
 return query;
 }
 return query->structure;
 }
 /**
-* gst_query_new_seeking:
+* gst_query_new_seeking (GstFormat *format)
 * @format: the default #GstFormat for the new query
 *
 * Constructs a new query object for querying seeking properties of
 * the stream.
 *
 * Returns: A #GstQuery
 */
 #ifdef __SYMBIAN32__
 EXPORT_C
 #endif
 GstQuery *
 gst_query_new_seeking (GstFormat format)
 {
 GstQuery *query;
 GstStructure *structure;
-structure = gst_structure_id_new (GST_QUARK (QUERY_SEEKING),
+structure = gst_structure_empty_new ("GstQuerySeeking");
+gst_structure_id_set (structure,
 GST_QUARK (FORMAT), GST_TYPE_FORMAT, format,
 GST_QUARK (SEEKABLE), G_TYPE_BOOLEAN, FALSE,
-GST_QUARK (SEGMENT_START), G_TYPE_INT64, G_GINT64_CONSTANT (-1),
+GST_QUARK (SEGMENT_START), G_TYPE_INT64, (gint64) - 1,
-GST_QUARK (SEGMENT_END), G_TYPE_INT64, G_GINT64_CONSTANT (-1), NULL);
+GST_QUARK (SEGMENT_END), G_TYPE_INT64, (gint64) - 1, NULL);
 query = gst_query_new (GST_QUERY_SEEKING, structure);
 return query;
 }
 gst_query_new_formats (void)
 {
 GstQuery *query;
 GstStructure *structure;
-structure = gst_structure_id_empty_new (GST_QUARK (QUERY_FORMATS));
+structure = gst_structure_new ("GstQueryFormats", NULL);
 query = gst_query_new (GST_QUERY_FORMATS, structure);
 return query;
 }
 } else
 *format = GST_FORMAT_UNDEFINED;
 }
 }
 }
-/**
-* gst_query_new_buffering
-* @format: the default #GstFormat for the new query
-*
-* Constructs a new query object for querying the buffering status of
-* a stream.
-*
-* Returns: A #GstQuery
-*
-* Since: 0.10.20
-*/
-#ifdef __SYMBIAN32__
-EXPORT_C
-#endif
-GstQuery *
-gst_query_new_buffering (GstFormat format)
-{
-GstQuery *query;
-GstStructure *structure;
-/* by default, we configure the answer as no buffering with a 100% buffering
-* progress */
-structure = gst_structure_id_new (GST_QUARK (QUERY_BUFFERING),
-GST_QUARK (BUSY), G_TYPE_BOOLEAN, FALSE,
-GST_QUARK (BUFFER_PERCENT), G_TYPE_INT, 100,
-GST_QUARK (BUFFERING_MODE), GST_TYPE_BUFFERING_MODE, GST_BUFFERING_STREAM,
-GST_QUARK (AVG_IN_RATE), G_TYPE_INT, -1,
-GST_QUARK (AVG_OUT_RATE), G_TYPE_INT, -1,
-GST_QUARK (BUFFERING_LEFT), G_TYPE_INT64, G_GINT64_CONSTANT (0),
-GST_QUARK (ESTIMATED_TOTAL), G_TYPE_INT64, G_GINT64_CONSTANT (-1),
-GST_QUARK (FORMAT), GST_TYPE_FORMAT, format,
-GST_QUARK (START_VALUE), G_TYPE_INT64, G_GINT64_CONSTANT (-1),
-GST_QUARK (STOP_VALUE), G_TYPE_INT64, G_GINT64_CONSTANT (-1), NULL);
-query = gst_query_new (GST_QUERY_BUFFERING, structure);
-return query;
-}
-/**
-* gst_query_set_buffering_percent
-* @query: A valid #GstQuery of type GST_QUERY_BUFFERING.
-* @busy: if buffering is busy
-* @percent: a buffering percent
-*
-* Set the percentage of buffered data. This is a value between 0 and 100.
-* The @busy indicator is %TRUE when the buffering is in progress.
-*
-* Since: 0.10.20
-*/
-#ifdef __SYMBIAN32__
-EXPORT_C
-#endif
-void
-gst_query_set_buffering_percent (GstQuery * query, gboolean busy, gint percent)
-{
-g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_BUFFERING);
-g_return_if_fail (percent >= 0 && percent <= 100);
-gst_structure_id_set (query->structure,
-GST_QUARK (BUSY), G_TYPE_BOOLEAN, busy,
-GST_QUARK (BUFFER_PERCENT), G_TYPE_INT, percent, NULL);
-}
-/**
-* gst_query_parse_buffering_percent
-* @query: A valid #GstQuery of type GST_QUERY_BUFFERING.
-* @busy: if buffering is busy
-* @percent: a buffering percent
-*
-* Get the percentage of buffered data. This is a value between 0 and 100.
-* The @busy indicator is %TRUE when the buffering is in progress.
-*
-* Since: 0.10.20
-*/
-#ifdef __SYMBIAN32__
-EXPORT_C
-#endif
-void
-gst_query_parse_buffering_percent (GstQuery * query, gboolean * busy,
-gint * percent)
-{
-g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_BUFFERING);
-if (busy)
-*busy = g_value_get_boolean (gst_structure_id_get_value (query->structure,
-GST_QUARK (BUSY)));
-if (percent)
-*percent = g_value_get_int (gst_structure_id_get_value (query->structure,
-GST_QUARK (BUFFER_PERCENT)));
-}
-/**
-* gst_query_set_buffering_stats:
-* @query: A valid #GstQuery of type GST_QUERY_BUFFERING.
-* @mode: a buffering mode
-* @avg_in: the average input rate
-* @avg_out: the average output rate
-* @buffering_left: amount of buffering time left
-*
-* Configures the buffering stats values in @query.
-*
-* Since: 0.10.20
-*/
-#ifdef __SYMBIAN32__
-EXPORT_C
-#endif
-void
-gst_query_set_buffering_stats (GstQuery * query, GstBufferingMode mode,
-gint avg_in, gint avg_out, gint64 buffering_left)
-{
-g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_BUFFERING);
-gst_structure_id_set (query->structure,
-GST_QUARK (BUFFERING_MODE), GST_TYPE_BUFFERING_MODE, mode,
-GST_QUARK (AVG_IN_RATE), G_TYPE_INT, avg_in,
-GST_QUARK (AVG_OUT_RATE), G_TYPE_INT, avg_out,
-GST_QUARK (BUFFERING_LEFT), G_TYPE_INT64, buffering_left, NULL);
-}
-/**
-* gst_query_parse_buffering_stats:
-* @query: A valid #GstQuery of type GST_QUERY_BUFFERING.
-* @mode: a buffering mode
-* @avg_in: the average input rate
-* @avg_out: the average output rate
-* @buffering_left: amount of buffering time left
-*
-* Extracts the buffering stats values from @query.
-*
-* Since: 0.10.20
-*/
-#ifdef __SYMBIAN32__
-EXPORT_C
-#endif
-void
-gst_query_parse_buffering_stats (GstQuery * query,
-GstBufferingMode * mode, gint * avg_in, gint * avg_out,
-gint64 * buffering_left)
-{
-g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_BUFFERING);
-if (mode)
-*mode = g_value_get_enum (gst_structure_id_get_value (query->structure,
-GST_QUARK (BUFFERING_MODE)));
-if (avg_in)
-*avg_in = g_value_get_int (gst_structure_id_get_value (query->structure,
-GST_QUARK (AVG_IN_RATE)));
-if (avg_out)
-*avg_out = g_value_get_int (gst_structure_id_get_value (query->structure,
-GST_QUARK (AVG_OUT_RATE)));
-if (buffering_left)
-*buffering_left =
-g_value_get_int64 (gst_structure_id_get_value (query->structure,
-GST_QUARK (BUFFERING_LEFT)));
-}
-/**
-* gst_query_set_buffering_range:
-* @query: a #GstQuery
-* @format: the format to set for the @start and @stop values
-* @start: the start to set
-* @stop: the stop to set
-* @estimated_total: estimated total amount of download time
-*
-* Set the available query result fields in @query.
-*
-* Since: 0.10.20
-*/
-#ifdef __SYMBIAN32__
-EXPORT_C
-#endif
-void
-gst_query_set_buffering_range (GstQuery * query, GstFormat format,
-gint64 start, gint64 stop, gint64 estimated_total)
-{
-GstStructure *structure;
-g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_BUFFERING);
-structure = gst_query_get_structure (query);
-gst_structure_id_set (structure,
-GST_QUARK (FORMAT), GST_TYPE_FORMAT, format,
-GST_QUARK (START_VALUE), G_TYPE_INT64, start,
-GST_QUARK (STOP_VALUE), G_TYPE_INT64, stop,
-GST_QUARK (ESTIMATED_TOTAL), G_TYPE_INT64, estimated_total, NULL);
-}
-/**
-* gst_query_parse_buffering_range:
-* @query: a GST_QUERY_SEEKING type query #GstQuery
-* @format: the format to set for the @segment_start and @segment_end values
-* @start: the start to set
-* @stop: the stop to set
-* @estimated_total: estimated total amount of download time
-*
-* Parse an available query, writing the format into @format, and
-* other results into the passed parameters, if the respective parameters
-* are non-NULL
-*
-* Since: 0.10.20
-*/
-#ifdef __SYMBIAN32__
-EXPORT_C
-#endif
-void
-gst_query_parse_buffering_range (GstQuery * query, GstFormat * format,
-gint64 * start, gint64 * stop, gint64 * estimated_total)
-{
-GstStructure *structure;
-g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_BUFFERING);
-structure = gst_query_get_structure (query);
-if (format)
-*format = g_value_get_enum (gst_structure_id_get_value (structure,
-GST_QUARK (FORMAT)));
-if (start)
-*start = g_value_get_int64 (gst_structure_id_get_value (structure,
-GST_QUARK (START_VALUE)));
-if (stop)
-*stop = g_value_get_int64 (gst_structure_id_get_value (structure,
-GST_QUARK (STOP_VALUE)));
-if (estimated_total)
-*estimated_total =
-g_value_get_int64 (gst_structure_id_get_value (structure,
-GST_QUARK (ESTIMATED_TOTAL)));
-}
-/**
-* gst_query_new_uri:
-*
-* Constructs a new query URI query object. Use gst_query_unref()
-* when done with it. An URI query is used to query the current URI
-* that is used by the source or sink.
-*
-* Returns: A #GstQuery
-*
-* Since: 0.10.22
-*/
-#ifdef __SYMBIAN32__
-EXPORT_C
-#endif
-GstQuery *
-gst_query_new_uri (void)
-{
-GstQuery *query;
-GstStructure *structure;
-structure = gst_structure_id_new (GST_QUARK (QUERY_URI),
-GST_QUARK (URI), G_TYPE_STRING, NULL, NULL);
-query = gst_query_new (GST_QUERY_URI, structure);
-return query;
-}
-/**
-* gst_query_set_uri:
-* @query: a #GstQuery with query type GST_QUERY_URI
-* @uri: the URI to set
-*
-* Answer a URI query by setting the requested URI.
-*
-* Since: 0.10.22
-*/
-#ifdef __SYMBIAN32__
-EXPORT_C
-#endif
-void
-gst_query_set_uri (GstQuery * query, const gchar * uri)
-{
-GstStructure *structure;
-g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_URI);
-g_return_if_fail (gst_uri_is_valid (uri));
-structure = gst_query_get_structure (query);
-gst_structure_id_set (structure, GST_QUARK (URI), G_TYPE_STRING, uri, NULL);
-}
-/**
-* gst_query_parse_uri:
-* @query: a #GstQuery
-* @uri: the storage for the current URI (may be NULL)
-*
-* Parse an URI query, writing the URI into @uri as a newly
-* allocated string, if the respective parameters are non-NULL.
-* Free the string with g_free() after usage.
-*
-* Since: 0.10.22
-*/
-#ifdef __SYMBIAN32__
-EXPORT_C
-#endif
-void
-gst_query_parse_uri (GstQuery * query, gchar ** uri)
-{
-GstStructure *structure;
-g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_URI);
-structure = gst_query_get_structure (query);
-if (uri)
-*uri = g_value_dup_string (gst_structure_id_get_value (structure,
-GST_QUARK (URI)));
-}

branch	RCL_3
changeset 30	7e817e7e631c
parent 29	567bb019e3e3