mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

amc: properly deinit when ahcsrc register fails

Browse source 
In the androidmedia plugin_init, we initialize various resources on the
Android device. If anything fails during this series of initializations,
we need to deinitialize any initializations that already occurred.
However, we don't do so if we fail to register the ahcsrc element. Fix
this.

https://bugzilla.gnome.org/show_bug.cgi?id=763065
This commit is contained in:
Martin Kelly 2016-02-17 09:36:15 -08:00 committed by Sebastian Dröge
parent ddebf1ff66
commit a7d6c07b86
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sys/androidmedia/gstamc.c
View file

@ -3327,22 +3327,27 @@ plugin_init (GstPlugin * plugin)
if (!gst_android_graphics_imageformat_init ()) { if (!gst_android_graphics_imageformat_init ()) {
GST_ERROR ("Failed to init android image format"); GST_ERROR ("Failed to init android image format");
gst_android_graphics_surfacetexture_deinit (); goto failed_surfacetexture;
return FALSE;
} }
if (!gst_android_hardware_camera_init ()) { if (!gst_android_hardware_camera_init ()) {
gst_android_graphics_surfacetexture_deinit (); goto failed_graphics_imageformat;
gst_android_graphics_imageformat_deinit ();
return FALSE;
} }
if (!gst_element_register (plugin, "ahcsrc", GST_RANK_NONE, GST_TYPE_AHC_SRC)) { if (!gst_element_register (plugin, "ahcsrc", GST_RANK_NONE, GST_TYPE_AHC_SRC)) {
GST_ERROR ("Failed to register android camera source"); GST_ERROR ("Failed to register android camera source");
return FALSE; goto failed_hardware_camera;
} }
return TRUE; return TRUE;
failed_hardware_camera:
gst_android_hardware_camera_deinit ();
failed_graphics_imageformat:
gst_android_graphics_imageformat_deinit ();
failed_surfacetexture:
gst_android_graphics_surfacetexture_deinit ();
return FALSE;
} }
void void