From 58b1757ec803c5fae02982d7daf210d516c641c2 Mon Sep 17 00:00:00 2001 From: Marko Ollonen Date: Sun, 27 Jan 2013 10:24:32 +0200 Subject: [PATCH] update changelog, cleanup. Change-Id: I8ad268b0e8b336a5e0f5d1dd9746472726a6c4d7 --- gst-libs/atomisphal/atomisp.h | 20 ++++++++++++++++++++ gst-libs/gst/camera/gstmfldcameracontroliface.c | 7 +------ gst/mfldv4l2cam/gstv4l2camsrc.c | 2 -- packaging/mfldv4l2camsrc.changes | 3 +++ packaging/mfldv4l2camsrc.spec | 2 +- 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/gst-libs/atomisphal/atomisp.h b/gst-libs/atomisphal/atomisp.h index 5cce5c7..6b60516 100644 --- a/gst-libs/atomisphal/atomisp.h +++ b/gst-libs/atomisphal/atomisp.h @@ -684,6 +684,26 @@ struct v4l2_private_int_data { * http://linuxtv.org/downloads/v4l-dvb-apis/extended-controls.html\ * #flash-controls */ +/* FLASH controls are redefined by atom ips + * undef those to get rif of warnings. + */ +#ifdef V4L2_CID_FLASH_INTENSITY +#undef V4L2_CID_FLASH_INTENSITY +#endif +#ifdef V4L2_CID_FLASH_TORCH_INTENSITY +#undef V4L2_CID_FLASH_TORCH_INTENSITY +#endif +#ifdef V4L2_CID_FLASH_INDICATOR_INTENSITY +#undef V4L2_CID_FLASH_INDICATOR_INTENSITY +#endif +#ifdef V4L2_CID_FLASH_TIMEOUT +#undef V4L2_CID_FLASH_TIMEOUT +#endif +#ifdef V4L2_CID_FLASH_STROBE +#undef V4L2_CID_FLASH_STROBE +#endif + + /* Request a number of flash-exposed frames. The frame status can be * found in the reserved field in the v4l2_buffer struct. */ #define V4L2_CID_REQUEST_FLASH (V4L2_CID_CAMERA_LASTP1 + 3) diff --git a/gst-libs/gst/camera/gstmfldcameracontroliface.c b/gst-libs/gst/camera/gstmfldcameracontroliface.c index 21020fe..0a7abf9 100644 --- a/gst-libs/gst/camera/gstmfldcameracontroliface.c +++ b/gst-libs/gst/camera/gstmfldcameracontroliface.c @@ -84,8 +84,6 @@ gst_camerasrc_camera_control_set_value( GstCameraSrc * camerasrc, GstCameraSrcClass *bclass; gboolean opened; - GstCameraSrcCameraControlChannel *camchannel = - GST_CAMERA_SRC_CAMERA_CONTROL_CHANNEL(control_channel); bclass = GST_CAMERA_SRC_GET_CLASS (camerasrc); opened = bclass->is_open (camerasrc); @@ -103,9 +101,6 @@ gst_camerasrc_camera_control_get_value( GstCameraSrc * camerasrc, GstCameraSrcClass *bclass; gboolean opened; - GstCameraSrcCameraControlChannel *camchannel = - GST_CAMERA_SRC_CAMERA_CONTROL_CHANNEL(control_channel); - gint value; bclass = GST_CAMERA_SRC_GET_CLASS (camerasrc); opened = bclass->is_open (camerasrc); @@ -653,7 +648,7 @@ gst_camerasrc_camera_control_set_capture_command( GstCameraSrc* camerasrc, bclass = GST_CAMERA_SRC_GET_CLASS (camerasrc); opened = bclass->is_open (camerasrc); - g_return_val_if_fail (opened, FALSE); + g_return_if_fail (opened); GST_DEBUG_OBJECT (camerasrc, "set_capture_command: %d", cmd); diff --git a/gst/mfldv4l2cam/gstv4l2camsrc.c b/gst/mfldv4l2cam/gstv4l2camsrc.c index eeba13e..e60e504 100644 --- a/gst/mfldv4l2cam/gstv4l2camsrc.c +++ b/gst/mfldv4l2cam/gstv4l2camsrc.c @@ -1226,7 +1226,6 @@ gst_v4l2camsrc_set_property (GObject * object, GstStructure *ae_window_param = NULL; char * ctmp = NULL; gboolean parsed = TRUE; - ci_adv_Err r; ctmp = g_malloc0 (60); if (ctmp == NULL) @@ -1316,7 +1315,6 @@ gst_v4l2camsrc_set_property (GObject * object, GstStructure *af_window_param = NULL; char * ctmp = NULL; gboolean parsed = TRUE; - ci_adv_Err r; ctmp = g_malloc0 (60); if (ctmp == NULL) diff --git a/packaging/mfldv4l2camsrc.changes b/packaging/mfldv4l2camsrc.changes index 1a972e0..9a5688e 100644 --- a/packaging/mfldv4l2camsrc.changes +++ b/packaging/mfldv4l2camsrc.changes @@ -1,3 +1,6 @@ +* Sun Jan 27 2013 Marko Ollonen accepted/trunk/20130117.213933@b58e03f +- af window configuration update, TZSP-1668. + * Thu Jan 17 2013 Jussi Saavalainen submit/trunk/20130117.150127@471e12c - Add ISP ae_mode setting as Gst property. TZSP-4682 - Add exposure mode initialisation. diff --git a/packaging/mfldv4l2camsrc.spec b/packaging/mfldv4l2camsrc.spec index 4a28e05..6cdc535 100644 --- a/packaging/mfldv4l2camsrc.spec +++ b/packaging/mfldv4l2camsrc.spec @@ -1,6 +1,6 @@ Name: mfldv4l2camsrc Summary: Camera source component for Intel Medfield ISP -Version: 0.50 +Version: 0.51 Release: 1 Group: Applications/Multimedia License: LGPLv2+ -- 2.7.4