mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

media-factory: better error handling

Browse source 
Improve the error handling a bit.
This commit is contained in:
Wim Taymans 2010-03-05 13:34:15 +01:00
parent 73e8d6c69a
commit 851e8aa744
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst/rtsp-server/rtsp-media-factory.c
View file

@ -70,6 +70,9 @@ gst_rtsp_media_factory_class_init (GstRTSPMediaFactoryClass * klass)
* *
* The description should return a pipeline with payloaders named pay0, pay1, * The description should return a pipeline with payloaders named pay0, pay1,
* etc.. Each of the payloaders will result in a stream. * etc.. Each of the payloaders will result in a stream.
*
* Support for dynamic payloaders can be accomplished by adding payloaders
* named dynpay0, dynpay1, etc..
*/ */
g_object_class_install_property (gobject_class, PROP_LAUNCH, g_object_class_install_property (gobject_class, PROP_LAUNCH,
g_param_spec_string ("launch", "Launch", "A launch description of the pipeline", g_param_spec_string ("launch", "Launch", "A launch description of the pipeline",
@ -468,6 +471,9 @@ default_construct (GstRTSPMediaFactory *factory, const GstRTSPUrl *url)
klass = GST_RTSP_MEDIA_FACTORY_GET_CLASS (factory); klass = GST_RTSP_MEDIA_FACTORY_GET_CLASS (factory);
if (!klass->create_pipeline)
goto no_create;
if (klass->get_element) if (klass->get_element)
element = klass->get_element (factory, url); element = klass->get_element (factory, url);
else else
@ -479,16 +485,20 @@ default_construct (GstRTSPMediaFactory *factory, const GstRTSPUrl *url)
media = gst_rtsp_media_new (); media = gst_rtsp_media_new ();
media->element = element; media->element = element;
if (!klass->create_pipeline)
goto no_pipeline;
media->pipeline = klass->create_pipeline (factory, media); media->pipeline = klass->create_pipeline (factory, media);
if (media->pipeline == NULL)
goto no_pipeline;
gst_rtsp_media_factory_collect_streams (factory, url, media); gst_rtsp_media_factory_collect_streams (factory, url, media);
return media; return media;
/* ERRORS */ /* ERRORS */
no_create:
{
g_critical ("no create_pipeline function");
return NULL;
}
no_element: no_element:
{ {
g_critical ("could not create element"); g_critical ("could not create element");
@ -496,19 +506,31 @@ no_element:
} }
no_pipeline: no_pipeline:
{ {
g_critical ("could not create pipeline"); g_critical ("can't create pipeline");
return FALSE; g_object_unref (media);
return NULL;
} }
} }
static GstElement* static GstElement*
default_create_pipeline (GstRTSPMediaFactory *factory, GstRTSPMedia *media) { default_create_pipeline (GstRTSPMediaFactory *factory, GstRTSPMedia *media)
{
GstElement *pipeline; GstElement *pipeline;
if (media->element == NULL)
goto no_element;
pipeline = gst_pipeline_new ("media-pipeline"); pipeline = gst_pipeline_new ("media-pipeline");
gst_bin_add (GST_BIN_CAST (pipeline), media->element); gst_bin_add (GST_BIN_CAST (pipeline), media->element);
return pipeline; return pipeline;
/* ERRORS */
no_element:
{
g_critical ("no element");
return NULL;
}
} }
static void static void