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

androidcamera: Separate release and free APIs

Browse source
This commit is contained in:
Youness Alaoui 2013-01-07 18:27:40 -05:00 committed by Nicolas Dufresne
parent c84878ad4b
commit fe288a847b
5 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/androidcamera/gst-android-graphics-surfacetexture.c
View file

@ -108,6 +108,12 @@ gst_ag_surfacetexture_release (GstAGSurfaceTexture * self)
JNIEnv *env = gst_dvm_get_env (); JNIEnv *env = gst_dvm_get_env ();
GST_DVM_CALL (, self->object, Void, android_graphics_surfacetexture, release); GST_DVM_CALL (, self->object, Void, android_graphics_surfacetexture, release);
}
void
gst_ag_surfacetexture_free (GstAGSurfaceTexture * self)
{
JNIEnv *env = gst_dvm_get_env ();
(*env)->DeleteGlobalRef (env, self->object); (*env)->DeleteGlobalRef (env, self->object);
g_slice_free (GstAGSurfaceTexture, self); g_slice_free (GstAGSurfaceTexture, self);

1
sys/androidcamera/gst-android-graphics-surfacetexture.h
View file

@ -43,6 +43,7 @@ void gst_android_graphics_surfacetexture_deinit (void);
/* android.graphics.SurfaceTexture */ /* android.graphics.SurfaceTexture */
GstAGSurfaceTexture *gst_ag_surfacetexture_new (gint texture_id); GstAGSurfaceTexture *gst_ag_surfacetexture_new (gint texture_id);
void gst_ag_surfacetexture_release (GstAGSurfaceTexture *self); void gst_ag_surfacetexture_release (GstAGSurfaceTexture *self);
void gst_ag_surfacetexture_free (GstAGSurfaceTexture *self);
G_END_DECLS G_END_DECLS

7
sys/androidcamera/gst-android-hardware-camera.c
View file

@ -1855,11 +1855,18 @@ gst_ah_camera_release (GstAHCamera * self)
JNIEnv *env = gst_dvm_get_env (); JNIEnv *env = gst_dvm_get_env ();
AHC_CALL (, Void, release); AHC_CALL (, Void, release);
}
void
gst_ah_camera_release (GstAHCamera * self)
{
JNIEnv *env = gst_dvm_get_env ();
(*env)->DeleteGlobalRef (env, self->object); (*env)->DeleteGlobalRef (env, self->object);
g_slice_free (GstAHCamera, self); g_slice_free (GstAHCamera, self);
} }
gboolean gboolean
gst_ah_camera_set_parameters (GstAHCamera * self, GstAHCParameters * params) gst_ah_camera_set_parameters (GstAHCamera * self, GstAHCParameters * params)
{ {

1
sys/androidcamera/gst-android-hardware-camera.h
View file

@ -139,6 +139,7 @@ gboolean gst_ah_camera_lock (GstAHCamera * self);
GstAHCamera *gst_ah_camera_open (gint camera_id); GstAHCamera *gst_ah_camera_open (gint camera_id);
gboolean gst_ah_camera_reconnect (GstAHCamera * self); gboolean gst_ah_camera_reconnect (GstAHCamera * self);
void gst_ah_camera_release (GstAHCamera * self); void gst_ah_camera_release (GstAHCamera * self);
void gst_ah_camera_free (GstAHCamera * self);
gboolean gst_ah_camera_set_parameters (GstAHCamera * self, gboolean gst_ah_camera_set_parameters (GstAHCamera * self,
GstAHCParameters * params); GstAHCParameters * params);
gboolean gst_ah_camera_set_error_callback (GstAHCamera * self, gboolean gst_ah_camera_set_error_callback (GstAHCamera * self,

5
sys/androidcamera/gstahcsrc.c
View file

@ -2308,11 +2308,14 @@ gst_ahc_src_close (GstAHCSrc * self)
gst_ah_camera_set_error_callback (self->camera, NULL, NULL); gst_ah_camera_set_error_callback (self->camera, NULL, NULL);
gst_ah_camera_set_preview_callback_with_buffer (self->camera, NULL, NULL); gst_ah_camera_set_preview_callback_with_buffer (self->camera, NULL, NULL);
gst_ah_camera_release (self->camera); gst_ah_camera_release (self->camera);
gst_ah_camera_free (self->camera);
} }
self->camera = NULL; self->camera = NULL;
if (self->texture) if (self->texture) {
gst_ag_surfacetexture_release (self->texture); gst_ag_surfacetexture_release (self->texture);
gst_ag_surfacetexture_free (self->texture);
}
self->texture = NULL; self->texture = NULL;
} }