Merge pull request #31 from hao-yao/icamerasrc_slim_api

Engineer release on 2023-04-03

README.md

@@ -16,7 +16,6 @@ This repository supports MIPI cameras through the IPU6/IPU6EP/IPU6SE on Intel Ti
 
 ```sh
 export CHROME_SLIM_CAMHAL=ON
-export STRIP_VIRTUAL_CHANNEL_CAMHAL=ON
 # for libdrm.pc
 export PKG_CONFIG_PATH="/usr/lib/x86_64-linux-gnu/pkgconfig"
 # only for yocto

configure.ac

@@ -1,6 +1,6 @@
 #
 #  GStreamer
-#  Copyright (C) 2015-2020 Intel Corporation
+#  Copyright (C) 2015-2023 Intel Corporation
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a
 #  copy of this software and associated documentation files (the "Software"),
@@ -207,10 +207,6 @@ AC_MSG_CHECKING([check if CHROME_SLIM_CAMHAL is ON])
 AS_IF([test "x${CHROME_SLIM_CAMHAL}" = "xON" ], AC_MSG_RESULT([yes]), AC_MSG_RESULT([no]))
 AM_CONDITIONAL([USE_CHROME_SLIM_CAMHAL], [test "x${CHROME_SLIM_CAMHAL}" = "xON"])
 
-AC_MSG_CHECKING([check if STRIP_VIRTUAL_CHANNEL_CAMHAL is ON])
-AS_IF([test "x${STRIP_VIRTUAL_CHANNEL_CAMHAL}" = "xON" ], AC_MSG_RESULT([yes]), AC_MSG_RESULT([no]))
-AM_CONDITIONAL([USE_STRIP_VIRTUAL_CHANNEL_CAMHAL], [test "x${STRIP_VIRTUAL_CHANNEL_CAMHAL}" = "xON"])
-
 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  src/interfaces/Makefile

src/Makefile.am

@@ -1,6 +1,6 @@
 #
 #  GStreamer
-#  Copyright (C) 2015-2021 Intel Corporation
+#  Copyright (C) 2015-2023 Intel Corporation
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a
 #  copy of this software and associated documentation files (the "Software"),
@@ -83,10 +83,6 @@ if USE_CHROME_SLIM_CAMHAL
 libgsticamerasrc_la_CPPFLAGS += -DCHROME_SLIM_CAMHAL
 endif
 
-if USE_STRIP_VIRTUAL_CHANNEL_CAMHAL
-libgsticamerasrc_la_CPPFLAGS += -DSTRIP_VIRTUAL_CHANNEL_CAMHAL
-endif
-
 # for hardening-check
 libgsticamerasrc_la_CPPFLAGS+= -fstack-protector -fPIE -fPIC -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
 

src/gstcamerasrc.cpp

@@ -2,7 +2,7 @@
  * GStreamer
  * Copyright (C) 2005 Thomas Vander Stichele <[email protected]>
  * Copyright (C) 2005 Ronald S. Bultje <[email protected]>
- * Copyright (C) 2015-2021 Intel Corporation
+ * Copyright (C) 2015-2023 Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -980,7 +980,7 @@ gst_camerasrc_class_init (GstcamerasrcClass * klass)
         gst_camerasrc_device_id_get_type(), DEFAULT_PROP_DEVICE_ID, (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
   g_object_class_install_property(gobject_class,PROP_NUM_VC,
-      g_param_spec_int("num-vc","Number Virtual Channel","Number of enabled Virtual Channel",
+      g_param_spec_int("num-vc","Number Virtual Channel","Number of enabled Virtual Channel: 0 is mean disable VC",
         0,8,0, (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 
   g_object_class_install_property(gobject_class,PROP_DEBUG_LEVEL,
@@ -2836,11 +2836,7 @@ gst_camerasrc_start(GstCamBaseSrc *basesrc)
     return FALSE;
   }
   camerasrc->camera_init = true;
-#ifndef STRIP_VIRTUAL_CHANNEL_CAMHAL
   ret = camera_device_open(camerasrc->device_id, camerasrc->num_vc);
-#else
-  ret = camera_device_open(camerasrc->device_id);
-#endif
   if (ret < 0) {
      GST_ERROR("CameraId=%d failed to open libcamhal device.", camerasrc->device_id);
      camerasrc->camera_open = false;