Fix: hide st40 anc frame from user

Author: DawidWesierski4

ecosystem/gstreamer_plugin/gst_mtl_st40p_tx.c

@@ -140,7 +140,7 @@ static GstFlowReturn gst_mtl_st40p_tx_parse_8331_memory_block(Gst_Mtl_St40p_Tx*
                                                               GstMapInfo map_info,
                                                               GstBuffer* buf);
 
-static void gst_mtl_st40p_tx_fill_meta(struct st40_frame* frame, void* data,
+static void gst_mtl_st40p_tx_fill_meta(struct st40_frame_info *frame_info, void* data,
                                        guint32 data_size, guint did, guint sdid);
 
 static GstFlowReturn gst_mtl_st40p_tx_parse_8331_meta(
@@ -482,19 +482,19 @@ static gboolean gst_mtl_st40p_tx_sink_event(GstPad* pad, GstObject* parent,
  * @param did Data Identifier (DID) to be set in the metadata.
  * @param sdid Secondary Data Identifier (SDID) to be set in the metadata.
  */
-static void gst_mtl_st40p_tx_fill_meta(struct st40_frame* frame, void* data,
+static void gst_mtl_st40p_tx_fill_meta(struct st40_frame_info *frame_info, void* data,
                                        guint32 data_size, guint did, guint sdid) {
-  frame->meta[0].c = 0;
-  frame->meta[0].line_number = 0;
-  frame->meta[0].hori_offset = 0;
-  frame->meta[0].s = 0;
-  frame->meta[0].stream_num = 0;
-  frame->meta[0].did = did;
-  frame->meta[0].sdid = sdid;
-  frame->meta[0].udw_size = data_size;
-  frame->meta[0].udw_offset = 0;
-  frame->data = data;
-  frame->meta_num = 1;
+  frame_info->meta[0].c = 0;
+  frame_info->meta[0].line_number = 0;
+  frame_info->meta[0].hori_offset = 0;
+  frame_info->meta[0].s = 0;
+  frame_info->meta[0].stream_num = 0;
+  frame_info->meta[0].did = did;
+  frame_info->meta[0].sdid = sdid;
+  frame_info->meta[0].udw_size = data_size;
+  frame_info->meta[0].udw_offset = 0;
+  frame_info->udw_buffer_fill = data_size;
+  frame_info->meta_num = 1;
 }
 
 /* we dont' really check the data here we let the st40 ancillary data to do so */
@@ -716,12 +716,8 @@ static GstFlowReturn gst_mtl_st40p_tx_parse_memory_block(Gst_Mtl_St40p_Tx* sink,
                                     : bytes_left_to_process;
 
     memcpy(frame_info->udw_buff_addr, cur_addr_buf, bytes_left_to_process_cur);
-    for (int i = 0; i < bytes_left_to_process_cur; i++) {
-      printf("%d", frame_info->udw_buff_addr[i]);
-    }
-    printf("\n");
 
-    gst_mtl_st40p_tx_fill_meta(frame_info->anc_frame, frame_info->udw_buff_addr,
+    gst_mtl_st40p_tx_fill_meta(frame_info, frame_info->udw_buff_addr,
                                bytes_left_to_process_cur, sink->did, sink->sdid);
 
     if (sink->use_pts_for_pacing) {

include/experimental/st40_pipeline_api.h

@@ -17,8 +17,6 @@ typedef struct st40p_tx_ctx* st40p_tx_handle;
 
 /** The structure info for st40 frame meta. */
 struct st40_frame_info {
-  /** Pointer to the main ancillary frame buffer */
-  struct st40_frame* anc_frame;
   /** Pointer to the metadata array for this frame */
   struct st40_meta* meta;
   /** Pointer to the number of metadata entries in the frame */

lib/src/st2110/experimental/st40_pipeline_tx.c

@@ -144,15 +144,15 @@ static int tx_st40p_asign_anc_frames(struct st40p_tx_ctx* ctx) {
   for (i = 0; i < ctx->framebuff_cnt; i++) {
     frame_info = &frames[i].frame_info;
 
-    frame_info->anc_frame = st40_tx_get_framebuffer(ctx->transport, i);
-    if (!frame_info->anc_frame) {
+    frames[i].anc_frame = st40_tx_get_framebuffer(ctx->transport, i);
+    if (!frames[i].anc_frame) {
       err("%s(%d), Failed to get framebuffer %u \n", __func__, idx, i);
       return -EIO;
     }
-    dbg("%s(%d), fb %p\n", __func__, idx, frame_info->anc_frame);
+    dbg("%s(%d), fb %p\n", __func__, idx, frames[i].anc_frame);
 
-    frame_info->meta = frame_info->anc_frame->meta;
-    frame_info->anc_frame->data = frame_info->udw_buff_addr;
+    frame_info->meta = frames[i].anc_frame->meta;
+    frames[i].anc_frame->data = frame_info->udw_buff_addr;
   }
   return 0;
 }
@@ -400,19 +400,19 @@ int st40p_tx_put_frame(st40p_tx_handle handle, struct st40_frame_info* frame_inf
     return -EIO;
   }
 
-  if (!frame_info->anc_frame->data_size && frame_info->meta_num)
-    frame_info->anc_frame->data_size = frame_info->udw_buffer_fill;
+  if (!framebuff->anc_frame->data_size && frame_info->meta_num)
+    framebuff->anc_frame->data_size = frame_info->udw_buffer_fill;
 
-  if (!frame_info->anc_frame->data_size) {
+  if (!framebuff->anc_frame->data_size) {
     err("%s(%d), frame %u data size is 0\n", __func__, idx, producer_idx);
     return -EIO;
   }
 
-  if (!frame_info->anc_frame->meta_num && frame_info->meta_num)
-    frame_info->anc_frame->meta_num = frame_info->meta_num;
+  if (!framebuff->anc_frame->meta_num && frame_info->meta_num)
+    framebuff->anc_frame->meta_num = frame_info->meta_num;
 
-  if (frame_info->anc_frame->meta_num > ST40_MAX_META ||
-      frame_info->anc_frame->meta_num < 1) {
+  if (framebuff->anc_frame->meta_num > ST40_MAX_META ||
+      framebuff->anc_frame->meta_num < 1) {
     err("%s(%d), frame %u meta_num %u invalid\n", __func__, idx, producer_idx,
         frame_info->meta_num);
     return -EIO;
@@ -421,7 +421,7 @@ int st40p_tx_put_frame(st40p_tx_handle handle, struct st40_frame_info* frame_inf
   framebuff->frame_info.udw_buffer_fill = 0;
   framebuff->stat = ST40P_TX_FRAME_READY;
   ctx->stat_put_frame++;
-  dbg("%s(%d), frame %u(%p) succ\n", __func__, idx, producer_idx, frame_info->anc_frame);
+  dbg("%s(%d), frame %u(%p) succ\n", __func__, idx, producer_idx, framebuff->anc_frame);
   return 0;
 }
 
@@ -630,5 +630,5 @@ void* st40p_tx_get_fb_addr(st40p_tx_handle handle, uint16_t idx) {
     return NULL;
   }
 
-  return ctx->framebuffs[idx].frame_info.anc_frame;
+  return ctx->framebuffs[idx].anc_frame;
 }

lib/src/st2110/experimental/st40_pipeline_tx.h

@@ -56,6 +56,8 @@ struct st40p_tx_frame {
   enum st40p_tx_frame_status stat;
   struct st40_frame_info frame_info;
   uint16_t idx;
+  /** Pointer to the main ancillary frame buffer */
+  struct st40_frame* anc_frame;
 };
 
 #if defined(__cplusplus)