Adressing review

Author: DawidWesierski4

ecosystem/gstreamer_plugin/gst_mtl_st40p_tx.c

@@ -412,7 +412,7 @@ 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 */
-  sink->frame_size = 255;
+  sink->frame_size = MAX_UDW_SIZE;
 
   if (sink->max_combined_udw_size)
     ops_tx.max_udw_buff_size = sink->max_combined_udw_size;
@@ -567,16 +567,20 @@ static GstFlowReturn gst_mtl_st40p_tx_parse_8331_anc_words(
     bytes_left_to_process -= sizeof(struct st40_rfc8331_payload_hdr);
     data_count = payload_header.second_hdr_chunk.data_count & 0xff;
 
-    udw_byte_size = (((data_count + 1) * 10) + 7) / 8;
-    /* data count * 10 bits + 10 bit checksum / 8 bytes */
+    /* data count * 10 bits + 10 bit checksum*/
+    udw_byte_size = (((data_count)*10) + 10);
+    /* round up to the nearest byte */
+    udw_byte_size = (udw_byte_size + 7) / 8;
+
     if (bytes_left_to_process < udw_byte_size) {
       GST_ERROR("Buffer size (%u) is too small for data count (%d)",
                 bytes_left_to_process, udw_byte_size);
       return GST_FLOW_ERROR;
     }
 
-    /* we can use data_size for offset here as the data size is increased with every
-    processed udw so it shows the offset */
+    /* Use data_size as the offset for the next UDW block.
+     * data_size points to the correct offset for the current ANC packet
+     */
     if (gst_mtl_st40p_tx_parse_8331_meta(frame_info, payload_header, i,
                                          frame_info->anc_frame->data_size)) {
       GST_ERROR("Failed to parse 8331 meta");

ecosystem/gstreamer_plugin/gst_mtl_st40p_tx.h

@@ -48,8 +48,9 @@
 #define __GST_MTL_ST40P_TX_H__
 
 #define ST40_RFC8331_PAYLOAD_MAX_ANCILLARY_COUNT 20
+#define MAX_UDW_SIZE 255
 /* Maximum size for single User Data Words */
-#define DEFAULT_MAX_UDW_SIZE (ST40_RFC8331_PAYLOAD_MAX_ANCILLARY_COUNT * 255)
+#define DEFAULT_MAX_UDW_SIZE (ST40_RFC8331_PAYLOAD_MAX_ANCILLARY_COUNT * MAX_UDW_SIZE)
 /* rfc8331 header consist of rows 3 * 10 bits + 2 bits  */
 #define RFC_8331_WORD_BYTE_SIZE (4)
 #define RFC_8331_PAYLOAD_HEADER_SIZE 8
@@ -64,13 +65,6 @@ G_BEGIN_DECLS
 #define GST_TYPE_MTL_ST40P_TX (gst_mtl_st40p_tx_get_type())
 G_DECLARE_FINAL_TYPE(Gst_Mtl_St40p_Tx, gst_mtl_st40p_tx, GST, MTL_ST40P_TX, GstBaseSink)
 
-enum gst_st40p_rfc8331_payload_endian {
-  ST40_RFC8331_PAYLOAD_ENDIAN_SYSTEM,
-  ST40_RFC8331_PAYLOAD_ENDIAN_BIG,
-  ST40_RFC8331_PAYLOAD_ENDIAN_LITTLE,
-  ST40_RFC8331_PAYLOAD_ENDIAN_MAX
-};
-
 struct _Gst_Mtl_St40p_Tx {
   GstBaseSink element;
   mtl_handle mtl_lib_handle;

include/experimental/st40_pipeline_api.h

@@ -12,39 +12,6 @@
 extern "C" {
 #endif
 
-MTL_PACK(struct st40_rfc8331_payload_hdr_be {
-  union {
-    struct {
-      /** the ANC data uses luma (Y) data channel */
-      uint32_t c : 1;
-      /** line number corresponds to the location (vertical) of the ANC data packet */
-      uint32_t line_number : 11;
-      /** the location of the ANC data packet in the SDI raster */
-      uint32_t horizontal_offset : 12;
-      /** whether the data stream number of a multi-stream data mapping */
-      uint32_t s : 1;
-      /** the source data stream number of the ANC data packet */
-      uint32_t stream_num : 7;
-    } first_hdr_chunk;
-    /** Handle to make operating on first_hdr_chunk buffer easier */
-    uint32_t swapped_first_hdr_chunk;
-  };
-  union {
-    struct {
-      /** Data Identification Word */
-      uint32_t did : 10;
-      /** Secondary Data Identification Word */
-      uint32_t sdid : 10;
-      /** Data Count */
-      uint32_t data_count : 10;
-      /** Starting point of the UDW (user data words) */
-      uint32_t rsvd_for_udw : 2;
-    } second_hdr_chunk;
-    /** Handle to make operating on second_hdr_chunk buffer easier */
-    uint32_t swapped_second_hdr_chunk;
-  };
-});
-
 /** Handle to tx st2110-40 pipeline session of lib */
 typedef struct st40p_tx_ctx* st40p_tx_handle;
 

include/st40_api.h

@@ -122,7 +122,7 @@ MTL_PACK(struct st40_rfc8331_rtp_hdr {
 });
 #endif
 
-/* This structure is too hold the */
+/* A structure describing the first 32 bits of an ST 2110-40 (ancillary) payload header */
 #ifdef MTL_LITTLE_ENDIAN
 MTL_PACK(struct st40_rfc8331_payload_hdr_common {
   union {