Add: St40pipline mode ability to parse 0 anc_count

Author: DawidWesierski4

ecosystem/gstreamer_plugin/gst_mtl_common.c

@@ -407,15 +407,16 @@ void gst_mtl_common_get_general_arguments(GObject* object, guint prop_id,
 }
 
 /**
- * Copies general initialization port values to session-specific port arguments if not
- * specified. If the primary port is not specified, the redundant port argument will be
- * copied from the general initialization ports regardless of its specification. If the
- * UDP port for the redundant port is not specified, it will be incremented by one over
- * the primary port.
+ * Copies general initialization port values to session-specific port arguments
+ * if not specified. If the primary port is not specified, the redundant port
+ * argument will be copied from the general initialization ports regardless of
+ * its specification. If the UDP port for the redundant port is not specified,
+ * it will be incremented by one over the primary port.
  *
- * @param general_args Pointer to the structure containing general initialization
- * parameters.
- * @param port_args Pointer to the structure containing session-specific port arguments.
+ * @param general_args Pointer to the structure containing general
+ * initialization parameters.
+ * @param port_args Pointer to the structure containing session-specific port
+ * arguments.
  */
 void gst_mtl_common_copy_general_to_session_args(GeneralArgs* general_args,
                                                  SessionPortArgs* port_args) {
@@ -437,8 +438,9 @@ void gst_mtl_common_copy_general_to_session_args(GeneralArgs* general_args,
 }
 
 /**
- * Parses the transmission port arguments and initializes the tranmission port structure.
- * Validates and sets the destination IP address, port number, UDP port, and payload type.
+ * Parses the transmission port arguments and initializes the tranmission port
+ * structure. Validates and sets the destination IP address, port number, UDP
+ * port, and payload type.
  *
  * @param port Pointer to the transmission port structure to be initialized.
  * @param port_args Pointer to the structure containing the port arguments.
@@ -485,8 +487,9 @@ guint gst_mtl_common_parse_tx_port_arguments(struct st_tx_port* port,
 }
 
 /**
- * Parses the transmission port arguments and initializes the receive port structure.
- * Validates and sets the destination IP address, port number, UDP port, and payload type.
+ * Parses the transmission port arguments and initializes the receive port
+ * structure. Validates and sets the destination IP address, port number, UDP
+ * port, and payload type.
  *
  * @param port Pointer to the transmission port structure to be initialized.
  * @param port_args Pointer to the structure containing the port arguments.

ecosystem/gstreamer_plugin/gst_mtl_st20p_rx.c

@@ -149,10 +149,10 @@ static void gst_mtl_st20p_rx_class_init(Gst_Mtl_St20p_RxClass* klass) {
   gstelement_class = GST_ELEMENT_CLASS(klass);
   gstbasesrc_class = GST_BASE_SRC_CLASS(klass);
 
-  gst_element_class_set_metadata(
-      gstelement_class, "MtlRxSt20Src", "Src/Video",
-      "MTL transmission plugin for SMPTE ST 2110-20 standard (uncompressed video)",
-      "Dawid Wesierski <[email protected]>");
+  gst_element_class_set_metadata(gstelement_class, "MtlRxSt20Src", "Src/Video",
+                                 "MTL transmission plugin for SMPTE ST 2110-20 "
+                                 "standard (uncompressed video)",
+                                 "Dawid Wesierski <[email protected]>");
 
   gst_element_class_add_static_pad_template(gstelement_class,
                                             &gst_mtl_st20p_rx_src_pad_template);

ecosystem/gstreamer_plugin/gst_mtl_st20p_tx.c

@@ -163,10 +163,10 @@ static void gst_mtl_st20p_tx_class_init(Gst_Mtl_St20p_TxClass* klass) {
   gstelement_class = GST_ELEMENT_CLASS(klass);
   gstvideosinkelement_class = GST_VIDEO_SINK_CLASS(klass);
 
-  gst_element_class_set_metadata(
-      gstelement_class, "MtlTxSt20Sink", "Sink/Video",
-      "MTL transmission plugin for SMPTE ST 2110-20 standard (uncompressed video)",
-      "Dawid Wesierski <[email protected]>");
+  gst_element_class_set_metadata(gstelement_class, "MtlTxSt20Sink", "Sink/Video",
+                                 "MTL transmission plugin for SMPTE ST 2110-20 "
+                                 "standard (uncompressed video)",
+                                 "Dawid Wesierski <[email protected]>");
 
   gst_element_class_add_static_pad_template(gstelement_class,
                                             &gst_mtl_st20p_tx_sink_pad_template);
@@ -199,12 +199,13 @@ static void gst_mtl_st20p_tx_class_init(Gst_Mtl_St20p_TxClass* klass) {
 
   g_object_class_install_property(
       gobject_class, PROP_ST20P_TX_USE_PTS_FOR_PACING,
-      g_param_spec_boolean(
-          "use-pts-for-pacing", "Use PTS for packet pacing",
-          "This property modifies the default behavior where MTL handles packet pacing. "
-          "Instead, it uses the buffer's PTS (Presentation Timestamp) to determine the "
-          "precise time for sending packets.",
-          FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+      g_param_spec_boolean("use-pts-for-pacing", "Use PTS for packet pacing",
+                           "This property modifies the default behavior where "
+                           "MTL handles packet pacing. "
+                           "Instead, it uses the buffer's PTS (Presentation "
+                           "Timestamp) to determine the "
+                           "precise time for sending packets.",
+                           FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property(
       gobject_class, PROP_ST20P_TX_PTS_PACING_OFFSET,

ecosystem/gstreamer_plugin/gst_mtl_st30p_rx.c

@@ -135,10 +135,10 @@ static void gst_mtl_st30p_rx_class_init(Gst_Mtl_St30p_RxClass* klass) {
   gstelement_class = GST_ELEMENT_CLASS(klass);
   gstbasesrc_class = GST_BASE_SRC_CLASS(klass);
 
-  gst_element_class_set_metadata(
-      gstelement_class, "MtlRxSt30Src", "Src/Audio",
-      "MTL transmission plugin for SMPTE ST 2110-30 standard (uncompressed audio)",
-      "Dawid Wesierski <[email protected]>");
+  gst_element_class_set_metadata(gstelement_class, "MtlRxSt30Src", "Src/Audio",
+                                 "MTL transmission plugin for SMPTE ST 2110-30 "
+                                 "standard (uncompressed audio)",
+                                 "Dawid Wesierski <[email protected]>");
 
   gst_element_class_add_static_pad_template(gstelement_class,
                                             &gst_mtl_st30p_rx_src_pad_template);

ecosystem/gstreamer_plugin/gst_mtl_st30p_tx.c

@@ -182,12 +182,13 @@ static void gst_mtl_st30p_tx_class_init(Gst_Mtl_St30p_TxClass* klass) {
 
   g_object_class_install_property(
       gobject_class, PROP_ST30P_TX_USE_PTS_FOR_PACING,
-      g_param_spec_boolean(
-          "use-pts-for-pacing", "Use PTS for packet pacing",
-          "This property modifies the default behavior where MTL handles packet pacing. "
-          "Instead, it uses the buffer's PTS (Presentation Timestamp) to determine the "
-          "precise time for sending packets.",
-          FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+      g_param_spec_boolean("use-pts-for-pacing", "Use PTS for packet pacing",
+                           "This property modifies the default behavior where "
+                           "MTL handles packet pacing. "
+                           "Instead, it uses the buffer's PTS (Presentation "
+                           "Timestamp) to determine the "
+                           "precise time for sending packets.",
+                           FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property(
       gobject_class, PROP_ST30P_TX_PTS_PACING_OFFSET,

ecosystem/gstreamer_plugin/gst_mtl_st30p_tx.h

@@ -66,7 +66,8 @@ struct _Gst_Mtl_St30p_Tx {
   pthread_t session_thread;
 
   /*
-   * Handles incomplete frame buffers when their size does not match the expected size.
+   * Handles incomplete frame buffers when their size does not match the
+   * expected size.
    */
   struct st30_frame* cur_frame;
   guint cur_frame_available_size;

ecosystem/gstreamer_plugin/gst_mtl_st40_rx.c

@@ -387,19 +387,32 @@ static void* gst_mtl_st40_rx_get_mbuf_with_timeout(Gst_Mtl_St40_Rx* src,
 
 static struct st40_rfc8331_payload_hdr* gst_mtl_st40_rx_shift_payload_hdr(
     struct st40_rfc8331_payload_hdr* payload_hdr, int udw_size) {
-  int package_size;
-  int payload_len;
+  gint package_size;
+  gint payload_len;
 
-  package_size =
-      ((OFFSET_COUNT_IN_10_BIT + udw_size) * USER_DATA_WORD_BIT_SIZE) / BYTE_SIZE;
-  package_size =
-      (OFFSET_COUNT_IN_10_BIT - package_size % OFFSET_COUNT_IN_10_BIT) + package_size;
-  payload_len =
-      sizeof(struct st40_rfc8331_payload_hdr) - OFFSET_COUNT_IN_10_BIT + package_size;
+  package_size = ((WORD_10_BIT_ALIGN + udw_size) * USER_DATA_WORD_BIT_SIZE) / BYTE_SIZE;
+  payload_len = sizeof(struct st40_rfc8331_payload_hdr) -
+                (package_size % WORD_10_BIT_ALIGN) + package_size;
 
   return (struct st40_rfc8331_payload_hdr*)((uint8_t*)payload_hdr + payload_len);
 }
 
+static GstFlowReturn gst_mtl_st40_rx_check_parity(const struct st40_rfc8331_payload_hdr* payload_hdr) {
+    if (!st40_check_parity_bits(payload_hdr->second_hdr_chunk.did)) {
+        GST_ERROR("Parity check failed for DID");
+        return GST_FLOW_ERROR;
+    }
+    if (!st40_check_parity_bits(payload_hdr->second_hdr_chunk.sdid)) {
+        GST_ERROR("Parity check failed for SDID");
+        return GST_FLOW_ERROR;
+    }
+    if (!st40_check_parity_bits(payload_hdr->second_hdr_chunk.data_count)) {
+        GST_ERROR("Parity check failed for Data Count");
+        return GST_FLOW_ERROR;
+    }
+    return GST_FLOW_OK;
+}
+
 static GstFlowReturn gst_mtl_st40_rx_fill_buffer(Gst_Mtl_St40_Rx* src, GstBuffer** buffer,
                                                  void* usrptr) {
   struct st40_rfc8331_rtp_hdr* hdr;
@@ -412,12 +425,21 @@ static GstFlowReturn gst_mtl_st40_rx_fill_buffer(Gst_Mtl_St40_Rx* src, GstBuffer
   hdr = (struct st40_rfc8331_rtp_hdr*)usrptr;
   anc_count = hdr->first_hdr_chunk.anc_count;
 
-  if (anc_count == 0 || anc_count > ST40_RFC8331_PAYLOAD_MAX_ANCILLARY_COUNT) {
+  if (anc_count < 0 || anc_count > ST40_RFC8331_PAYLOAD_MAX_ANCILLARY_COUNT) {
     GST_ERROR("Ancillary data count: %d (must be between 1 and %d)", anc_count,
               ST40_RFC8331_PAYLOAD_MAX_ANCILLARY_COUNT);
     return GST_FLOW_ERROR;
   }
 
+  if (anc_count == 0) {
+    *buffer = gst_buffer_new_allocate(NULL, 0, NULL);
+    if (!*buffer) {
+      GST_ERROR("Failed to allocate empty buffer");
+      return GST_FLOW_ERROR;
+    }
+    return GST_FLOW_OK;
+  }
+
   /* local is fine anc_count will not be bigger than 20*/
   guint8* anc_data[anc_count];
   guint8 anc_data_count[anc_count];
@@ -426,20 +448,9 @@ static GstFlowReturn gst_mtl_st40_rx_fill_buffer(Gst_Mtl_St40_Rx* src, GstBuffer
   for (int i = 0; i < anc_count; i++) {
     payload_hdr->swapped_first_hdr_chunk = ntohl(payload_hdr->swapped_first_hdr_chunk);
     payload_hdr->swapped_second_hdr_chunk = ntohl(payload_hdr->swapped_second_hdr_chunk);
-    if (!st40_check_parity_bits(payload_hdr->second_hdr_chunk.did)) {
-      GST_ERROR("Parity check failed for DID");
-      for (int j = 0; j < i; j++) free(anc_data[j]);
-      return GST_FLOW_ERROR;
-    }
-    if (!st40_check_parity_bits(payload_hdr->second_hdr_chunk.sdid)) {
-      GST_ERROR("Parity check failed for SDID");
-      for (int j = 0; j < i; j++) free(anc_data[j]);
-      return GST_FLOW_ERROR;
-    }
-    if (!st40_check_parity_bits(payload_hdr->second_hdr_chunk.data_count)) {
-      GST_ERROR("Parity check failed for Data Count");
-      for (int j = 0; j < i; j++) free(anc_data[j]);
-      return GST_FLOW_ERROR;
+    if(gst_mtl_st40_rx_check_parity(payload_hdr) != GST_FLOW_OK) {
+        for (int j = 0; j < i; j++) free(anc_data[j]);
+        return GST_FLOW_ERROR;
     }
 
     udw_size = payload_hdr->second_hdr_chunk.data_count & 0xff;
@@ -494,6 +505,7 @@ static GstFlowReturn gst_mtl_st40_rx_fill_buffer(Gst_Mtl_St40_Rx* src, GstBuffer
 
   if (!gst_buffer_map(*buffer, &dest_info, GST_MAP_WRITE)) {
     GST_ERROR("Failed to map the buffer");
+    for (int i = 0; i < anc_count; i++) free(anc_data[i]);
     return GST_FLOW_ERROR;
   }
 

ecosystem/gstreamer_plugin/gst_mtl_st40_rx.h

@@ -52,13 +52,14 @@
 #define USER_DATA_WORD_BIT_SIZE 10
 #define BYTE_SIZE 8
 #define OFFSET_BIT 32
-#define OFFSET_COUNT_IN_10_BIT ((OFFSET_BIT / USER_DATA_WORD_BIT_SIZE) + 1)
+#define WORD_10_BIT_ALIGN ((OFFSET_BIT / USER_DATA_WORD_BIT_SIZE) + 1)
 
 /**
  * ST40_SIZE_OF_PAYLOAD_METADATA:
  * Defines the size (in bytes) of the payload metadata for ST40 streams.
  * This value is set to 8 to accommodate the following fields:
- * c | line_number | horizontal_offset | s | stream_num | did | sdid | data_count
+ * c | line_number | horizontal_offset | s | stream_num | did | sdid |
+ * data_count
  */
 #define ST40_BYTE_SIZE_OF_PAYLOAD_METADATA 8
 

ecosystem/gstreamer_plugin/gst_mtl_st40p_tx.c

@@ -200,12 +200,13 @@ static void gst_mtl_st40p_tx_class_init(Gst_Mtl_St40p_TxClass* klass) {
 
   g_object_class_install_property(
       gobject_class, PROP_ST40P_TX_USE_PTS_FOR_PACING,
-      g_param_spec_boolean(
-          "use-pts-for-pacing", "Use PTS for packet pacing",
-          "This property modifies the default behavior where MTL handles packet pacing. "
-          "Instead, it uses the buffer's PTS (Presentation Timestamp) to determine the "
-          "precise time for sending packets.",
-          FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+      g_param_spec_boolean("use-pts-for-pacing", "Use PTS for packet pacing",
+                           "This property modifies the default behavior where "
+                           "MTL handles packet pacing. "
+                           "Instead, it uses the buffer's PTS (Presentation "
+                           "Timestamp) to determine the "
+                           "precise time for sending packets.",
+                           FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property(
       gobject_class, PROP_ST40P_TX_PTS_PACING_OFFSET,
@@ -409,8 +410,8 @@ static gboolean gst_mtl_st40p_tx_session_create(Gst_Mtl_St40p_Tx* sink) {
   }
 
   ops_tx.interlaced = false;
-  /* Only single ANC data packet is possible when metadata is not being parsed from
-   * parse_rfc8331_input mode per frame. anc_count = 1 TODO: allow more */
+  /* Only single ANC data packet is possible when metadata is not being parsed
+   * from parse_rfc8331_input mode per frame. anc_count = 1 TODO: allow more */
   sink->frame_size = MAX_UDW_SIZE;
 
   if (sink->max_combined_udw_size)
@@ -469,13 +470,14 @@ static gboolean gst_mtl_st40p_tx_sink_event(GstPad* pad, GstObject* parent,
 /**
  * @brief Fills the metadata for a st40 frame.
  *
- * This function initializes the metadata fields of a given st40 frame with the provided
- * data and metadata values. It sets the first metadata entry with the specified DID,
- * SDID, and data size, and assigns the data pointer to the frame.
- * Note: Most of the fields are hardcoded, and only first metadata block is filled as
- * only one ANC Data packet per frame is allowed.
+ * This function initializes the metadata fields of a given st40 frame with the
+ * provided data and metadata values. It sets the first metadata entry with the
+ * specified DID, SDID, and data size, and assigns the data pointer to the
+ * frame. Note: Most of the fields are hardcoded, and only first metadata block
+ * is filled as only one ANC Data packet per frame is allowed.
  *
- * @param frame Pointer to the st40_frame structure to be filled. Cannot be NULL.
+ * @param frame Pointer to the st40_frame structure to be filled. Cannot be
+ * NULL.
  * @param data Pointer to the data to be associated with the frame.
  * @param data_size Size of the data in bytes.
  * @param did Data Identifier (DID) to be set in the metadata.
@@ -496,7 +498,8 @@ static void gst_mtl_st40p_tx_fill_meta(struct st40_frame_info* frame_info, void*
   frame_info->meta_num = 1;
 }
 
-/* we dont' really check the data here we let the st40 ancillary data to do so */
+/* we dont' really check the data here we let the st40 ancillary data to do so
+ */
 static GstFlowReturn gst_mtl_st40p_tx_parse_8331_meta(
     struct st40_frame_info* frame_info, struct st40_rfc8331_payload_hdr payload_header,
     guint anc_idx, guint udw_offset) {
@@ -546,6 +549,8 @@ static GstFlowReturn gst_mtl_st40p_tx_parse_8331_anc_words(
     return GST_FLOW_ERROR;
   }
 
+  frame_info->meta_num = 0;
+
   for (int i = 0; i < anc_count; i++) {
     /* Processing of the input 8331 header */
     if (bytes_left_to_process < sizeof(struct st40_rfc8331_payload_hdr)) {
@@ -679,12 +684,11 @@ static GstFlowReturn gst_mtl_st40p_tx_parse_8331_memory_block(Gst_Mtl_St40p_Tx*
 /**
  * @brief Parses a GstBuffer and prepares a frame for transmission.
  *
- * This function retrieves a frame from the ST40p transmitter handle, copies the relevant
- * data from the provided GstBuffer into the frame buffer, fills in ancillary metadata,
- * and submits the frame for transmission. It also handles timestamping if pacing is
- * enabled.
- * No memory management is done here, the caller is responsible for managing the
- * GstBuffer and its associated memory.
+ * This function retrieves a frame from the ST40p transmitter handle, copies the
+ * relevant data from the provided GstBuffer into the frame buffer, fills in
+ * ancillary metadata, and submits the frame for transmission. It also handles
+ * timestamping if pacing is enabled. No memory management is done here, the
+ * caller is responsible for managing the GstBuffer and its associated memory.
  *
  * @param sink Pointer to the Gst_Mtl_St40p_Tx sink element.
  * @param gst_buffer_memory GstMemory associated with the GstBuffer.

lib/src/st2110/experimental/st40_pipeline_tx.c

@@ -440,7 +440,7 @@ int st40p_tx_put_frame(st40p_tx_handle handle, struct st40_frame_info* frame_inf
   framebuff->anc_frame->data_size = frame_info->udw_buffer_fill;
 
   if (framebuff->anc_frame->meta_num > ST40_MAX_META ||
-      framebuff->anc_frame->meta_num < 1) {
+      framebuff->anc_frame->meta_num < 0) {
     err("%s(%d), frame %u meta_num %u invalid\n", __func__, idx, producer_idx,
         frame_info->meta_num);
     return -EIO;