Merge branch 'Kurento:master' into master

CMakeLists.txt

@@ -26,8 +26,11 @@ include(CommonBuildFlags)
 common_buildflags_set()
 #common_buildflags_print()
 
-# Development: Exceptions to "Warnings are Errors" rule
+# Development: Add here exceptions to the "Warnings are Errors" rule.
+# Also, DOCUMENT WHY and always remove them as soon as the problem is fixed.
+# For example:
 #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unused-function")
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unused-variable")
 
 # FIXME Disable error when macros __TIME__, __DATE__ or __TIMESTAMP__ are encountered
 include(CheckCXXCompilerFlag)
@@ -77,12 +80,5 @@ set(CMAKE_INSTALL_GST_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/gstreamer-1.5)
 
 enable_testing()
 
-# Used by test "webrtcendpoint" and kmsiceniceagent
-# Enabled if the system has libnice >=0.1.14
-if(NOT nice_VERSION VERSION_LESS "0.1.14")
-  message(STATUS "libnice version >= 0.1.14, enable specific tests")
-  add_definitions(-DHAVE_LIBNICE_0_1_14)
-endif()
-
 add_subdirectory(src)
 add_subdirectory(tests)

README.md

@@ -51,14 +51,14 @@ Useful Links
 
 Usage:
 
