[tizencamerasrc] Support Next camera HAL for tizen 6.5

[Version] 1.16.2-23
[Issue Type] Update

Change-Id: Ic37c963af63e16eac7826629e6af0108a583d314
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/configure.ac b/configure.ac
index 91aba91..cd885ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -448,9 +448,9 @@ AC_ARG_ENABLE(tizencamerasrc, AC_HELP_STRING([--enable-tizencamerasrc], [using t
  [GST_TIZEN_USE_TIZENCAMERASRC=yes])
 AM_CONDITIONAL([GST_TIZEN_USE_TIZENCAMERASRC], [test "x$GST_TIZEN_USE_TIZENCAMERASRC" = "xyes"])
 if test "x$GST_TIZEN_USE_TIZENCAMERASRC" = "xyes"; then
-PKG_CHECK_MODULES(CAMERA_HAL_INTERFACE, camera-hal-interface)
-AC_SUBST(CAMERA_HAL_INTERFACE_CFLAGS)
-AC_SUBST(CAMERA_HAL_INTERFACE_LIBS)
+PKG_CHECK_MODULES(HAL_API_CAMERA, hal-api-camera)
+AC_SUBST(HAL_API_CAMERA_CFLAGS)
+AC_SUBST(HAL_API_CAMERA_LIBS)
 fi
 
 dnl use tinycompress --------------------------------------------------------------------------

diff --git a/packaging/gst-plugins-tizen.spec b/packaging/gst-plugins-tizen.spec
index 6d42e84..a3ed448 100644 (file)
--- a/packaging/gst-plugins-tizen.spec
+++ b/packaging/gst-plugins-tizen.spec
@@ -5,7 +5,7 @@
 Name:       gst-plugins-tizen
 Version:    1.16.2
 Summary:    GStreamer tizen plugins (common)
-Release:    22
+Release:    23
 Group:      Multimedia/Framework
 Url:        http://gstreamer.freedesktop.org/
 License:    LGPL-2.1+
@@ -45,9 +45,9 @@ BuildRequires:  pkgconfig(tizen-extension-client)
 %if 0%{?gtests:1}
 BuildRequires:  pkgconfig(gmock)
 %endif
-# for tizencamerasrc
-BuildRequires:  pkgconfig(camera-hal-interface)
 BuildRequires:  pkgconfig(capi-media-sound-manager)
+# for tizencamerasrc
+BuildRequires:  pkgconfig(hal-api-camera)
 
 %description
 GStreamer tizen plugins (common)

diff --git a/tizencamerasrc/src/Makefile.am b/tizencamerasrc/src/Makefile.am
index 9deab0e..ccde744 100644 (file)
--- a/tizencamerasrc/src/Makefile.am
+++ b/tizencamerasrc/src/Makefile.am
@@ -10,7 +10,7 @@ libgsttizencamerasrc_la_SOURCES = \
 
 libgsttizencamerasrc_la_CFLAGS = \
        -I$(srcdir)/include \
-       $(CAMERA_HAL_INTERFACE_CFLAGS) \
+       $(HAL_API_CAMERA_CFLAGS) \
        $(GST_CFLAGS) \
        $(GST_BASE_CFLAGS) \
        $(GST_VIDEO_FLAGS) \
@@ -19,7 +19,7 @@ libgsttizencamerasrc_la_CFLAGS = \
 
 libgsttizencamerasrc_la_LIBADD = \
        -ldl -lpthread -lrt -lm \
-       $(CAMERA_HAL_INTERFACE_LIBS) \
+       $(HAL_API_CAMERA_LIBS) \
        $(GST_LIBS) \
        $(GST_BASE_LIBS) \
        $(GST_VIDEO_LIBS) \

diff --git a/tizencamerasrc/src/gsttizencamerasrc.c b/tizencamerasrc/src/gsttizencamerasrc.c
index d17eb31..9eb4312 100644 (file)
--- a/tizencamerasrc/src/gsttizencamerasrc.c
+++ b/tizencamerasrc/src/gsttizencamerasrc.c
@@ -226,7 +226,7 @@ static gboolean gst_tizencamerasrc_get_timeinfo(GstTizenCameraSrc *camerasrc, Gs
 static gboolean gst_tizencamerasrc_capture_start(GstTizenCameraSrc *camerasrc);
 static gboolean gst_tizencamerasrc_capture_stop(GstTizenCameraSrc *camerasrc);
 static void gst_tizencamerasrc_error_handler(GstTizenCameraSrc *camerasrc, int ret);
-static GstBuffer *gst_tizencamerasrc_buffer_new(GstTizenCameraSrc *camerasrc, camera_buffer_t *buffer, GstTizenCameraBufferType type);
+static GstBuffer *gst_tizencamerasrc_buffer_new(GstTizenCameraSrc *camerasrc, camera_buffer_s *buffer, GstTizenCameraBufferType type);
 static void gst_tizencamerasrc_buffer_finalize(GstTizenCameraBuffer *buffer);
 static void gst_tizencamerasrc_set_video_format(GstTizenCameraSrc *camerasrc);
 static void gst_tizencamerasrc_set_capture_format(GstTizenCameraSrc *camerasrc);
@@ -236,7 +236,7 @@ static void gst_tizencamerasrc_set_capture_format(GstTizenCameraSrc *camerasrc);
 static unsigned long _get_current_time(void);
 #endif
 static gboolean _gst_tizencamerasrc_get_frame_size(int fourcc, int width, int height, unsigned int *outsize);
-static gboolean _gst_tizencamerasrc_get_raw_pixel_info(int fourcc, camera_pixel_format_t *pix_format);
+static gboolean _gst_tizencamerasrc_get_raw_pixel_info(int fourcc, camera_pixel_format_e *pix_format);
 static gboolean _gst_tizencamerasrc_get_tbm_format(int pix_format, guint32 *tbm_format);
 static void _gst_tizencamerasrc_post_message_int(GstTizenCameraSrc *camerasrc, const char *msg_name, const char *field_name, int value);
 
@@ -251,7 +251,7 @@ GST_IMPLEMENT_TIZENCAMERASRC_CONTROL_METHODS(GstTizenCameraSrc, gst_tizencamera_
 /******************************************************************************
  * Implementations
  *******************************************************************************/
-static GstBuffer *gst_tizencamerasrc_buffer_new(GstTizenCameraSrc *camerasrc, camera_buffer_t *buffer, GstTizenCameraBufferType type)
+static GstBuffer *gst_tizencamerasrc_buffer_new(GstTizenCameraSrc *camerasrc, camera_buffer_s *buffer, GstTizenCameraBufferType type)
 {
   GstTizenCameraBuffer *new_buffer = NULL;
   GstMemory *memory = NULL;
@@ -321,9 +321,9 @@ static GstBuffer *gst_tizencamerasrc_buffer_new(GstTizenCameraSrc *camerasrc, ca
     }
 
     if (type == BUFFER_TYPE_PREVIEW)
-      camera_hal_interface_release_preview_buffer(camerasrc->hal_intf_handle, buffer->index);
+      hal_camera_release_preview_buffer(camerasrc->hal_handle, buffer->index);
     else if (type == BUFFER_TYPE_VIDEO)
-      camera_hal_interface_release_video_buffer(camerasrc->hal_intf_handle, buffer->index);
+      hal_camera_release_video_buffer(camerasrc->hal_handle, buffer->index);
 
     memory = gst_memory_new_wrapped(0,
       new_buffer->copied_data,
@@ -376,7 +376,7 @@ static void gst_tizencamerasrc_buffer_finalize(GstTizenCameraBuffer *buffer)
 
   if (buffer->type == BUFFER_TYPE_PREVIEW) {
     if (!buffer->copied_data)
-      camera_hal_interface_release_preview_buffer(camerasrc->hal_intf_handle, buffer->index);
+      hal_camera_release_preview_buffer(camerasrc->hal_handle, buffer->index);
 
     g_mutex_lock(&camerasrc->preview_buffer_lock);
     camerasrc->preview_live_buffers--;
@@ -385,7 +385,7 @@ static void gst_tizencamerasrc_buffer_finalize(GstTizenCameraBuffer *buffer)
     g_mutex_unlock(&camerasrc->preview_buffer_lock);
   } else if (buffer->type == BUFFER_TYPE_VIDEO) {
     if (!buffer->copied_data)
-      camera_hal_interface_release_video_buffer(camerasrc->hal_intf_handle, buffer->index);
+      hal_camera_release_video_buffer(camerasrc->hal_handle, buffer->index);
 
     g_mutex_lock(&camerasrc->video_buffer_lock);
     camerasrc->video_live_buffers--;
@@ -414,7 +414,7 @@ static void gst_tizencamerasrc_buffer_finalize(GstTizenCameraBuffer *buffer)
 static void gst_tizencamerasrc_set_video_format(GstTizenCameraSrc *camerasrc)
 {
   int ret = CAMERA_ERROR_NONE;
-  camera_format_t set_format;
+  camera_format_s set_format;
 
   if (!camerasrc) {
     GST_ERROR("NULL handle");
@@ -456,7 +456,7 @@ static void gst_tizencamerasrc_set_video_format(GstTizenCameraSrc *camerasrc)
     set_format.stream_resolution.width, set_format.stream_resolution.height,
     set_format.stream_fps, set_format.stream_format, set_format.stream_rotation);
 
-  ret = camera_hal_interface_set_video_stream_format(camerasrc->hal_intf_handle, &set_format);
+  ret = hal_camera_set_video_stream_format(camerasrc->hal_handle, &set_format);
   if (ret != CAMERA_ERROR_NONE)
     GST_ERROR_OBJECT(camerasrc, "set video stream failed 0x%x", ret);
 
@@ -471,7 +471,7 @@ static void gst_tizencamerasrc_set_capture_format(GstTizenCameraSrc *camerasrc)
   int ret = CAMERA_ERROR_NONE;
   GstState state = GST_STATE_NULL;
   GstStateChangeReturn gst_ret;
-  camera_format_t stream_format;
+  camera_format_s stream_format;
 
   if (!camerasrc) {
     GST_ERROR("NULL handle");
@@ -494,7 +494,7 @@ static void gst_tizencamerasrc_set_capture_format(GstTizenCameraSrc *camerasrc)
   }
 
   /* preview capture resolution */
-  ret = camera_hal_interface_get_preview_stream_format(camerasrc->hal_intf_handle, &stream_format);
+  ret = hal_camera_get_preview_stream_format(camerasrc->hal_handle, &stream_format);
   if (ret != CAMERA_ERROR_NONE) {
     GST_ERROR_OBJECT(camerasrc, "failed to get stream format for preview");
     return;
@@ -507,7 +507,7 @@ static void gst_tizencamerasrc_set_capture_format(GstTizenCameraSrc *camerasrc)
   stream_format.capture_resolution.width = camerasrc->cap_width_tmp;
   stream_format.capture_resolution.height = camerasrc->cap_height_tmp;
 
-  ret = camera_hal_interface_set_preview_stream_format(camerasrc->hal_intf_handle, &stream_format);
+  ret = hal_camera_set_preview_stream_format(camerasrc->hal_handle, &stream_format);
   if (ret != CAMERA_ERROR_NONE) {
     GST_ERROR_OBJECT(camerasrc, "failed to set stream format for preview 0x%x", ret);
     return;
@@ -515,7 +515,7 @@ static void gst_tizencamerasrc_set_capture_format(GstTizenCameraSrc *camerasrc)
 
   /* video capture resolution */
   if (camerasrc->recording_hint) {
-    ret = camera_hal_interface_get_video_stream_format(camerasrc->hal_intf_handle, &stream_format);
+    ret = hal_camera_get_video_stream_format(camerasrc->hal_handle, &stream_format);
     if (ret != CAMERA_ERROR_NONE) {
       GST_ERROR_OBJECT(camerasrc, "failed to get stream format for video");
       return;
@@ -524,7 +524,7 @@ static void gst_tizencamerasrc_set_capture_format(GstTizenCameraSrc *camerasrc)
     stream_format.capture_resolution.width = camerasrc->cap_width_tmp;
     stream_format.capture_resolution.height = camerasrc->cap_height_tmp;
 
-    ret = camera_hal_interface_set_video_stream_format(camerasrc->hal_intf_handle, &stream_format);
+    ret = hal_camera_set_video_stream_format(camerasrc->hal_handle, &stream_format);
     if (ret != CAMERA_ERROR_NONE) {
       GST_ERROR_OBJECT(camerasrc, "failed to set stream format for video 0x%x", ret);
       return;
@@ -676,7 +676,7 @@ G_DEFINE_TYPE_WITH_CODE(GstTizenCameraSrc, gst_tizencamerasrc, GST_TYPE_PUSH_SRC
   G_IMPLEMENT_INTERFACE(GST_TYPE_CAMERA_CONTROL, gst_tizencamera_src_control_interface_init)
   G_IMPLEMENT_INTERFACE(GST_TYPE_COLOR_BALANCE, gst_tizencamera_src_color_balance_interface_init));
 
-static int _camera_hal_message_callback(camera_message_t *message, void *user_data)
+static int _camera_hal_message_callback(camera_message_s *message, void *user_data)
 {
   GstTizenCameraSrc *camerasrc = NULL;
 
@@ -713,7 +713,7 @@ static int _camera_hal_message_callback(camera_message_t *message, void *user_da
 }
 
 
-static int _camera_preview_frame_cb(camera_buffer_t *buffer, camera_metadata_t *meta, void *user_data)
+static int _camera_preview_frame_cb(camera_buffer_s *buffer, camera_metadata_s *meta, void *user_data)
 {
   GstTizenCameraSrc *camerasrc = NULL;
   GstBuffer *gst_buffer = NULL;
@@ -730,7 +730,7 @@ static int _camera_preview_frame_cb(camera_buffer_t *buffer, camera_metadata_t *
   if (camerasrc->preview_buffer_running == FALSE ||
     camerasrc->live_buffer_max < camerasrc->preview_live_buffers) {
 
-    camera_hal_interface_release_preview_buffer(camerasrc->hal_intf_handle, buffer->index);
+    hal_camera_release_preview_buffer(camerasrc->hal_handle, buffer->index);
 
     GST_WARNING_OBJECT(camerasrc, "Skip buffer[%d] running %d, Live buffer[%d/%d]",
       buffer->index, camerasrc->preview_buffer_running,
@@ -744,7 +744,7 @@ static int _camera_preview_frame_cb(camera_buffer_t *buffer, camera_metadata_t *
   if (!gst_buffer) {
     GST_ERROR_OBJECT(camerasrc, "new buffer allocation failed. size %u", buffer->total_size);
 
-    camera_hal_interface_release_preview_buffer(camerasrc->hal_intf_handle, buffer->index);
+    hal_camera_release_preview_buffer(camerasrc->hal_handle, buffer->index);
 
     goto _PREVIEW_FRAME_CB_DONE;
   }
@@ -768,7 +768,7 @@ _PREVIEW_FRAME_CB_DONE:
 }
 
 
-static int _camera_video_frame_cb(camera_buffer_t *buffer, camera_metadata_t *meta, void *user_data)
+static int _camera_video_frame_cb(camera_buffer_s *buffer, camera_metadata_s *meta, void *user_data)
 {
   GstTizenCameraSrc *camerasrc = NULL;
   GstBuffer *gst_buffer = NULL;
@@ -787,7 +787,7 @@ static int _camera_video_frame_cb(camera_buffer_t *buffer, camera_metadata_t *me
   if (camerasrc->video_buffer_running == FALSE ||
     camerasrc->live_buffer_max < camerasrc->video_live_buffers) {
 
-    camera_hal_interface_release_video_buffer(camerasrc->hal_intf_handle, buffer->index);
+    hal_camera_release_video_buffer(camerasrc->hal_handle, buffer->index);
 
     GST_WARNING_OBJECT(camerasrc, "Skip buffer[%d] running %d, Live buffer[%d/%d]",
       buffer->index, camerasrc->video_buffer_running,
@@ -801,7 +801,7 @@ static int _camera_video_frame_cb(camera_buffer_t *buffer, camera_metadata_t *me
   if (!gst_buffer) {
     GST_ERROR_OBJECT(camerasrc, "new buffer allocation failed. size %u", buffer->total_size);
 
-    camera_hal_interface_release_video_buffer(camerasrc->hal_intf_handle, buffer->index);
+    hal_camera_release_video_buffer(camerasrc->hal_handle, buffer->index);
 
     goto _VIDEO_FRAME_CB_DONE;
   }
@@ -852,7 +852,7 @@ _VIDEO_FRAME_CB_DONE:
 }
 
 
-static GstVideoFormat __get_gst_video_format(camera_pixel_format_t pixel_format)
+static GstVideoFormat __get_gst_video_format(camera_pixel_format_e pixel_format)
 {
   switch (pixel_format) {
   case CAMERA_PIXEL_FORMAT_NV12:
@@ -876,7 +876,7 @@ static GstVideoFormat __get_gst_video_format(camera_pixel_format_t pixel_format)
   }
 }
 
-static GstSample *__create_buffer_sample(GstTizenCameraSrc *camerasrc, camera_buffer_t *cam_buffer)
+static GstSample *__create_buffer_sample(GstTizenCameraSrc *camerasrc, camera_buffer_s *cam_buffer)
 {
   GstBuffer *gst_buffer = NULL;
   GstCaps *caps = NULL;
@@ -946,7 +946,7 @@ _CREATE_BUFFER_SAMPLE_DONE:
 }
 
 
-static int _camera_capture_cb(camera_buffer_t *main, camera_buffer_t *postview, camera_buffer_t *thumbnail, void *user_data)
+static int _camera_capture_cb(camera_buffer_s *main, camera_buffer_s *postview, camera_buffer_s *thumbnail, void *user_data)
 {
   GstTizenCameraSrc *camerasrc = NULL;
   GstSample *buf_sample1 = NULL;
@@ -993,7 +993,7 @@ static gboolean gst_tizencamerasrc_create(GstTizenCameraSrc *camerasrc)
 {
   int ret = 0;
 
-  if (!camerasrc->hal_intf_handle) {
+  if (!camerasrc->hal_handle) {
     GST_ERROR_OBJECT(camerasrc, "no camera HAL interface handle");
     gst_tizencamerasrc_error_handler(camerasrc, CAMERA_ERROR_DEVICE_NOT_FOUND);
     return FALSE;
@@ -1001,10 +1001,10 @@ static gboolean gst_tizencamerasrc_create(GstTizenCameraSrc *camerasrc)
 
   if (camerasrc->device_name) {
     GST_INFO_OBJECT(camerasrc, "open device - device name [%s]", camerasrc->device_name);
-    ret = camera_hal_interface_open_device_ext(camerasrc->hal_intf_handle, camerasrc->device_name);
+    ret = hal_camera_open_device_ext(camerasrc->hal_handle, camerasrc->device_name);
   } else {
     GST_INFO_OBJECT(camerasrc, "open device - camera id [%d]", camerasrc->camera_id);
-    ret = camera_hal_interface_open_device(camerasrc->hal_intf_handle, camerasrc->camera_id);
+    ret = hal_camera_open_device(camerasrc->hal_handle, camerasrc->camera_id);
   }
 
   if (ret != CAMERA_ERROR_NONE) {
@@ -1028,7 +1028,7 @@ static gboolean gst_tizencamerasrc_destroy(GstTizenCameraSrc *camerasrc)
 
   GST_INFO_OBJECT(camerasrc, "ENTERED");
 
-  if (camerasrc->hal_intf_handle == NULL) {
+  if (camerasrc->hal_handle == NULL) {
     GST_ERROR_OBJECT(camerasrc, "not initialized");
     return FALSE;
   }
@@ -1036,9 +1036,9 @@ static gboolean gst_tizencamerasrc_destroy(GstTizenCameraSrc *camerasrc)
   /* camera hal interface close device */
   GST_INFO_OBJECT(camerasrc, "ENTERED");
 
-  ret = camera_hal_interface_close_device(camerasrc->hal_intf_handle);
+  ret = hal_camera_close_device(camerasrc->hal_handle);
   if (ret != CAMERA_ERROR_NONE) {
-    GST_ERROR_OBJECT(camerasrc, "camera_hal_interface_close_device failed 0x%x", ret);
+    GST_ERROR_OBJECT(camerasrc, "hal_camera_close_device failed 0x%x", ret);
     return FALSE;
   }
 
@@ -1137,13 +1137,13 @@ static gboolean gst_tizencamerasrc_start(GstTizenCameraSrc *camerasrc)
 {
   int ret = 0;
 
-  camera_flip_t set_flip;
-  camera_format_t set_format;
+  camera_flip_e set_flip;
+  camera_format_s set_format;
 
   GST_DEBUG_OBJECT(camerasrc, "ENTERED");
 
   /* set message callback */
-  camera_hal_interface_add_message_callback(camerasrc->hal_intf_handle, _camera_hal_message_callback, camerasrc, &camerasrc->msg_cb_id);
+  hal_camera_add_message_callback(camerasrc->hal_handle, _camera_hal_message_callback, camerasrc, &camerasrc->msg_cb_id);
 
   CLEAR(set_format);
 
@@ -1195,9 +1195,9 @@ static gboolean gst_tizencamerasrc_start(GstTizenCameraSrc *camerasrc)
                              camerasrc->width, camerasrc->height, set_format.stream_fps,
                              camerasrc->pix_format, camerasrc->rotate);
 
-  ret = camera_hal_interface_set_preview_stream_format(camerasrc->hal_intf_handle, &set_format);
+  ret = hal_camera_set_preview_stream_format(camerasrc->hal_handle, &set_format);
   if (ret != CAMERA_ERROR_NONE) {
-    GST_ERROR_OBJECT(camerasrc, "camera_hal_interface_set_preview_stream_format() failed 0x%x", ret);
+    GST_ERROR_OBJECT(camerasrc, "hal_camera_set_preview_stream_format() failed 0x%x", ret);
     goto _ERROR;
   }
 
@@ -1214,9 +1214,9 @@ static gboolean gst_tizencamerasrc_start(GstTizenCameraSrc *camerasrc)
       set_flip = CAMERA_FLIP_NONE;
   }
 
-  ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_FLIP, (void *)&set_flip);
+  ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_FLIP, (void *)&set_flip);
   if (ret != CAMERA_ERROR_NONE) {
-    GST_ERROR_OBJECT(camerasrc, "camera_hal_interface_set_command() failed 0x%x", ret);
+    GST_ERROR_OBJECT(camerasrc, "hal_camera_set_command() failed 0x%x", ret);
     goto _ERROR;
   }
 
@@ -1225,9 +1225,9 @@ static gboolean gst_tizencamerasrc_start(GstTizenCameraSrc *camerasrc)
   camerasrc->preview_live_buffers = 0;
 
   /* start preview stream */
-  ret = camera_hal_interface_start_preview(camerasrc->hal_intf_handle, _camera_preview_frame_cb, camerasrc);
+  ret = hal_camera_start_preview(camerasrc->hal_handle, _camera_preview_frame_cb, camerasrc);
   if (ret != CAMERA_ERROR_NONE) {
-    GST_ERROR_OBJECT(camerasrc, "camera_hal_interface_start_preview() failed 0x%x", ret);
+    GST_ERROR_OBJECT(camerasrc, "hal_camera_start_preview() failed 0x%x", ret);
     camerasrc->preview_buffer_running = FALSE;
     goto _ERROR;
   }
@@ -1258,7 +1258,7 @@ static gboolean gst_tizencamerasrc_stop(GstTizenCameraSrc *camerasrc)
 
   GST_INFO_OBJECT (camerasrc, "ENTERED");
 
-  if (camerasrc->hal_intf_handle) {
+  if (camerasrc->hal_handle) {
     g_mutex_lock(&camerasrc->preview_buffer_lock);
 
     if (camerasrc->preview_buffer_running) {
@@ -1298,9 +1298,9 @@ static gboolean gst_tizencamerasrc_stop(GstTizenCameraSrc *camerasrc)
     GST_INFO_OBJECT(camerasrc, "stop preview stream");
 
     /* stop preview stream */
-    ret = camera_hal_interface_stop_preview(camerasrc->hal_intf_handle);
+    ret = hal_camera_stop_preview(camerasrc->hal_handle);
     if (ret != CAMERA_ERROR_NONE) {
-      GST_ERROR_OBJECT(camerasrc, "camera_hal_interface_stop_preview failed 0x%x", ret);
+      GST_ERROR_OBJECT(camerasrc, "hal_camera_stop_preview failed 0x%x", ret);
       camerasrc->preview_buffer_running = TRUE;
       return FALSE;
     }
@@ -1328,19 +1328,19 @@ static gboolean gst_tizencamerasrc_capture_start(GstTizenCameraSrc *camerasrc)
   GST_INFO_OBJECT(camerasrc, "start capture - count %d, interval %d",
     camerasrc->cap_count, camerasrc->cap_interval);
 
-  ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle,
+  ret = hal_camera_set_command(camerasrc->hal_handle,
     CAMERA_COMMAND_CAPTURE_COUNT, (void *)&camerasrc->cap_count);
   if (ret != CAMERA_ERROR_NONE)
     GST_WARNING_OBJECT(camerasrc, "set capture count failed 0x%x", ret);
 
   if (camerasrc->cap_count > 1) {
-    ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle,
+    ret = hal_camera_set_command(camerasrc->hal_handle,
       CAMERA_COMMAND_CAPTURE_INTERVAL, (void *)&camerasrc->cap_interval);
     if (ret != CAMERA_ERROR_NONE)
       GST_WARNING_OBJECT(camerasrc, "set capture interval failed 0x%x", ret);
   }
 
-  ret = camera_hal_interface_start_capture(camerasrc->hal_intf_handle, _camera_capture_cb, camerasrc);
+  ret = hal_camera_start_capture(camerasrc->hal_handle, _camera_capture_cb, camerasrc);
   if (ret != CAMERA_ERROR_NONE) {
     GST_ERROR_OBJECT(camerasrc, "start capture failed 0x%x", ret);
     return FALSE;
@@ -1361,9 +1361,9 @@ static gboolean gst_tizencamerasrc_capture_stop(GstTizenCameraSrc *camerasrc)
   GST_INFO_OBJECT(camerasrc, "ENTERED - mode %d", camerasrc->mode);
 
   if (camerasrc->mode == VIDEO_IN_MODE_CAPTURE) {
-    ret = camera_hal_interface_stop_capture(camerasrc->hal_intf_handle);
+    ret = hal_camera_stop_capture(camerasrc->hal_handle);
     if (ret != CAMERA_ERROR_NONE) {
-      GST_ERROR_OBJECT(camerasrc, "camera_hal_interface_stop_capture failed 0x%x", ret);
+      GST_ERROR_OBJECT(camerasrc, "hal_camera_stop_capture failed 0x%x", ret);
       return FALSE;
     }
 
@@ -1614,20 +1614,20 @@ static void gst_tizencamerasrc_set_property(GObject *object, guint prop_id,
     camerasrc->hal_name = g_value_dup_string(value);
 
     /* reset camera hal interface handle */
-    if (camerasrc->hal_intf_handle) {
-      GST_INFO_OBJECT(camerasrc, "Reset HAL intf: %p", camerasrc->hal_intf_handle);
-      camera_hal_interface_deinit(camerasrc->hal_intf_handle);
-      camerasrc->hal_intf_handle = NULL;
+    if (camerasrc->hal_handle) {
+      GST_INFO_OBJECT(camerasrc, "Reset HAL intf: %p", camerasrc->hal_handle);
+      hal_camera_deinit(camerasrc->hal_handle);
+      camerasrc->hal_handle = NULL;
     }
 
     GST_WARNING_OBJECT(camerasrc, "Set HAL name: %s", camerasrc->hal_name);
 
-    ret = camera_hal_interface_init(&camerasrc->hal_intf_handle, camerasrc->hal_name);
+    ret = hal_camera_init(camerasrc->hal_name, &camerasrc->hal_handle);
     if (ret == CAMERA_ERROR_NONE) {
-      ret = camera_hal_interface_get_device_info_list(camerasrc->hal_intf_handle, &camerasrc->device_info);
+      ret = hal_camera_get_device_info_list(camerasrc->hal_handle, &camerasrc->device_info);
       GST_WARNING_OBJECT(camerasrc, "device info: 0x%x, count: %d", ret, camerasrc->device_info.count);
     } else {
-      GST_ERROR_OBJECT(camerasrc, "camera_hal_interface_init failed: 0x%x", ret);
+      GST_ERROR_OBJECT(camerasrc, "hal_camera_init failed: 0x%x", ret);
     }
     break;
   case ARG_CAPTURE_FOURCC:
@@ -1657,12 +1657,12 @@ static void gst_tizencamerasrc_set_property(GObject *object, guint prop_id,
     break;
   case ARG_BITRATE:
     camerasrc->bitrate = g_value_get_int(value);
-    ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_BITRATE, (void *)&camerasrc->bitrate);
+    ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_BITRATE, (void *)&camerasrc->bitrate);
     GST_INFO_OBJECT(camerasrc, "Set bitrate : %d, ret 0x%x", camerasrc->bitrate, ret);
     break;
   case ARG_GOP_INTERVAL:
     camerasrc->gop_interval = g_value_get_int(value);
-    ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_GOP_INTERVAL, (void *)&camerasrc->gop_interval);
+    ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_GOP_INTERVAL, (void *)&camerasrc->gop_interval);
     GST_INFO_OBJECT(camerasrc, "Set GOP interval : %d, ret 0x%x", camerasrc->gop_interval, ret);
     break;
   case ARG_VFLIP:
@@ -1855,11 +1855,11 @@ static void gst_tizencamerasrc_finalize(GObject *object)
 
   GST_INFO_OBJECT(camerasrc, "ENTERED");
 
-  ret = camera_hal_interface_deinit(camerasrc->hal_intf_handle);
+  ret = hal_camera_deinit(camerasrc->hal_handle);
   if (ret != CAMERA_ERROR_NONE)
-    GST_ERROR_OBJECT(camerasrc, "camera_hal_interface_deinit failed 0x%x", ret);
+    GST_ERROR_OBJECT(camerasrc, "hal_camera_deinit failed 0x%x", ret);
 
-  camerasrc->hal_intf_handle = NULL;
+  camerasrc->hal_handle = NULL;
 
   g_cond_clear(&camerasrc->preview_buffer_cond);
   g_mutex_clear(&camerasrc->preview_buffer_lock);
@@ -1917,11 +1917,11 @@ void gst_tizencamerasrc_set_record_command(GstTizenCameraSrc *camerasrc, GstCame
   GST_INFO_OBJECT(camerasrc, "ENTERED - cmd %d", cmd);
 
   if (cmd == GST_CAMERA_CONTROL_RECORD_COMMAND_START) {
-    ret = camera_hal_interface_start_record(camerasrc->hal_intf_handle, _camera_video_frame_cb, camerasrc);
+    ret = hal_camera_start_record(camerasrc->hal_handle, _camera_video_frame_cb, camerasrc);
     if (ret == CAMERA_ERROR_NONE)
       camerasrc->video_first_frame = TRUE;
   } else if (cmd == GST_CAMERA_CONTROL_RECORD_COMMAND_STOP) {
-    ret = camera_hal_interface_stop_record(camerasrc->hal_intf_handle);
+    ret = hal_camera_stop_record(camerasrc->hal_handle);
   } else {
     GST_WARNING_OBJECT(camerasrc, "not supported command %d", cmd);
   }
@@ -1943,7 +1943,7 @@ gboolean gst_tizencamerasrc_set_user_buffer_fd(GstTizenCameraSrc *camerasrc, int
 
   GST_INFO_OBJECT(camerasrc, "ENTERED - number %d", number);
 
-  ret = camera_hal_interface_set_user_buffer_fd(camerasrc->hal_intf_handle, fds, number);
+  ret = hal_camera_set_user_buffer_fd(camerasrc->hal_handle, fds, number);
 
   GST_INFO_OBJECT(camerasrc, "LEAVE - ret 0x%x", ret);
 
@@ -2102,7 +2102,7 @@ static GstCaps *gst_tizencamerasrc_get_caps(GstBaseSrc *src, GstCaps *filter)
 }
 
 
-static gboolean _gst_tizencamerasrc_get_raw_pixel_info(int fourcc, camera_pixel_format_t *pix_format)
+static gboolean _gst_tizencamerasrc_get_raw_pixel_info(int fourcc, camera_pixel_format_e *pix_format)
 {
   if (pix_format == NULL) {
     GST_ERROR("NULL pointer");
@@ -2683,7 +2683,7 @@ static void gst_tizencamerasrc_init(GstTizenCameraSrc *camerasrc)
 {
   GST_INFO_OBJECT(camerasrc, "ENTERED");
 
-  camerasrc->hal_intf_handle = NULL;
+  camerasrc->hal_handle = NULL;
   camerasrc->mode = VIDEO_IN_MODE_NONE;
   camerasrc->firsttime = TRUE;
   camerasrc->cap_count_current = -1;

diff --git a/tizencamerasrc/src/gsttizencamerasrccolorbalance.c b/tizencamerasrc/src/gsttizencamerasrccolorbalance.c
index c4e8255..6ef7ea8 100644 (file)
--- a/tizencamerasrc/src/gsttizencamerasrccolorbalance.c
+++ b/tizencamerasrc/src/gsttizencamerasrccolorbalance.c
@@ -73,7 +73,7 @@ void gst_tizencamerasrc_color_balance_set_value(GstTizenCameraSrc *camerasrc, Gs
   g_return_if_fail(camerasrc);
   g_return_if_fail(gst_tizencamerasrc_color_balance_contains_channel(camerasrc, camerasrc_color_channel));
 
-  ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, camerasrc_color_channel->id, (void *)&value);
+  ret = hal_camera_set_command(camerasrc->hal_handle, camerasrc_color_channel->id, (void *)&value);
   if (ret != CAMERA_ERROR_NONE)
     GST_ERROR_OBJECT(camerasrc, "Failed to set command (color balance) 0x%x value[%d]", ret, value);
 
@@ -90,7 +90,7 @@ gint gst_tizencamerasrc_color_balance_get_value(GstTizenCameraSrc *camerasrc, Gs
   g_return_val_if_fail(camerasrc, FALSE);
   g_return_val_if_fail(gst_tizencamerasrc_color_balance_contains_channel(camerasrc, camerasrc_color_channel), FALSE);
 
-  ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, camerasrc_color_channel->id, (void **)&value);
+  ret = hal_camera_get_command(camerasrc->hal_handle, camerasrc_color_channel->id, (void **)&value);
   if (ret != CAMERA_ERROR_NONE)
     GST_ERROR_OBJECT(camerasrc, "Failed to get command (color balance) 0x%x", ret);
 

diff --git a/tizencamerasrc/src/gsttizencamerasrccontrol.c b/tizencamerasrc/src/gsttizencamerasrccontrol.c
index d1749e4..ad1d1d6 100644 (file)
--- a/tizencamerasrc/src/gsttizencamerasrccontrol.c
+++ b/tizencamerasrc/src/gsttizencamerasrccontrol.c
@@ -28,7 +28,6 @@
 
 #include <gst/gst.h>
 #include "gsttizencamerasrccontrol.h"
-#include "camera_hal_interface.h"
 
 #define gst_tizencamerasrc_debug(fmt, args...)       GST_INFO(fmt, ##args)
 
@@ -89,7 +88,7 @@ gboolean gst_tizencamerasrc_control_set_value(GstTizenCameraSrc *camerasrc, GstC
   g_return_val_if_fail(camerasrc, FALSE);
   g_return_val_if_fail(gst_tizencamerasrc_control_contains_channel(camerasrc, camerasrc_control_channel), FALSE);
 
-  ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, camerasrc_control_channel->id, (void *)&value);
+  ret = hal_camera_set_command(camerasrc->hal_handle, camerasrc_control_channel->id, (void *)&value);
 
   if (ret != CAMERA_ERROR_NONE) {
     gst_tizencamerasrc_debug("Failed to set control value 0x%x id[%"PRId64"] value[%d]", ret, camerasrc_control_channel->id, value);
@@ -108,7 +107,7 @@ gboolean gst_tizencamerasrc_control_get_value(GstTizenCameraSrc *camerasrc, GstC
 
   g_return_val_if_fail(camerasrc, FALSE);
   g_return_val_if_fail(gst_tizencamerasrc_control_contains_channel(camerasrc, camerasrc_control_channel), FALSE);
-  ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, camerasrc_control_channel->id, (void **)&value);
+  ret = hal_camera_get_command(camerasrc->hal_handle, camerasrc_control_channel->id, (void **)&value);
 
   if (ret != CAMERA_ERROR_NONE) {
     gst_tizencamerasrc_debug("Failed to get value 0x%x id[%"PRId64"]", ret, camerasrc_control_channel->id);
@@ -121,7 +120,7 @@ gboolean gst_tizencamerasrc_control_get_value(GstTizenCameraSrc *camerasrc, GstC
 gboolean gst_tizencamerasrc_control_set_exposure(GstTizenCameraSrc *camerasrc, gint type, gint value1, gint value2)
 {
   int ret = CAMERA_ERROR_NONE;
-  camera_fraction_t frac;
+  camera_fraction_s frac;
 
   g_return_val_if_fail(camerasrc, FALSE);
 
@@ -136,25 +135,25 @@ gboolean gst_tizencamerasrc_control_set_exposure(GstTizenCameraSrc *camerasrc, g
     frac.numerator = value1;
     frac.denominator = value2;
     gst_tizencamerasrc_debug("                camerasrc_set_shutter_speed");
-    ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_SHUTTER_SPEED, (void *)&frac);
+    ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_SHUTTER_SPEED, (void *)&frac);
     break;
   case GST_CAMERA_CONTROL_ISO:
     gst_tizencamerasrc_debug("                camerasrc_set_iso_value");
-    ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_ISO, (void *)&value1);
+    ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_ISO, (void *)&value1);
     break;
   case GST_CAMERA_CONTROL_PROGRAM_MODE:
     gst_tizencamerasrc_debug("                camerasrc_set_control");
-    ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_SCENE_MODE, (void *)&value1);
+    ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_SCENE_MODE, (void *)&value1);
     break;
   case GST_CAMERA_CONTROL_EXPOSURE_MODE:
     gst_tizencamerasrc_debug("                camerasrc_set_exposure_mode");
-    ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_EXPOSURE_MODE, (void *)&value1);
+    ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_EXPOSURE_MODE, (void *)&value1);
     break;
   case GST_CAMERA_CONTROL_EXPOSURE_VALUE:
     frac.numerator = value1;
     frac.denominator = value2;
     gst_tizencamerasrc_debug("                camerasrc_set_exposure_value");
-    ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_EXPOSURE, (void *)&frac);
+    ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_EXPOSURE, (void *)&frac);
     break;
   default:
     gst_tizencamerasrc_debug("Not supported type.");
@@ -172,7 +171,7 @@ gboolean gst_tizencamerasrc_control_set_exposure(GstTizenCameraSrc *camerasrc, g
 gboolean gst_tizencamerasrc_control_get_exposure(GstTizenCameraSrc *camerasrc, gint type, gint *value1, gint *value2)
 {
   int ret = CAMERA_ERROR_NONE;
-  camera_fraction_t frac;
+  camera_fraction_s frac;
 
   g_return_val_if_fail(camerasrc, FALSE);
   g_return_val_if_fail(value1, FALSE);
@@ -185,24 +184,24 @@ gboolean gst_tizencamerasrc_control_get_exposure(GstTizenCameraSrc *camerasrc, g
     break;
   case GST_CAMERA_CONTROL_SHUTTER_SPEED:
     g_return_val_if_fail(value2, FALSE);
-    ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_SHUTTER_SPEED, (void **)&frac);
+    ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_SHUTTER_SPEED, (void **)&frac);
     if (ret == CAMERA_ERROR_NONE) {
       *value1 = frac.numerator;
       *value2 = frac.denominator;
     }
     break;
   case GST_CAMERA_CONTROL_ISO:
-    ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_ISO, (void **)value1);
+    ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_ISO, (void **)value1);
     break;
   case GST_CAMERA_CONTROL_PROGRAM_MODE:
-    ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_SCENE_MODE, (void **)value1);
+    ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_SCENE_MODE, (void **)value1);
     break;
   case GST_CAMERA_CONTROL_EXPOSURE_MODE:
-    ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_EXPOSURE_MODE, (void **)value1);
+    ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_EXPOSURE_MODE, (void **)value1);
     break;
   case GST_CAMERA_CONTROL_EXPOSURE_VALUE:
     g_return_val_if_fail(value2, FALSE);
-    ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_EXPOSURE, (void **)&frac);
+    ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_EXPOSURE, (void **)&frac);
     if (ret == CAMERA_ERROR_NONE) {
       *value1 = frac.numerator;
       *value2 = frac.denominator;
@@ -293,10 +292,10 @@ gboolean gst_tizencamerasrc_control_set_strobe(GstTizenCameraSrc *camerasrc, gin
 
   switch (type) {
   case GST_CAMERA_CONTROL_STROBE_MODE:
-    ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_FLASH_MODE, (void *)&value);
+    ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_FLASH_MODE, (void *)&value);
     break;
   case GST_CAMERA_CONTROL_STROBE_BRIGHTNESS:
-    ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_FLASH_BRIGHTNESS, (void *)&value);
+    ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_FLASH_BRIGHTNESS, (void *)&value);
     break;
   case GST_CAMERA_CONTROL_STROBE_CONTROL:
   case GST_CAMERA_CONTROL_STROBE_CAPABILITIES:
@@ -328,10 +327,10 @@ gboolean gst_tizencamerasrc_control_get_strobe(GstTizenCameraSrc *camerasrc, gin
 
   switch (type) {
   case GST_CAMERA_CONTROL_STROBE_MODE:
-    ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_FLASH_MODE, (void **)&value);
+    ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_FLASH_MODE, (void **)value);
     break;
   case GST_CAMERA_CONTROL_STROBE_BRIGHTNESS:
-    ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_FLASH_BRIGHTNESS, (void **)&value);
+    ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_FLASH_BRIGHTNESS, (void **)&value);
     break;
   case GST_CAMERA_CONTROL_STROBE_CONTROL:
   case GST_CAMERA_CONTROL_STROBE_CAPABILITIES:
@@ -362,7 +361,7 @@ gboolean gst_tizencamerasrc_control_set_detect(GstTizenCameraSrc *camerasrc, gin
   /* TODO */
   switch (type) {
   case GST_CAMERA_CONTROL_FACE_DETECT_MODE:
-    ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_FACE_DETECTION, (void *)&value);
+    ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_FACE_DETECTION, (void *)&value);
     break;
   case GST_CAMERA_CONTROL_FACE_DETECT_NUMBER:
     break;
@@ -396,7 +395,7 @@ gboolean gst_tizencamerasrc_control_get_detect(GstTizenCameraSrc *camerasrc, gin
   /* TODO : detection number, focus select, select number, detect status */
   switch (type) {
   case GST_CAMERA_CONTROL_FACE_DETECT_MODE:
-    ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_FACE_DETECTION, (void **)value);
+    ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_FACE_DETECTION, (void **)value);
     break;
   case GST_CAMERA_CONTROL_FACE_DETECT_NUMBER:
     break;
@@ -429,10 +428,10 @@ gboolean gst_tizencamerasrc_control_set_zoom(GstTizenCameraSrc *camerasrc, gint
 
   switch (type) {
   case GST_CAMERA_CONTROL_DIGITAL_ZOOM:
-    ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_DIGITAL_ZOOM, (void *)&value);
+    ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_DIGITAL_ZOOM, (void *)&value);
     break;
   case GST_CAMERA_CONTROL_OPTICAL_ZOOM:
-    ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_OPTICAL_ZOOM, (void *)&value);
+    ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_OPTICAL_ZOOM, (void *)&value);
     break;
   default:
     gst_tizencamerasrc_debug("Not supported type.");
@@ -457,10 +456,10 @@ gboolean gst_tizencamerasrc_control_get_zoom(GstTizenCameraSrc *camerasrc, gint
 
   switch (type) {
   case GST_CAMERA_CONTROL_DIGITAL_ZOOM:
-    ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_DIGITAL_ZOOM, (void **)value);
+    ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_DIGITAL_ZOOM, (void **)value);
     break;
   case GST_CAMERA_CONTROL_OPTICAL_ZOOM:
-    ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_OPTICAL_ZOOM, (void **)value);
+    ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_OPTICAL_ZOOM, (void **)value);
     break;
   default:
     gst_tizencamerasrc_debug("Not supported type.");
@@ -484,16 +483,16 @@ gboolean gst_tizencamerasrc_control_set_focus(GstTizenCameraSrc *camerasrc, gint
 
   gst_tizencamerasrc_debug("set focus");
 
-  camera_batch_command_control_t batch_cmd;
+  camera_batch_command_control_s batch_cmd;
 
-  memset(&batch_cmd, 0x0, sizeof(camera_batch_command_control_t));
+  memset(&batch_cmd, 0x0, sizeof(camera_batch_command_control_s));
 
   batch_cmd.focus_mode = focus_mode;
   batch_cmd.command_set_flag |= CAMERA_COMMAND_FOCUS_MODE;
   batch_cmd.focus_range = focus_range;
   batch_cmd.command_set_flag |= CAMERA_COMMAND_FOCUS_RANGE;
 
-  ret = camera_hal_interface_set_batch_command(camerasrc->hal_intf_handle, &batch_cmd, &error_cmd);
+  ret = hal_camera_set_batch_command(camerasrc->hal_handle, &batch_cmd, &error_cmd);
   if (ret != CAMERA_ERROR_NONE) {
     gst_tizencamerasrc_debug("Failed to set AF mode. error cmd %lld", error_cmd);
     return FALSE;
@@ -510,8 +509,8 @@ gboolean gst_tizencamerasrc_control_get_focus(GstTizenCameraSrc *camerasrc, gint
 
   gst_tizencamerasrc_debug("get focus");
 
-  ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_FOCUS_MODE, (void **)focus_mode);
-  ret |= camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_FOCUS_RANGE, (void **)focus_range);
+  ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_FOCUS_MODE, (void **)focus_mode);
+  ret |= hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_FOCUS_RANGE, (void **)focus_range);
   if (ret != CAMERA_ERROR_NONE) {
     gst_tizencamerasrc_debug("Failed to get AF mode.");
     return FALSE;
@@ -528,7 +527,7 @@ gboolean gst_tizencamerasrc_control_start_auto_focus(GstTizenCameraSrc *camerasr
 
   gst_tizencamerasrc_debug("start auto focus");
 
-  ret = camera_hal_interface_start_auto_focus(camerasrc->hal_intf_handle);
+  ret = hal_camera_start_auto_focus(camerasrc->hal_handle);
   if (ret != CAMERA_ERROR_NONE) {
     gst_tizencamerasrc_debug("Failed to start AF. error[0x%x]", ret);
     return FALSE;
@@ -546,7 +545,7 @@ gboolean gst_tizencamerasrc_control_stop_auto_focus(GstTizenCameraSrc *camerasrc
 
   gst_tizencamerasrc_debug("stop auto focus");
 
-  ret = camera_hal_interface_stop_auto_focus(camerasrc->hal_intf_handle);
+  ret = hal_camera_stop_auto_focus(camerasrc->hal_handle);
   if (ret != CAMERA_ERROR_NONE) {
     gst_tizencamerasrc_debug("Failed to stop autofocus.");
     return FALSE;
@@ -574,7 +573,7 @@ gboolean gst_tizencamerasrc_control_get_focus_level(GstTizenCameraSrc *camerasrc
 gboolean gst_tizencamerasrc_control_set_auto_focus_area(GstTizenCameraSrc *camerasrc, GstCameraControlRectType rect)
 {
   int ret = CAMERA_ERROR_NONE;
-  camera_rectangle_t set_rect;
+  camera_rectangle_s set_rect;
 
   g_return_val_if_fail(camerasrc, FALSE);
 
@@ -589,7 +588,7 @@ gboolean gst_tizencamerasrc_control_set_auto_focus_area(GstTizenCameraSrc *camer
                              set_rect.x, set_rect.y,
                              set_rect.width, set_rect.height);
 
-  ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_FOCUS_AREA, (void *)&set_rect);
+  ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_FOCUS_AREA, (void *)&set_rect);
   if (ret != CAMERA_ERROR_NONE) {
     GST_ERROR_OBJECT(camerasrc, "Failed to set auto focus area 0x%x", ret);
     return FALSE;
@@ -601,14 +600,14 @@ gboolean gst_tizencamerasrc_control_set_auto_focus_area(GstTizenCameraSrc *camer
 gboolean gst_tizencamerasrc_control_get_auto_focus_area(GstTizenCameraSrc *camerasrc, GstCameraControlRectType *rect)
 {
   int ret = CAMERA_ERROR_NONE;
-  camera_rectangle_t get_rect;
+  camera_rectangle_s get_rect;
 
   g_return_val_if_fail(camerasrc, FALSE);
   g_return_val_if_fail(rect, FALSE);
 
   gst_tizencamerasrc_debug("get auto focus area");
 
-  ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_FOCUS_AREA, (void **)&get_rect);
+  ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_FOCUS_AREA, (void **)&get_rect);
   if (ret != CAMERA_ERROR_NONE) {
     gst_tizencamerasrc_debug("Failed to get auto focus area.");
     return FALSE;
@@ -630,7 +629,7 @@ gboolean gst_tizencamerasrc_control_set_wdr(GstTizenCameraSrc *camerasrc, gint v
 
   gst_tizencamerasrc_debug("set wdr");
 
-  ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_WDR, (void *)&value);
+  ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_WDR, (void *)&value);
   if (ret != CAMERA_ERROR_NONE) {
     gst_tizencamerasrc_debug("Failed to set wdr. value[%d],err code[%x]", value, ret);
     return FALSE;
@@ -647,7 +646,7 @@ gboolean gst_tizencamerasrc_control_get_wdr(GstTizenCameraSrc *camerasrc, gint *
 
   gst_tizencamerasrc_debug("get wdr");
 
-  ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_WDR, (void **)value);
+  ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_WDR, (void **)value);
   if (ret != CAMERA_ERROR_NONE) {
     gst_tizencamerasrc_debug("Failed to get wdr. err code[%x]", ret);
     return FALSE;
@@ -664,7 +663,7 @@ gboolean gst_tizencamerasrc_control_set_ahs(GstTizenCameraSrc *camerasrc, gint v
 
   gst_tizencamerasrc_debug("set ahs");
 
-  ret = camera_hal_interface_set_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_ANTI_SHAKE, (void *)&value);
+  ret = hal_camera_set_command(camerasrc->hal_handle, CAMERA_COMMAND_ANTI_SHAKE, (void *)&value);
   if (ret != CAMERA_ERROR_NONE) {
     gst_tizencamerasrc_debug("Failed to set ahs. value[%d],err code[%x]", value, ret);
     return FALSE;
@@ -681,7 +680,7 @@ gboolean gst_tizencamerasrc_control_get_ahs(GstTizenCameraSrc *camerasrc, gint *
 
   gst_tizencamerasrc_debug("get ahs");
 
-  ret = camera_hal_interface_get_command(camerasrc->hal_intf_handle, CAMERA_COMMAND_ANTI_SHAKE, (void **)value);
+  ret = hal_camera_get_command(camerasrc->hal_handle, CAMERA_COMMAND_ANTI_SHAKE, (void **)value);
   if (ret != CAMERA_ERROR_NONE) {
     gst_tizencamerasrc_debug("Failed to get ahs. err code[%x]", ret);
     return FALSE;

diff --git a/tizencamerasrc/src/include/gsttizencamerasrc.h b/tizencamerasrc/src/include/gsttizencamerasrc.h
index e2d4410..b930fb9 100644 (file)
--- a/tizencamerasrc/src/include/gsttizencamerasrc.h
+++ b/tizencamerasrc/src/include/gsttizencamerasrc.h
@@ -38,7 +38,7 @@
 #include <gst/video/video-format.h>
 #include <gst/allocators/gsttizenmemory.h>
 
-#include "camera_hal_interface.h"
+#include <hal-camera.h>
 
 #include <tbm_surface.h>
 #include <tbm_surface_internal.h>
@@ -79,7 +79,7 @@ struct _GstTizenCameraSrc
   GstAllocator *allocator;
 
   /* device info */
-  camera_device_info_list_t device_info;
+  camera_device_info_list_s device_info;
 
   /* Video info */
   GstVideoInfo video_info;
@@ -87,7 +87,7 @@ struct _GstTizenCameraSrc
   guint32 tbm_format;
 
   /*private*/
-  camera_hal_interface *hal_intf_handle;  /**< Camera HAL interface handle */
+  void *hal_handle;                       /**< Camera HAL handle */
   gint mode;
   gboolean vflip;                         /**< flip camera input vertically */
   gboolean hflip;                         /**< flip camera input horizontally */
@@ -109,7 +109,7 @@ struct _GstTizenCameraSrc
   gboolean recording_hint;                /**< Hint of recording */
 
   gchar format_name[FORMAT_NAME_LENGTH];  /**< Format name */
-  camera_pixel_format_t pix_format;       /**< Image format of video source */
+  camera_pixel_format_e pix_format;       /**< Image format of video source */
   gint high_speed_fps;                    /**< Video source fps for high speed recording */
   gboolean fps_auto;                      /**< Auto Video source fps */
 
@@ -153,7 +153,7 @@ struct _GstTizenCameraSrc
   gint bitrate;                           /**< Bitrate of encoded stream */
   gint gop_interval;                      /**< GOP(Group Of Pictures) interval of encoded stream */
 
-  camera_error_t hal_error_code;          /**< Error code from HAL */
+  camera_error_e hal_error_code;          /**< Error code from HAL */
 };
 
 struct _GstTizenCameraSrcClass {