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

androidmedia: Run gst-indent over everything once again

Browse source
This commit is contained in:
Sebastian Dröge 2016-08-01 10:30:29 +03:00
parent 8748ce94f4
commit 2ff2ad9353
3 changed files with 220 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2129,7 +2129,7 @@ gst_ah_camera_add_callback_buffer (GstAHCamera * self, jbyteArray buffer)
GST_DEBUG ("add callback_buffer %p", buffer); GST_DEBUG ("add callback_buffer %p", buffer);
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.addCallbackBuffer, buffer); android_hardware_camera.addCallbackBuffer, buffer);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.addCallbackBuffer: %s", GST_ERROR ("Failed to call android.hardware.Camera.addCallbackBuffer: %s",
err->message); err->message);
@ -2154,14 +2154,15 @@ gst_ah_camera_auto_focus (GstAHCamera * self,
org_freedesktop_gstreamer_androidmedia_gstahccallback.constructor, org_freedesktop_gstreamer_androidmedia_gstahccallback.constructor,
*((jlong *) & cb), *((jlong *) & user_data)); *((jlong *) & cb), *((jlong *) & user_data));
if (err) { if (err) {
GST_ERROR ("Failed to create org.freedesktop.gstreamer.androidmedia.GstAhcCallback object"); GST_ERROR
("Failed to create org.freedesktop.gstreamer.androidmedia.GstAhcCallback object");
g_clear_error (&err); g_clear_error (&err);
goto done; goto done;
} }
} }
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.autoFocus, object); android_hardware_camera.autoFocus, object);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.autoFocus: %s", GST_ERROR ("Failed to call android.hardware.Camera.autoFocus: %s",
err->message); err->message);
@ -2171,7 +2172,7 @@ gst_ah_camera_auto_focus (GstAHCamera * self,
ret = TRUE; ret = TRUE;
done: done:
if (err) if (err)
g_clear_error(&err); g_clear_error (&err);
if (object) if (object)
gst_amc_jni_object_local_unref (env, object); gst_amc_jni_object_local_unref (env, object);
@ -2185,7 +2186,7 @@ gst_ah_camera_cancel_auto_focus (GstAHCamera * self)
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.cancelAutoFocus); android_hardware_camera.cancelAutoFocus);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.cancelAutoFocus: %s", GST_ERROR ("Failed to call android.hardware.Camera.cancelAutoFocus: %s",
err->message); err->message);
@ -2216,7 +2217,7 @@ gst_ah_camera_get_camera_info (gint camera_id, GstAHCCameraInfo * camera_info)
} }
gst_amc_jni_call_static_void_method (env, &err, android_hardware_camera.klass, gst_amc_jni_call_static_void_method (env, &err, android_hardware_camera.klass,
android_hardware_camera.getCameraInfo, camera_id, jcamera_info); android_hardware_camera.getCameraInfo, camera_id, jcamera_info);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.getCameraInfo: %s", GST_ERROR ("Failed to call android.hardware.Camera.getCameraInfo: %s",
err->message); err->message);
@ -2257,7 +2258,7 @@ gst_ah_camera_get_number_of_cameras (void)
gint num_cameras; gint num_cameras;
gst_amc_jni_call_static_int_method (env, &err, android_hardware_camera.klass, gst_amc_jni_call_static_int_method (env, &err, android_hardware_camera.klass,
android_hardware_camera.getNumberOfCameras, &num_cameras); android_hardware_camera.getNumberOfCameras, &num_cameras);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.getNumberOfCameras: %s", GST_ERROR ("Failed to call android.hardware.Camera.getNumberOfCameras: %s",
err->message); err->message);
@ -2277,7 +2278,7 @@ gst_ah_camera_get_parameters (GstAHCamera * self)
GstAHCParameters *params = NULL; GstAHCParameters *params = NULL;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera.getParameters, &object); android_hardware_camera.getParameters, &object);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.getParameters: %s", GST_ERROR ("Failed to call android.hardware.Camera.getParameters: %s",
err->message); err->message);
@ -2311,7 +2312,7 @@ gst_ah_camera_lock (GstAHCamera * self)
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.lock); android_hardware_camera.lock);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.lock: %s", err->message); GST_ERROR ("Failed to call android.hardware.Camera.lock: %s", err->message);
g_clear_error (&err); g_clear_error (&err);
@ -2330,11 +2331,10 @@ gst_ah_camera_open (gint camera_id)
GstAHCamera *camera = NULL; GstAHCamera *camera = NULL;
gst_amc_jni_call_static_object_method (env, &err, gst_amc_jni_call_static_object_method (env, &err,
android_hardware_camera.klass, android_hardware_camera.open, &object, android_hardware_camera.klass, android_hardware_camera.open, &object,
camera_id); camera_id);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.open: %s", GST_ERROR ("Failed to call android.hardware.Camera.open: %s", err->message);
err->message);
g_clear_error (&err); g_clear_error (&err);
goto done; goto done;
} }
@ -2362,7 +2362,7 @@ gst_ah_camera_reconnect (GstAHCamera * self)
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.reconnect); android_hardware_camera.reconnect);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.reconnect: %s", GST_ERROR ("Failed to call android.hardware.Camera.reconnect: %s",
err->message); err->message);
@ -2380,7 +2380,7 @@ gst_ah_camera_release (GstAHCamera * self)
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.release); android_hardware_camera.release);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.release: %s", GST_ERROR ("Failed to call android.hardware.Camera.release: %s",
err->message); err->message);
@ -2405,7 +2405,7 @@ gst_ah_camera_set_parameters (GstAHCamera * self, GstAHCParameters * params)
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.setParameters, params->object); android_hardware_camera.setParameters, params->object);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.setParameters: %s", GST_ERROR ("Failed to call android.hardware.Camera.setParameters: %s",
err->message); err->message);
@ -2433,14 +2433,15 @@ gst_ah_camera_set_error_callback (GstAHCamera * self, GstAHCErrorCallback cb,
org_freedesktop_gstreamer_androidmedia_gstahccallback.constructor, org_freedesktop_gstreamer_androidmedia_gstahccallback.constructor,
*((jlong *) & cb), *((jlong *) & user_data)); *((jlong *) & cb), *((jlong *) & user_data));
if (err) { if (err) {
GST_ERROR ("Failed to create org.freedesktop.gstreamer.androidmedia.GstAhcCallback object"); GST_ERROR
("Failed to create org.freedesktop.gstreamer.androidmedia.GstAhcCallback object");
g_clear_error (&err); g_clear_error (&err);
goto done; goto done;
} }
} }
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.setErrorCallback, object); android_hardware_camera.setErrorCallback, object);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.setErrorCallback: %s", GST_ERROR ("Failed to call android.hardware.Camera.setErrorCallback: %s",
err->message); err->message);
@ -2474,16 +2475,18 @@ gst_ah_camera_set_preview_callback_with_buffer (GstAHCamera * self,
org_freedesktop_gstreamer_androidmedia_gstahccallback.constructor, org_freedesktop_gstreamer_androidmedia_gstahccallback.constructor,
*((jlong *) & cb), *((jlong *) & user_data)); *((jlong *) & cb), *((jlong *) & user_data));
if (err) { if (err) {
GST_ERROR ("Failed to create org.freedesktop.gstreamer.androidmedia.GstAhcCallback object"); GST_ERROR
("Failed to create org.freedesktop.gstreamer.androidmedia.GstAhcCallback object");
g_clear_error (&err); g_clear_error (&err);
goto done; goto done;
} }
} }
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.setPreviewCallbackWithBuffer, object); android_hardware_camera.setPreviewCallbackWithBuffer, object);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.setPreviewCallbackWithBuffer: %s", GST_ERROR
("Failed to call android.hardware.Camera.setPreviewCallbackWithBuffer: %s",
err->message); err->message);
goto done; goto done;
} }
@ -2506,7 +2509,7 @@ gst_ah_camera_set_preview_texture (GstAHCamera * self,
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.setPreviewTexture, surfaceTexture->jobject); android_hardware_camera.setPreviewTexture, surfaceTexture->jobject);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.setPreviewTexture: %s", GST_ERROR ("Failed to call android.hardware.Camera.setPreviewTexture: %s",
err->message); err->message);
@ -2521,7 +2524,7 @@ gst_ah_camera_start_preview (GstAHCamera * self)
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.startPreview); android_hardware_camera.startPreview);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.startPreview: %s", GST_ERROR ("Failed to call android.hardware.Camera.startPreview: %s",
err->message); err->message);
@ -2539,7 +2542,7 @@ gst_ah_camera_start_smooth_zoom (GstAHCamera * self, gint value)
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.startSmoothZoom, value); android_hardware_camera.startSmoothZoom, value);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.startSmoothZoom: %s", GST_ERROR ("Failed to call android.hardware.Camera.startSmoothZoom: %s",
err->message); err->message);
@ -2557,7 +2560,7 @@ gst_ah_camera_stop_preview (GstAHCamera * self)
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.stopPreview); android_hardware_camera.stopPreview);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.stopPreview: %s", GST_ERROR ("Failed to call android.hardware.Camera.stopPreview: %s",
err->message); err->message);
@ -2575,7 +2578,7 @@ gst_ah_camera_stop_smooth_zoom (GstAHCamera * self)
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.stopSmoothZoom); android_hardware_camera.stopSmoothZoom);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.stopSmoothZoom: %s", GST_ERROR ("Failed to call android.hardware.Camera.stopSmoothZoom: %s",
err->message); err->message);
@ -2593,7 +2596,7 @@ gst_ah_camera_unlock (GstAHCamera * self)
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera.unlock); android_hardware_camera.unlock);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.unlock: %s", GST_ERROR ("Failed to call android.hardware.Camera.unlock: %s",
err->message); err->message);
@ -3034,7 +3037,7 @@ gst_ahc_parameters_flatten (GstAHCParameters * self)
gchar *ret = NULL; gchar *ret = NULL;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.flatten, &v_str); android_hardware_camera_parameters.flatten, &v_str);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.flatten: %s", GST_ERROR ("Failed to call android.hardware.Camera.Parameters.flatten: %s",
err->message); err->message);
@ -3069,9 +3072,10 @@ gst_ahc_parameters_get_antibanding (GstAHCParameters * self)
jstring antibanding; jstring antibanding;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getAntibanding, &antibanding); android_hardware_camera_parameters.getAntibanding, &antibanding);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getAntibanding: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getAntibanding: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3094,9 +3098,10 @@ gst_ahc_parameters_get_color_effect (GstAHCParameters * self)
jstring color_effect; jstring color_effect;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getColorEffect, &color_effect); android_hardware_camera_parameters.getColorEffect, &color_effect);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getColorEffect: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getColorEffect: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3118,9 +3123,10 @@ gst_ahc_parameters_get_exposure_compensation (GstAHCParameters * self)
gint ev; gint ev;
gst_amc_jni_call_int_method (env, &err, self->object, gst_amc_jni_call_int_method (env, &err, self->object,
android_hardware_camera_parameters.getExposureCompensation, &ev); android_hardware_camera_parameters.getExposureCompensation, &ev);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getExposureCompensation: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getExposureCompensation: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return -1; return -1;
@ -3137,9 +3143,10 @@ gst_ahc_parameters_get_exposure_compensation_step (GstAHCParameters * self)
gfloat step; gfloat step;
gst_amc_jni_call_float_method (env, &err, self->object, gst_amc_jni_call_float_method (env, &err, self->object,
android_hardware_camera_parameters.getExposureCompensationStep, &step); android_hardware_camera_parameters.getExposureCompensationStep, &step);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getExposureCompensationStep: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getExposureCompensationStep: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return 0.0; return 0.0;
@ -3157,9 +3164,10 @@ gst_ahc_parameters_get_flash_mode (GstAHCParameters * self)
jstring flash_mode; jstring flash_mode;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getFlashMode, &flash_mode); android_hardware_camera_parameters.getFlashMode, &flash_mode);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getFlashMode: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getFlashMode: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3181,9 +3189,10 @@ gst_ahc_parameters_get_focal_length (GstAHCParameters * self)
gfloat length; gfloat length;
gst_amc_jni_call_float_method (env, &err, self->object, gst_amc_jni_call_float_method (env, &err, self->object,
android_hardware_camera_parameters.getFocalLength, &length); android_hardware_camera_parameters.getFocalLength, &length);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getFocalLength: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getFocalLength: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return 0.0; return 0.0;
@ -3201,9 +3210,10 @@ gst_ahc_parameters_get_focus_mode (GstAHCParameters * self)
jstring focus_mode; jstring focus_mode;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getFocusMode, &focus_mode); android_hardware_camera_parameters.getFocusMode, &focus_mode);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getFocusMode: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getFocusMode: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3225,9 +3235,10 @@ gst_ahc_parameters_get_horizontal_view_angle (GstAHCParameters * self)
gfloat angle; gfloat angle;
gst_amc_jni_call_float_method (env, &err, self->object, gst_amc_jni_call_float_method (env, &err, self->object,
android_hardware_camera_parameters.getHorizontalViewAngle, &angle); android_hardware_camera_parameters.getHorizontalViewAngle, &angle);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getHorizontalViewAngle: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getHorizontalViewAngle: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return 0.0; return 0.0;
@ -3244,9 +3255,10 @@ gst_ahc_parameters_get_max_exposure_compensation (GstAHCParameters * self)
gint max; gint max;
gst_amc_jni_call_int_method (env, &err, self->object, gst_amc_jni_call_int_method (env, &err, self->object,
android_hardware_camera_parameters.getMaxExposureCompensation, &max); android_hardware_camera_parameters.getMaxExposureCompensation, &max);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getMaxExposureCompensation: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getMaxExposureCompensation: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return 0; return 0;
@ -3263,9 +3275,10 @@ gst_ahc_parameters_get_max_zoom (GstAHCParameters * self)
gint max; gint max;
gst_amc_jni_call_int_method (env, &err, self->object, gst_amc_jni_call_int_method (env, &err, self->object,
android_hardware_camera_parameters.getMaxZoom, &max); android_hardware_camera_parameters.getMaxZoom, &max);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getMaxZoom: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getMaxZoom: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return -1; return -1;
@ -3282,9 +3295,10 @@ gst_ahc_parameters_get_min_exposure_compensation (GstAHCParameters * self)
gint min; gint min;
gst_amc_jni_call_int_method (env, &err, self->object, gst_amc_jni_call_int_method (env, &err, self->object,
android_hardware_camera_parameters.getMinExposureCompensation, &min); android_hardware_camera_parameters.getMinExposureCompensation, &min);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getMinExposureCompensation: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getMinExposureCompensation: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return 0; return 0;
@ -3301,9 +3315,10 @@ gst_ahc_parameters_get_preview_format (GstAHCParameters * self)
gint format; gint format;
gst_amc_jni_call_int_method (env, &err, self->object, gst_amc_jni_call_int_method (env, &err, self->object,
android_hardware_camera_parameters.getPreviewFormat, &format); android_hardware_camera_parameters.getPreviewFormat, &format);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getPreviewFormat: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getPreviewFormat: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return 0; return 0;
@ -3330,9 +3345,10 @@ gst_ahc_parameters_get_preview_fps_range (GstAHCParameters * self,
} }
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.getPreviewFpsRange, range); android_hardware_camera_parameters.getPreviewFpsRange, range);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getPreviewFpsRange: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getPreviewFpsRange: %s",
err->message); err->message);
goto done; goto done;
} }
@ -3369,9 +3385,10 @@ gst_ahc_parameters_get_preview_size (GstAHCParameters * self)
GstAHCSize *size = NULL; GstAHCSize *size = NULL;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getPreviewSize, &jsize); android_hardware_camera_parameters.getPreviewSize, &jsize);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getPreviewSize: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getPreviewSize: %s",
err->message); err->message);
goto done; goto done;
} }
@ -3415,9 +3432,10 @@ gst_ahc_parameters_get_scene_mode (GstAHCParameters * self)
jstring scene_mode; jstring scene_mode;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getSceneMode, &scene_mode); android_hardware_camera_parameters.getSceneMode, &scene_mode);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getSceneMode: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getSceneMode: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3440,9 +3458,10 @@ gst_ahc_parameters_get_supported_antibanding (GstAHCParameters * self)
GList *ret = NULL; GList *ret = NULL;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getSupportedAntibanding, &list); android_hardware_camera_parameters.getSupportedAntibanding, &list);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getSupportedAntibanding: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getSupportedAntibanding: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3486,9 +3505,10 @@ gst_ahc_parameters_get_supported_color_effects (GstAHCParameters * self)
GList *ret = NULL; GList *ret = NULL;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getSupportedColorEffects, &list); android_hardware_camera_parameters.getSupportedColorEffects, &list);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getSupportedColorEffects: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getSupportedColorEffects: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3532,9 +3552,10 @@ gst_ahc_parameters_get_supported_flash_modes (GstAHCParameters * self)
GList *ret = NULL; GList *ret = NULL;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getSupportedFlashModes, &list); android_hardware_camera_parameters.getSupportedFlashModes, &list);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getSupportedFlashModes: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getSupportedFlashModes: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3578,9 +3599,10 @@ gst_ahc_parameters_get_supported_focus_modes (GstAHCParameters * self)
GList *ret = NULL; GList *ret = NULL;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getSupportedFocusModes, &list); android_hardware_camera_parameters.getSupportedFocusModes, &list);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getSupportedFocusModes: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getSupportedFocusModes: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3624,9 +3646,10 @@ gst_ahc_parameters_get_supported_preview_formats (GstAHCParameters * self)
GList *ret = NULL; GList *ret = NULL;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getSupportedPreviewFormats, &list); android_hardware_camera_parameters.getSupportedPreviewFormats, &list);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getSupportedPreviewFormats: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getSupportedPreviewFormats: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3670,9 +3693,10 @@ gst_ahc_parameters_get_supported_preview_fps_range (GstAHCParameters * self)
GList *ret = NULL; GList *ret = NULL;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getSupportedPreviewFpsRange, &list); android_hardware_camera_parameters.getSupportedPreviewFpsRange, &list);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getSupportedPreviewFpsRange: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getSupportedPreviewFpsRange: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3718,9 +3742,10 @@ gst_ahc_parameters_get_supported_preview_sizes (GstAHCParameters * self)
GList *ret = NULL; GList *ret = NULL;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getSupportedPreviewSizes, &list); android_hardware_camera_parameters.getSupportedPreviewSizes, &list);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getSupportedPreviewSizes: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getSupportedPreviewSizes: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3770,9 +3795,10 @@ gst_ahc_parameters_get_supported_scene_modes (GstAHCParameters * self)
GList *ret = NULL; GList *ret = NULL;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getSupportedSceneModes, &list); android_hardware_camera_parameters.getSupportedSceneModes, &list);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getSupportedSceneModes: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getSupportedSceneModes: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3816,9 +3842,10 @@ gst_ahc_parameters_get_supported_white_balance (GstAHCParameters * self)
GList *ret = NULL; GList *ret = NULL;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getSupportedWhiteBalance, &list); android_hardware_camera_parameters.getSupportedWhiteBalance, &list);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getSupportedWhiteBalance: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getSupportedWhiteBalance: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3861,9 +3888,10 @@ gst_ahc_parameters_get_vertical_view_angle (GstAHCParameters * self)
gfloat angle; gfloat angle;
gst_amc_jni_call_float_method (env, &err, self->object, gst_amc_jni_call_float_method (env, &err, self->object,
android_hardware_camera_parameters.getVerticalViewAngle, &angle); android_hardware_camera_parameters.getVerticalViewAngle, &angle);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getVerticalViewAngle: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getVerticalViewAngle: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return 0.0; return 0.0;
@ -3880,9 +3908,10 @@ gst_ahc_parameters_get_video_stabilization (GstAHCParameters * self)
gboolean ret; gboolean ret;
gst_amc_jni_call_boolean_method (env, &err, self->object, gst_amc_jni_call_boolean_method (env, &err, self->object,
android_hardware_camera_parameters.getVideoStabilization, &ret); android_hardware_camera_parameters.getVideoStabilization, &ret);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getVideoStabilization: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getVideoStabilization: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -3900,9 +3929,10 @@ gst_ahc_parameters_get_white_balance (GstAHCParameters * self)
jstring white_balance; jstring white_balance;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getWhiteBalance, &white_balance); android_hardware_camera_parameters.getWhiteBalance, &white_balance);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getWhiteBalance: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getWhiteBalance: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3924,7 +3954,7 @@ gst_ahc_parameters_get_zoom (GstAHCParameters * self)
gint zoom; gint zoom;
gst_amc_jni_call_int_method (env, &err, self->object, gst_amc_jni_call_int_method (env, &err, self->object,
android_hardware_camera_parameters.getZoom, &zoom); android_hardware_camera_parameters.getZoom, &zoom);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getZoom: %s", GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getZoom: %s",
err->message); err->message);
@ -3944,9 +3974,10 @@ gst_ahc_parameters_get_zoom_ratios (GstAHCParameters * self)
GList *ret = NULL; GList *ret = NULL;
gst_amc_jni_call_object_method (env, &err, self->object, gst_amc_jni_call_object_method (env, &err, self->object,
android_hardware_camera_parameters.getZoomRatios, &list); android_hardware_camera_parameters.getZoomRatios, &list);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.getZoomRatios: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.getZoomRatios: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return NULL; return NULL;
@ -3989,9 +4020,10 @@ gst_ahc_parameters_is_smooth_zoom_supported (GstAHCParameters * self)
gboolean supported; gboolean supported;
gst_amc_jni_call_boolean_method (env, &err, self->object, gst_amc_jni_call_boolean_method (env, &err, self->object,
android_hardware_camera_parameters.isSmoothZoomSupported, &supported); android_hardware_camera_parameters.isSmoothZoomSupported, &supported);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.isSmoothZoomSupported: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.isSmoothZoomSupported: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4008,10 +4040,11 @@ gst_ahc_parameters_is_video_stabilization_supported (GstAHCParameters * self)
gboolean supported; gboolean supported;
gst_amc_jni_call_boolean_method (env, &err, self->object, gst_amc_jni_call_boolean_method (env, &err, self->object,
android_hardware_camera_parameters.isVideoStabilizationSupported, android_hardware_camera_parameters.isVideoStabilizationSupported,
&supported); &supported);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.isVideoStabilizationSupported: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.isVideoStabilizationSupported: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4028,9 +4061,10 @@ gst_ahc_parameters_is_zoom_supported (GstAHCParameters * self)
gboolean supported; gboolean supported;
gst_amc_jni_call_boolean_method (env, &err, self->object, gst_amc_jni_call_boolean_method (env, &err, self->object,
android_hardware_camera_parameters.isZoomSupported, &supported); android_hardware_camera_parameters.isZoomSupported, &supported);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.isZoomSupported: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.isZoomSupported: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4052,9 +4086,10 @@ gst_ahc_parameters_set_antibanding (GstAHCParameters * self,
return FALSE; return FALSE;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.setAntibanding, antibanding); android_hardware_camera_parameters.setAntibanding, antibanding);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.setAntibanding: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.setAntibanding: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4076,9 +4111,10 @@ gst_ahc_parameters_set_color_effect (GstAHCParameters * self,
return FALSE; return FALSE;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.setColorEffect, color_effect); android_hardware_camera_parameters.setColorEffect, color_effect);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.setColorEffect: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.setColorEffect: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4095,9 +4131,10 @@ gst_ahc_parameters_set_exposure_compensation (GstAHCParameters * self,
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.setExposureCompensation, value); android_hardware_camera_parameters.setExposureCompensation, value);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.setExposureCompensation: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.setExposureCompensation: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4118,9 +4155,10 @@ gst_ahc_parameters_set_flash_mode (GstAHCParameters * self, const gchar * value)
return FALSE; return FALSE;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.setFlashMode, flash_mode); android_hardware_camera_parameters.setFlashMode, flash_mode);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.setFlashMode: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.setFlashMode: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4141,9 +4179,10 @@ gst_ahc_parameters_set_focus_mode (GstAHCParameters * self, const gchar * value)
return FALSE; return FALSE;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.setFocusMode, focus_mode); android_hardware_camera_parameters.setFocusMode, focus_mode);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.setFocusMode: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.setFocusMode: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4159,9 +4198,10 @@ gst_ahc_parameters_set_preview_format (GstAHCParameters * self, gint format)
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.setPreviewFormat, format); android_hardware_camera_parameters.setPreviewFormat, format);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.setPreviewFormat: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.setPreviewFormat: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4178,9 +4218,10 @@ gst_ahc_parameters_set_preview_fps_range (GstAHCParameters * self,
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.setPreviewFpsRange, min, max); android_hardware_camera_parameters.setPreviewFpsRange, min, max);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.setPreviewFpsRange: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.setPreviewFpsRange: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4197,9 +4238,10 @@ gst_ahc_parameters_set_preview_size (GstAHCParameters * self,
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.setPreviewSize, width, height); android_hardware_camera_parameters.setPreviewSize, width, height);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.setPreviewSize: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.setPreviewSize: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4220,9 +4262,10 @@ gst_ahc_parameters_set_scene_mode (GstAHCParameters * self, const gchar * value)
return FALSE; return FALSE;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.setSceneMode, scene_mode); android_hardware_camera_parameters.setSceneMode, scene_mode);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.setSceneMode: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.setSceneMode: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4240,9 +4283,10 @@ gst_ahc_parameters_set_video_stabilization (GstAHCParameters * self,
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.setVideoStabilization, toggle); android_hardware_camera_parameters.setVideoStabilization, toggle);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.setVideoStabilization: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.setVideoStabilization: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4264,9 +4308,10 @@ gst_ahc_parameters_set_white_balance (GstAHCParameters * self,
return FALSE; return FALSE;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.setWhiteBalance, white_balance); android_hardware_camera_parameters.setWhiteBalance, white_balance);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.setWhiteBalance: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.setWhiteBalance: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -4282,7 +4327,7 @@ gst_ahc_parameters_set_zoom (GstAHCParameters * self, gint value)
GError *err = NULL; GError *err = NULL;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.setZoom, value); android_hardware_camera_parameters.setZoom, value);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.setZoom: %s", GST_ERROR ("Failed to call android.hardware.Camera.Parameters.setZoom: %s",
err->message); err->message);
@ -4306,9 +4351,10 @@ gst_ahc_parameters_unflatten (GstAHCParameters * self, const gchar * flattened)
return FALSE; return FALSE;
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_camera_parameters.unflatten, v_str); android_hardware_camera_parameters.unflatten, v_str);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.Camera.Parameters.unflatten: %s", GST_ERROR
("Failed to call android.hardware.Camera.Parameters.unflatten: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
ret = FALSE; ret = FALSE;

74
sys/androidmedia/gst-android-hardware-sensor.c
View file

@ -98,26 +98,51 @@ gst_ah_sensor_sensor_sizes_init (void)
gint type; gint type;
gsize size; gsize size;
} types[] = { } types[] = {
{AHS_SENSOR_TYPE_ACCELEROMETER, sizeof (GstAHSAccelerometerValues)}, {
{AHS_SENSOR_TYPE_AMBIENT_TEMPERATURE, sizeof (GstAHSAmbientTemperatureValues)}, AHS_SENSOR_TYPE_ACCELEROMETER, sizeof (GstAHSAccelerometerValues)}
{AHS_SENSOR_TYPE_GAME_ROTATION_VECTOR, sizeof (GstAHSGameRotationVectorValues)}, , {
{AHS_SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR, sizeof (GstAHSGeomagneticRotationVectorValues)}, AHS_SENSOR_TYPE_AMBIENT_TEMPERATURE,
{AHS_SENSOR_TYPE_GRAVITY, sizeof (GstAHSGravityValues)}, sizeof (GstAHSAmbientTemperatureValues)}
{AHS_SENSOR_TYPE_GYROSCOPE, sizeof (GstAHSGyroscopeValues)}, , {
{AHS_SENSOR_TYPE_GYROSCOPE_UNCALIBRATED, sizeof (GstAHSGyroscopeUncalibratedValues)}, AHS_SENSOR_TYPE_GAME_ROTATION_VECTOR,
{AHS_SENSOR_TYPE_HEART_RATE, sizeof (GstAHSHeartRateValues)}, sizeof (GstAHSGameRotationVectorValues)}
{AHS_SENSOR_TYPE_LIGHT, sizeof (GstAHSLightValues)}, , {
{AHS_SENSOR_TYPE_LINEAR_ACCELERATION, sizeof (GstAHSLinearAccelerationValues)}, AHS_SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR,
{AHS_SENSOR_TYPE_MAGNETIC_FIELD, sizeof (GstAHSMagneticFieldValues)}, sizeof (GstAHSGeomagneticRotationVectorValues)}
{AHS_SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED, sizeof (GstAHSMagneticFieldUncalibratedValues)}, , {
{AHS_SENSOR_TYPE_ORIENTATION, sizeof (GstAHSOrientationValues)}, AHS_SENSOR_TYPE_GRAVITY, sizeof (GstAHSGravityValues)}
{AHS_SENSOR_TYPE_PRESSURE, sizeof (GstAHSPressureValues)}, , {
{AHS_SENSOR_TYPE_PROXIMITY, sizeof (GstAHSProximityValues)}, AHS_SENSOR_TYPE_GYROSCOPE, sizeof (GstAHSGyroscopeValues)}
{AHS_SENSOR_TYPE_RELATIVE_HUMIDITY, sizeof (GstAHSRelativeHumidityValues)}, , {
{AHS_SENSOR_TYPE_ROTATION_VECTOR, sizeof (GstAHSRotationVectorValues)}, AHS_SENSOR_TYPE_GYROSCOPE_UNCALIBRATED,
{AHS_SENSOR_TYPE_STEP_COUNTER, sizeof (GstAHSStepCounterValues)}, sizeof (GstAHSGyroscopeUncalibratedValues)}
{AHS_SENSOR_TYPE_STEP_DETECTOR, sizeof (GstAHSStepDetectorValues)}, , {
}; AHS_SENSOR_TYPE_HEART_RATE, sizeof (GstAHSHeartRateValues)}
, {
AHS_SENSOR_TYPE_LIGHT, sizeof (GstAHSLightValues)}
, {
AHS_SENSOR_TYPE_LINEAR_ACCELERATION,
sizeof (GstAHSLinearAccelerationValues)}
, {
AHS_SENSOR_TYPE_MAGNETIC_FIELD, sizeof (GstAHSMagneticFieldValues)}
, {
AHS_SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED,
sizeof (GstAHSMagneticFieldUncalibratedValues)}
, {
AHS_SENSOR_TYPE_ORIENTATION, sizeof (GstAHSOrientationValues)}
, {
AHS_SENSOR_TYPE_PRESSURE, sizeof (GstAHSPressureValues)}
, {
AHS_SENSOR_TYPE_PROXIMITY, sizeof (GstAHSProximityValues)}
, {
AHS_SENSOR_TYPE_RELATIVE_HUMIDITY, sizeof (GstAHSRelativeHumidityValues)}
, {
AHS_SENSOR_TYPE_ROTATION_VECTOR, sizeof (GstAHSRotationVectorValues)}
, {
AHS_SENSOR_TYPE_STEP_COUNTER, sizeof (GstAHSStepCounterValues)}
, {
AHS_SENSOR_TYPE_STEP_DETECTOR, sizeof (GstAHSStepDetectorValues)}
,};
g_assert_null (sensor_sizes); g_assert_null (sensor_sizes);
@ -696,8 +721,7 @@ gst_ah_sensor_create_listener (GstAHSensorCallback sensor_cb,
org_freedesktop_gstreamer_androidmedia_gstahscallback.klass, org_freedesktop_gstreamer_androidmedia_gstahscallback.klass,
org_freedesktop_gstreamer_androidmedia_gstahscallback.constructor, org_freedesktop_gstreamer_androidmedia_gstahscallback.constructor,
UNION_CAST (sensor_cb, jlong), UNION_CAST (sensor_cb, jlong),
UNION_CAST (accuracy_cb, jlong), UNION_CAST (accuracy_cb, jlong), UNION_CAST (user_data, jlong));
UNION_CAST (user_data, jlong));
if (err) { if (err) {
GST_ERROR ("Failed to create listener callback class"); GST_ERROR ("Failed to create listener callback class");
g_clear_error (&err); g_clear_error (&err);
@ -722,7 +746,8 @@ gst_ah_sensor_register_listener (GstAHSensorManager * self,
android_hardware_sensor_manager.registerListener, &success, android_hardware_sensor_manager.registerListener, &success,
listener->object, sensor->object, (jint) delay); listener->object, sensor->object, (jint) delay);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.SensorManager.registerListener: %s", GST_ERROR
("Failed to call android.hardware.SensorManager.registerListener: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
return FALSE; return FALSE;
@ -742,7 +767,8 @@ gst_ah_sensor_unregister_listener (GstAHSensorManager * self,
gst_amc_jni_call_void_method (env, &err, self->object, gst_amc_jni_call_void_method (env, &err, self->object,
android_hardware_sensor_manager.unregisterListener, listener->object); android_hardware_sensor_manager.unregisterListener, listener->object);
if (err) { if (err) {
GST_ERROR ("Failed to call android.hardware.SensorManager.unregisterListener: %s", GST_ERROR
("Failed to call android.hardware.SensorManager.unregisterListener: %s",
err->message); err->message);
g_clear_error (&err); g_clear_error (&err);
} }

11
sys/androidmedia/gstahssrc.c
View file

@ -144,7 +144,8 @@ gst_ahs_src_get_sensor_type (void)
{AHS_SENSOR_TYPE_ACCELEROMETER, "accelerometer"}, {AHS_SENSOR_TYPE_ACCELEROMETER, "accelerometer"},
{AHS_SENSOR_TYPE_AMBIENT_TEMPERATURE, "ambient-temperature"}, {AHS_SENSOR_TYPE_AMBIENT_TEMPERATURE, "ambient-temperature"},
{AHS_SENSOR_TYPE_GAME_ROTATION_VECTOR, "game-rotation-vector"}, {AHS_SENSOR_TYPE_GAME_ROTATION_VECTOR, "game-rotation-vector"},
{AHS_SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR, "geomagnetic-rotation-vector"}, {AHS_SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR,
"geomagnetic-rotation-vector"},
{AHS_SENSOR_TYPE_GRAVITY, "gravity"}, {AHS_SENSOR_TYPE_GRAVITY, "gravity"},
{AHS_SENSOR_TYPE_GYROSCOPE, "gyroscope"}, {AHS_SENSOR_TYPE_GYROSCOPE, "gyroscope"},
{AHS_SENSOR_TYPE_GYROSCOPE_UNCALIBRATED, "gyroscope-uncalibrated"}, {AHS_SENSOR_TYPE_GYROSCOPE_UNCALIBRATED, "gyroscope-uncalibrated"},
@ -152,7 +153,8 @@ gst_ahs_src_get_sensor_type (void)
{AHS_SENSOR_TYPE_LIGHT, "light"}, {AHS_SENSOR_TYPE_LIGHT, "light"},
{AHS_SENSOR_TYPE_LINEAR_ACCELERATION, "linear-acceleration"}, {AHS_SENSOR_TYPE_LINEAR_ACCELERATION, "linear-acceleration"},
{AHS_SENSOR_TYPE_MAGNETIC_FIELD, "magnetic-field"}, {AHS_SENSOR_TYPE_MAGNETIC_FIELD, "magnetic-field"},
{AHS_SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED, "magnetic-field-uncalibrated"}, {AHS_SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED,
"magnetic-field-uncalibrated"},
{AHS_SENSOR_TYPE_ORIENTATION, "orientation"}, {AHS_SENSOR_TYPE_ORIENTATION, "orientation"},
{AHS_SENSOR_TYPE_PRESSURE, "pressure"}, {AHS_SENSOR_TYPE_PRESSURE, "pressure"},
{AHS_SENSOR_TYPE_PROXIMITY, "proximity"}, {AHS_SENSOR_TYPE_PROXIMITY, "proximity"},
@ -590,7 +592,8 @@ gst_ahs_src_update_smoothing (GstAHSSrc * self, const GstAHSensorEvent * event)
} else { } else {
for (i = 0; i < self->sample_length; i++) for (i = 0; i < self->sample_length; i++)
self->current_sample[i] = self->current_sample[i] =
(1-self->alpha) * self->current_sample[i] + self->alpha * event->data.values[i]; (1 - self->alpha) * self->current_sample[i] +
self->alpha * event->data.values[i];
} }
} }
@ -626,7 +629,7 @@ gst_ahs_src_on_sensor_changed (jobject event_object, gpointer user_data)
* https://code.google.com/p/android/issues/detail?id=7981 * https://code.google.com/p/android/issues/detail?id=7981
*/ */
buffer_time = buffer_time =
gst_clock_get_time (pipeline_clock) - GST_ELEMENT_CAST (self)->base_time; gst_clock_get_time (pipeline_clock) - GST_ELEMENT_CAST (self)->base_time;
success = success =
gst_ah_sensor_populate_event (&event, event_object, self->buffer_size); gst_ah_sensor_populate_event (&event, event_object, self->buffer_size);