mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

ahc: use gst new object functions

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=763065
This commit is contained in:
Martin Kelly 2016-02-18 14:08:13 -08:00 committed by Sebastian Dröge
parent 5b786ce5b7
commit 1bfd6526d4
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
sys/androidmedia/gst-android-hardware-camera.c
View file

@ -2211,17 +2211,20 @@ gst_ah_camera_auto_focus (GstAHCamera * self,
GstAHCAutoFocusCallback cb, gpointer user_data) GstAHCAutoFocusCallback cb, gpointer user_data)
{ {
JNIEnv *env = gst_amc_jni_get_env (); JNIEnv *env = gst_amc_jni_get_env ();
GError *err = NULL;
jobject object = NULL; jobject object = NULL;
gboolean ret = FALSE; gboolean ret = FALSE;
if (cb) { if (cb) {
object = (*env)->NewObject (env, object = gst_amc_jni_new_object (env,
&err,
FALSE,
org_freedesktop_gstreamer_androidmedia_gstahccallback.klass, org_freedesktop_gstreamer_androidmedia_gstahccallback.klass,
org_freedesktop_gstreamer_androidmedia_gstahccallback.constructor, org_freedesktop_gstreamer_androidmedia_gstahccallback.constructor,
*((jlong *) & cb), *((jlong *) & user_data)); *((jlong *) & cb), *((jlong *) & user_data));
if (!object) { if (err) {
GST_ERROR ("Failed to create callback object"); GST_ERROR ("Failed to create org.freedesktop.gstreamer.androidmedia.GstAhcCallback object");
(*env)->ExceptionClear (env); g_clear_error (&err);
goto done; goto done;
} }
} }
@ -2250,15 +2253,18 @@ gboolean
gst_ah_camera_get_camera_info (gint camera_id, GstAHCCameraInfo * camera_info) gst_ah_camera_get_camera_info (gint camera_id, GstAHCCameraInfo * camera_info)
{ {
JNIEnv *env = gst_amc_jni_get_env (); JNIEnv *env = gst_amc_jni_get_env ();
GError *err = NULL;
jobject jcamera_info = NULL; jobject jcamera_info = NULL;
gboolean ret = FALSE; gboolean ret = FALSE;
jcamera_info = (*env)->NewObject (env, jcamera_info = gst_amc_jni_new_object (env,
&err,
FALSE,
android_hardware_camera_camerainfo.klass, android_hardware_camera_camerainfo.klass,
android_hardware_camera_camerainfo.constructor); android_hardware_camera_camerainfo.constructor);
if (!jcamera_info) { if (err) {
GST_ERROR ("Failed to call Java method"); GST_ERROR ("Failed to create android.hardware.camera.CameraInfo object");
(*env)->ExceptionClear (env); g_clear_error (&err);
goto done; goto done;
} }
@ -2401,17 +2407,20 @@ gst_ah_camera_set_error_callback (GstAHCamera * self, GstAHCErrorCallback cb,
gpointer user_data) gpointer user_data)
{ {
JNIEnv *env = gst_amc_jni_get_env (); JNIEnv *env = gst_amc_jni_get_env ();
GError *err = NULL;
jobject object = NULL; jobject object = NULL;
gboolean ret = FALSE; gboolean ret = FALSE;
if (cb) { if (cb) {
object = (*env)->NewObject (env, object = gst_amc_jni_new_object (env,
&err,
FALSE,
org_freedesktop_gstreamer_androidmedia_gstahccallback.klass, org_freedesktop_gstreamer_androidmedia_gstahccallback.klass,
org_freedesktop_gstreamer_androidmedia_gstahccallback.constructor, org_freedesktop_gstreamer_androidmedia_gstahccallback.constructor,
*((jlong *) & cb), *((jlong *) & user_data)); *((jlong *) & cb), *((jlong *) & user_data));
if (!object) { if (err) {
GST_ERROR ("Failed to create callback object"); GST_ERROR ("Failed to create org.freedesktop.gstreamer.androidmedia.GstAhcCallback object");
(*env)->ExceptionClear (env); g_clear_error (&err);
goto done; goto done;
} }
} }
@ -2431,17 +2440,20 @@ gst_ah_camera_set_preview_callback_with_buffer (GstAHCamera * self,
GstAHCPreviewCallback cb, gpointer user_data) GstAHCPreviewCallback cb, gpointer user_data)
{ {
JNIEnv *env = gst_amc_jni_get_env (); JNIEnv *env = gst_amc_jni_get_env ();
GError *err = NULL;
jobject object = NULL; jobject object = NULL;
gboolean ret = FALSE; gboolean ret = FALSE;
if (cb) { if (cb) {
object = (*env)->NewObject (env, object = gst_amc_jni_new_object (env,
&err,
FALSE,
org_freedesktop_gstreamer_androidmedia_gstahccallback.klass, org_freedesktop_gstreamer_androidmedia_gstahccallback.klass,
org_freedesktop_gstreamer_androidmedia_gstahccallback.constructor, org_freedesktop_gstreamer_androidmedia_gstahccallback.constructor,
*((jlong *) & cb), *((jlong *) & user_data)); *((jlong *) & cb), *((jlong *) & user_data));
if (!object) { if (err) {
GST_ERROR ("Failed to create callback object"); GST_ERROR ("Failed to create org.freedesktop.gstreamer.androidmedia.GstAhcCallback object");
(*env)->ExceptionClear (env); g_clear_error (&err);
goto done; goto done;
} }
} }