-* [Installation Guide](http://doc-kurento.readthedocs.io/en/stable/user/installation.html)
-* [Compilation Guide](http://doc-kurento.readthedocs.io/en/stable/dev/dev_guide.html#developing-kms)
-* [Contribution Guide](http://doc-kurento.readthedocs.io/en/stable/project/contribute.html)
+* [Installation Guide](https://doc-kurento.readthedocs.io/en/latest/user/installation.html)
+* [Compilation Guide](https://doc-kurento.readthedocs.io/en/latest/dev/dev_guide.html#developing-kms)
+* [Contribution Guide](https://doc-kurento.readthedocs.io/en/latest/project/contribute.html)
 
 Issues:
 
 * [Bug Tracker](https://github.com/Kurento/bugtracker/issues)
-* [Support](http://doc-kurento.readthedocs.io/en/stable/user/support.html)
+* [Support](https://doc-kurento.readthedocs.io/en/latest/user/support.html)
 
 News:
 

debian/changelog

@@ -1,8 +1,28 @@
-kms-elements (6.13.1-0kurento1) UNRELEASED; urgency=medium
+kms-elements (6.16.1-0kurento1) UNRELEASED; urgency=medium
 
   * UNRELEASED
 
- -- Juan Navarro <[email protected]>  Thu, 19 Dec 2019 19:17:38 +0100
+ -- Juan Navarro <[email protected]>  Wed, 03 Mar 2021 12:26:48 +0100
+
+kms-elements (6.16.0-0kurento1) testing; urgency=medium
+
+  * Prepare release 6.16.0-0kurento1
+  * Update all dependency versions to 6.15.1
+
+ -- Juan Navarro <[email protected]>  Fri, 26 Feb 2021 12:01:38 +0100
+
+kms-elements (6.15.0-0kurento1) testing; urgency=medium
+
+  * Prepare release 6.15.0-0kurento1
+  * debian: update versions of Kurento dependencies
+
+ -- Juan Navarro <[email protected]>  Tue, 03 Nov 2020 18:04:22 +0100
+
+kms-elements (6.14.0-0kurento1) testing; urgency=medium
+
+  * Prepare release 6.14.0-0kurento1
+
+ -- Juan Navarro <[email protected]>  Tue, 16 Jun 2020 17:48:04 +0200
 
 kms-elements (6.13.0-0kurento1) testing; urgency=medium
 

debian/control

@@ -9,9 +9,9 @@ Build-Depends: debhelper (>= 9),
  gstreamer1.5-plugins-bad,
  gstreamer1.5-plugins-good,
  gstreamer1.5-x,
- kms-cmake-utils (>= 6.7.0),
- kms-core-dev (>= 6.7.0),
- kurento-module-creator (>= 6.7.0),
+ kms-cmake-utils (>= 6.16.1),
+ kms-core-dev (>= 6.16.1),
+ kurento-module-creator (>= 6.16.1),
  libboost-filesystem-dev,
  libboost-system-dev,
  libboost-test-dev,
@@ -32,7 +32,7 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends},
  gstreamer1.5-nice,
- kms-core (>= 6.7.0),
+ kms-core (>= 6.16.1),
  openh264-gst-plugins-bad-1.5,
  openwebrtc-gst-plugins
 Breaks: kms-elements-6.0
@@ -44,9 +44,9 @@ Package: kms-elements-dev
 Architecture: any
 Section: libdevel
 Depends: kms-elements (= ${binary:Version}),
- kms-cmake-utils (>= 6.7.0),
- kms-core-dev (>= 6.7.0),
- kurento-module-creator (>= 6.7.0),
+ kms-cmake-utils (>= 6.16.1),
+ kms-core-dev (>= 6.16.1),
+ kurento-module-creator (>= 6.16.1),
  libboost-filesystem-dev,
  libboost-system-dev,
  libboost-test-dev,

src/gst-plugins/kmsalphablending.c

@@ -204,28 +204,14 @@ configure_port (KmsAlphaBlendingData * port_data)
       int top = 0;
       int bottom = 0;
 
-      if (_relative_x > 0) {
-        int width_size =
-            (mixer->priv->output_width - (mixer->priv->output_width -
-                _relative_x));
-        if (_relative_width > width_size) {
-          right = (_relative_width - width_size);
-        }
-      } else {
+      if (_relative_x <= 0) {
         left = -1 * _relative_x;
         if ((_relative_width - left) > mixer->priv->output_width) {
           right = (_relative_width - left) - mixer->priv->output_width;
         }
       }
 
-      if (_relative_y > 0) {
-        int height_size =
-            (mixer->priv->output_height - (mixer->priv->output_height -
-                _relative_y));
-        if (_relative_height > height_size) {
-          bottom = (_relative_height - height_size);
-        }
-      } else {
+      if (_relative_y <= 0) {
         top = -1 * _relative_y;
         if ((_relative_height - top) > mixer->priv->output_height) {
           bottom = (_relative_height - top) - mixer->priv->output_height;
@@ -479,7 +465,7 @@ cb_EOS_received (GstPad * pad, GstPadProbeInfo * info,
   KmsAlphaBlending *self = port_data->mixer;
   GstEvent *event;
 
-  if (GST_EVENT_TYPE (GST_PAD_PROBE_INFO_EVENT (info)) != GST_EVENT_EOS) {
+  if (GST_EVENT_TYPE (gst_pad_probe_info_get_event (info)) != GST_EVENT_EOS) {
     return GST_PAD_PROBE_OK;
   }
 
@@ -621,7 +607,7 @@ link_to_videomixer (GstPad * pad, GstPadProbeInfo * info,
   GstPadTemplate *sink_pad_template;
   KmsAlphaBlending *mixer = data->mixer;
 
-  if (GST_EVENT_TYPE (GST_PAD_PROBE_INFO_EVENT (info)) != GST_EVENT_CAPS) {
+  if (GST_EVENT_TYPE (gst_pad_probe_info_get_event (info)) != GST_EVENT_CAPS) {
     return GST_PAD_PROBE_PASS;
   }
 

src/gst-plugins/kmscompositemixer.c

@@ -264,7 +264,7 @@ cb_EOS_received (GstPad * pad, GstPadProbeInfo * info, gpointer data)
   KmsCompositeMixer *self = port_data->mixer;
   GstEvent *event;
 
-  if (GST_EVENT_TYPE (GST_PAD_PROBE_INFO_EVENT (info)) != GST_EVENT_EOS) {
+  if (GST_EVENT_TYPE (gst_pad_probe_info_get_event (info)) != GST_EVENT_EOS) {
     return GST_PAD_PROBE_OK;
   }
 
@@ -429,7 +429,7 @@ link_to_videomixer (GstPad * pad, GstPadProbeInfo * info,
   KmsCompositeMixer *mixer;
   GstPad *tee_src;
 
-  if (GST_EVENT_TYPE (GST_PAD_PROBE_INFO_EVENT (info)) !=
+  if (GST_EVENT_TYPE (gst_pad_probe_info_get_event (info)) !=
       GST_EVENT_STREAM_START) {
     return GST_PAD_PROBE_PASS;
   }

src/gst-plugins/kmshttppostendpoint.c

@@ -168,7 +168,7 @@ static GstPadProbeReturn
 set_appsrc_caps (GstPad * pad, GstPadProbeInfo * info, gpointer httpep)
 {
   KmsHttpPostEndpoint *self = KMS_HTTP_POST_ENDPOINT (httpep);
-  GstEvent *event = GST_PAD_PROBE_INFO_EVENT (info);
+  GstEvent *event = gst_pad_probe_info_get_event (info);
   GstCaps *audio_caps = NULL, *video_caps = NULL;
   GstElement *appsrc, *appsink, *agnosticbin;
   GstCaps *caps;

src/gst-plugins/kmsplayerendpoint.c

@@ -655,7 +655,7 @@ appsink_eos_cb (GstAppSink * appsink, gpointer user_data)
 static GstPadProbeReturn
 appsrc_query_probe (GstPad * pad, GstPadProbeInfo * info, gpointer element)
 {
-  GstQuery *query = GST_PAD_PROBE_INFO_QUERY (info);
+  GstQuery *query = gst_pad_probe_info_get_query (info);
   GstQueryType type = GST_QUERY_TYPE (query);
   GstElement *appsink = GST_ELEMENT (element);
 
@@ -764,7 +764,7 @@ static GstPadProbeReturn
 appsink_probe_set_appsrc_caps (GstPad * pad, GstPadProbeInfo * info,
     gpointer element)
 {
-  GstEvent *event = GST_PAD_PROBE_INFO_EVENT (info);
+  GstEvent *event = gst_pad_probe_info_get_event (info);
   GstElement *appsrc = GST_ELEMENT (element);
   GstCaps *caps;
 
@@ -788,7 +788,7 @@ static GstPadProbeReturn
 appsink_probe_query_appsrc_caps (GstPad * pad, GstPadProbeInfo * info,
     gpointer element)
 {
-  GstQuery *query = GST_PAD_PROBE_INFO_QUERY (info);
+  GstQuery *query = gst_pad_probe_info_get_query (info);
   GstQueryType type = GST_QUERY_TYPE (query);
   GstElement *appsrc = GST_ELEMENT (element);
 
@@ -900,12 +900,12 @@ kms_player_endpoint_uridecodebin_pad_removed (GstElement * element,
   appsink = g_object_steal_qdata (G_OBJECT (pad), appsink_quark ());
   appsrc = g_object_steal_qdata (G_OBJECT (pad), appsrc_quark ());
 
-  // remove appsrc before appsink to avoid segment fault 
+  // remove appsrc before appsink to avoid segment fault
   // caused by invalid appsink in appsrc_query_probe
   if (appsrc != NULL) {
     kms_utils_bin_remove (GST_BIN (self), appsrc);
   }
-  
+
   if (appsink != NULL) {
     kms_utils_bin_remove (GST_BIN (self->priv->pipeline), appsink);
   }
@@ -1334,11 +1334,11 @@ process_bus_message (GstBus * bus, GstMessage * msg, KmsPlayerEndpoint * self)
 
   GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, log_level, self,
       "Error code %d: '%s', element: %s, parent: %s", err_code,
-      (err_msg ? err_msg : "(None)"), GST_MESSAGE_SRC_NAME (msg),
+      GST_STR_NULL (err_msg), GST_MESSAGE_SRC_NAME (msg),
       GST_ELEMENT_NAME (parent));
 
-  GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, log_level, self,
-      "Debugging info: %s", (dbg_info ? dbg_info : "(None)"));
+  GST_CAT_LEVEL_LOG (GST_CAT_DEFAULT, log_level, self, "Debugging info: %s",
+      GST_STR_NULL (dbg_info));
 
   gchar *dot_name = g_strdup_printf ("%s_bus_%d", GST_OBJECT_NAME (self),
       err_code);

src/gst-plugins/recorderendpoint/CMakeLists.txt

@@ -14,13 +14,28 @@ set(KMS_RECORDERENDPOINT_HEADERS
   kmsrecorderendpoint.h
 )
 
+set(KMS_RECORDERENDPOINT_ENUM_HEADERS
+  kmsrecordergapsfixmethod.h
+)
+
+list(APPEND KMS_RECORDERENDPOINT_HEADERS ${KMS_RECORDERENDPOINT_ENUM_HEADERS})
+add_glib_enumtypes(
+  KMS_RECORDERENDPOINT_SOURCES
+  KMS_RECORDERENDPOINT_HEADERS
+  kms-recorder-enumtypes
+  KMS
+  ${KMS_RECORDERENDPOINT_ENUM_HEADERS}
+)
+
 add_library(recorderendpoint MODULE ${KMS_RECORDERENDPOINT_SOURCES} ${KMS_RECORDERENDPOINT_HEADERS})
 if(SANITIZERS_ENABLED)
   add_sanitizers(recorderendpoint)
 endif()
 
 set_property (TARGET recorderendpoint
   PROPERTY INCLUDE_DIRECTORIES
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/../../..
     ${gstreamer-1.5_INCLUDE_DIRS}
     ${KmsGstCommons_INCLUDE_DIRS}

src/gst-plugins/recorderendpoint/kmsbasemediamuxer.c

@@ -68,7 +68,7 @@ kms_base_media_muxer_finalize (GObject * object)
 {
   KmsBaseMediaMuxer *self = KMS_BASE_MEDIA_MUXER (object);
 
-  GST_DEBUG_OBJECT (self, "finalize");
+  GST_LOG_OBJECT (self, "finalize");
 
   gst_element_set_state (KMS_BASE_MEDIA_MUXER_GET_PIPELINE (self),
       GST_STATE_NULL);
@@ -134,7 +134,7 @@ kms_base_media_muxer_get_sink_fallback (KmsBaseMediaMuxer * self,
       || (g_strcmp0 (prot, HTTPS_PROTO) == 0)) {
 
     if (kms_is_valid_uri (uri)) {
-      /* We use souphttpclientsink */
+      /* We use the GStreamer CURL plugin */
       sink = gst_element_factory_make ("curlhttpsink", NULL);
       if (sink != NULL) {
         g_object_set (sink, "blocksize", MEGA_BYTES (1), "qos", FALSE,
@@ -182,6 +182,8 @@ kms_base_media_muxer_get_sink (KmsBaseMediaMuxer * self, const gchar * uri)
     g_clear_error (&err);
   }
 
+  GST_DEBUG_OBJECT (sink, "Muxer sink created for URI '%s'", uri);
+
   /* Try to configure the sink element */
   sink_class = G_OBJECT_GET_CLASS (sink);
 
@@ -192,11 +194,9 @@ kms_base_media_muxer_get_sink (KmsBaseMediaMuxer * self, const gchar * uri)
       /* Work around for filesink elements */
       gchar *location = gst_uri_get_location (uri);
 
-      GST_DEBUG_OBJECT (sink, "filesink location=%s", location);
       g_object_set (sink, "location", location, NULL);
       g_free (location);
     } else {
-      GST_DEBUG_OBJECT (sink, "configuring location=%s", uri);
       g_object_set (sink, "location", uri, NULL);
     }
   }
@@ -210,7 +210,7 @@ kms_base_media_muxer_get_sink (KmsBaseMediaMuxer * self, const gchar * uri)
   }
 invalid_uri:
   {
-    GST_ERROR_OBJECT (self, "Invalid URI \"%s\".", uri);
+    GST_ERROR_OBJECT (self, "Invalid URI: '%s'", uri);
     g_clear_error (&err);
     goto end;
   }
@@ -225,7 +225,7 @@ kms_base_media_muxer_get_sink (KmsBaseMediaMuxer * self, const gchar * uri)
       if (prot == NULL)
         goto invalid_uri;
 
-      GST_ERROR_OBJECT (self, "No URI handler implemented for \"%s\".", prot);
+      GST_ERROR_OBJECT (self, "No URI handler implemented for '%s'", prot);
 
       g_free (prot);
     } else {