X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fgstparse.c;h=9f976372fc79335974c104da9ee6ecbcd31a3988;hb=bb07550c2dc9a62dfaa58701d085f9ff7658d75f;hp=97f3ca722dcb8f9b3733837a08716992eec72421;hpb=fd144c02abd36a29e07dc31e766ca2b14bdfac65;p=platform%2Fupstream%2Fgstreamer.git diff --git a/gst/gstparse.c b/gst/gstparse.c index 97f3ca7..9f97637 100644 --- a/gst/gstparse.c +++ b/gst/gstparse.c @@ -18,16 +18,17 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. */ /** * SECTION:gstparse + * @title: GstParse * @short_description: Get a pipeline from a text pipeline description * * These function allow to create a pipeline based on the syntax used in the - * gst-launch utility (see man-page for syntax documentation). + * gst-launch-1.0 utility (see man-page for syntax documentation). * * Please note that these functions take several measures to create * somewhat dynamic pipelines. Due to that such pipelines are not always @@ -44,26 +45,6 @@ #include "parse/types.h" #endif -static GstParseContext * -gst_parse_context_copy (const GstParseContext * context) -{ - GstParseContext *ret = NULL; -#ifndef GST_DISABLE_PARSE - - ret = gst_parse_context_new (); - if (context) { - GQueue missing_copy = G_QUEUE_INIT; - GList *l; - - for (l = context->missing_elements; l != NULL; l = l->next) - g_queue_push_tail (&missing_copy, g_strdup ((const gchar *) l->data)); - - ret->missing_elements = missing_copy.head; - } -#endif - return ret; -} - G_DEFINE_BOXED_TYPE (GstParseContext, gst_parse_context, (GBoxedCopyFunc) gst_parse_context_copy, (GBoxedFreeFunc) gst_parse_context_free); @@ -94,8 +75,8 @@ gst_parse_error_quark (void) * * Free-function: gst_parse_context_free * - * Returns: (transfer full): a newly-allocated parse context. Free with - * gst_parse_context_free() when no longer needed. + * Returns: (transfer full) (nullable): a newly-allocated parse context. Free + * with gst_parse_context_free() when no longer needed. */ GstParseContext * gst_parse_context_new (void) @@ -113,6 +94,34 @@ gst_parse_context_new (void) } /** + * gst_parse_context_copy: + * @context: a #GstParseContext + * + * Copies the @context. + * + * Returns: (transfer full) (nullable): A copied #GstParseContext + */ +GstParseContext * +gst_parse_context_copy (const GstParseContext * context) +{ + GstParseContext *ret = NULL; +#ifndef GST_DISABLE_PARSE + + ret = gst_parse_context_new (); + if (context) { + GQueue missing_copy = G_QUEUE_INIT; + GList *l; + + for (l = context->missing_elements; l != NULL; l = l->next) + g_queue_push_tail (&missing_copy, g_strdup ((const gchar *) l->data)); + + ret->missing_elements = missing_copy.head; + } +#endif + return ret; +} + +/** * gst_parse_context_free: * @context: (transfer full): a #GstParseContext * @@ -138,8 +147,8 @@ gst_parse_context_free (GstParseContext * context) * or gst_parse_launchv_full(). Will only return results if an error code * of %GST_PARSE_ERROR_NO_SUCH_ELEMENT was returned. * - * Returns: (transfer full) (array zero-terminated=1) (element-type gchar*): a - * NULL-terminated array of element factory name strings of missing + * Returns: (transfer full) (array zero-terminated=1) (element-type gchar*) (nullable): a + * %NULL-terminated array of element factory name strings of missing * elements. Free with g_strfreev() when no longer needed. */ gchar ** @@ -184,7 +193,7 @@ _gst_parse_escape (const gchar * str) in_quotes = FALSE; while (*str) { - if (*str == '"' && (!in_quotes || (in_quotes && *(str - 1) != '\\'))) + if (*str == '"' && (!in_quotes || *(str - 1) != '\\')) in_quotes = !in_quotes; if (*str == ' ' && !in_quotes) @@ -204,10 +213,11 @@ _gst_parse_escape (const gchar * str) * @error: pointer to a #GError * * Create a new element based on command line syntax. - * @error will contain an error message if an erroneuos pipeline is specified. + * @error will contain an error message if an erroneous pipeline is specified. * An error does not mean that the pipeline could not be constructed. * - * Returns: (transfer full): a new element on success and %NULL on failure. + * Returns: (transfer floating) (nullable): a new element on success and %NULL + * on failure. */ GstElement * gst_parse_launchv (const gchar ** argv, GError ** error) @@ -227,10 +237,11 @@ gst_parse_launchv (const gchar ** argv, GError ** error) * @error will contain an error message if an erroneous pipeline is specified. * An error does not mean that the pipeline could not be constructed. * - * Returns: (transfer full): a new element on success; on failure, either %NULL - * or a partially-constructed bin or element will be returned and @error will - * be set (unless you passed #GST_PARSE_FLAG_FATAL_ERRORS in @flags, then - * %NULL will always be returned on failure) + * Returns: (transfer floating) (nullable): a new element on success; on + * failure, either %NULL or a partially-constructed bin or element will be + * returned and @error will be set (unless you passed + * #GST_PARSE_FLAG_FATAL_ERRORS in @flags, then %NULL will always be returned + * on failure) */ GstElement * gst_parse_launchv_full (const gchar ** argv, GstParseContext * context, @@ -251,7 +262,7 @@ gst_parse_launchv_full (const gchar ** argv, GstParseContext * context, argvp = argv; while (*argvp) { arg = *argvp; - GST_DEBUG ("eascaping argument %s", arg); + GST_DEBUG ("escaping argument %s", arg); tmp = _gst_parse_escape (arg); g_string_append (str, tmp); g_free (tmp); @@ -280,9 +291,10 @@ gst_parse_launchv_full (const gchar ** argv, GstParseContext * context, * the @error is set. In this case there was a recoverable parsing error and you * can try to play the pipeline. * - * Returns: (transfer floating): a new element on success, %NULL on failure. If - * more than one toplevel element is specified by the @pipeline_description, - * all elements are put into a #GstPipeline, which than is returned. + * Returns: (transfer floating) (nullable): a new element on success, %NULL on + * failure. If more than one toplevel element is specified by the + * @pipeline_description, all elements are put into a #GstPipeline, which + * than is returned. */ GstElement * gst_parse_launch (const gchar * pipeline_description, GError ** error) @@ -304,9 +316,11 @@ gst_parse_launch (const gchar * pipeline_description, GError ** error) * the @error is set. In this case there was a recoverable parsing error and you * can try to play the pipeline. * - * Returns: (transfer full): a new element on success, %NULL on failure. If - * more than one toplevel element is specified by the @pipeline_description, - * all elements are put into a #GstPipeline, which then is returned. + * Returns: (transfer floating) (nullable): a new element on success, %NULL on + * failure. If more than one toplevel element is specified by the + * @pipeline_description, all elements are put into a #GstPipeline, which + * then is returned (unless the GST_PARSE_FLAG_PLACE_IN_BIN flag is set, in + * which case they are put in a #GstBin instead). */ GstElement * gst_parse_launch_full (const gchar * pipeline_description, @@ -314,6 +328,7 @@ gst_parse_launch_full (const gchar * pipeline_description, { #ifndef GST_DISABLE_PARSE GstElement *element; + GError *myerror = NULL; g_return_val_if_fail (pipeline_description != NULL, NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); @@ -321,16 +336,20 @@ gst_parse_launch_full (const gchar * pipeline_description, GST_CAT_INFO (GST_CAT_PIPELINE, "parsing pipeline description '%s'", pipeline_description); - element = priv_gst_parse_launch (pipeline_description, error, context, flags); + element = priv_gst_parse_launch (pipeline_description, &myerror, context, + flags); /* don't return partially constructed pipeline if FATAL_ERRORS was given */ - if (G_UNLIKELY (error != NULL && *error != NULL && element != NULL)) { + if (G_UNLIKELY (myerror != NULL && element != NULL)) { if ((flags & GST_PARSE_FLAG_FATAL_ERRORS)) { gst_object_unref (element); element = NULL; } } + if (myerror) + g_propagate_error (error, myerror); + return element; #else gchar *msg;