Add: St40p support in RxTxApp

Sakoram · Sakoram · commit 888e1c69bc84 · 2025-12-11T14:07:56.000Z
Change configs in config/ for them to use pipeline mode

Signed-off-by: Kasiewicz, Marek &lt;marek.kasiewicz@intel.com&gt;
diff --git a/config/redundant_rx_1v_1a_1anc.json b/config/redundant_rx_1v_1a_1anc.json
@@ -45,11 +45,13 @@
                     "audio_ptime": "1"
                 }
             ],
-            "ancillary": [
+            "st40p": [
                 {
                     "replicas": 1,
+                    "start_port": 40000,
                     "payload_type": 113,
-                    "start_port": 40000
+                    "fps": "p59",
+                    "st40p_url": ""
                 }
             ]
         }
diff --git a/config/redundant_rx_2v_1a_1anc.json b/config/redundant_rx_2v_1a_1anc.json
@@ -45,11 +45,13 @@
                     "audio_ptime": "1"
                 }
             ],
-            "ancillary": [
+            "st40p": [
                 {
                     "replicas": 1,
+                    "start_port": 40000,
                     "payload_type": 113,
-                    "start_port": 40000
+                    "fps": "p59",
+                    "st40p_url": ""
                 }
             ]
         },
diff --git a/config/redundant_tx_1v_1a_1anc.json b/config/redundant_tx_1v_1a_1anc.json
@@ -47,15 +47,13 @@
                     "audio_url": "./test.pcm"
                 }
             ],
-            "ancillary": [
+            "st40p": [
                 {
                     "replicas": 1,
                     "start_port": 40000,
                     "payload_type": 113,
-                    "type": "frame",
-                    "ancillary_format": "closed_caption",
-                    "ancillary_url": "./test.txt",
-                    "ancillary_fps": "p59"
+                    "fps": "p59",
+                    "st40p_url": "./test.txt"
                 }
             ]
         }
diff --git a/config/redundant_tx_2v_1a_1anc.json b/config/redundant_tx_2v_1a_1anc.json
@@ -47,15 +47,13 @@
                     "audio_url": "./test.pcm"
                 }
             ],
-            "ancillary": [
+            "st40p": [
                 {
                     "replicas": 1,
                     "start_port": 40000,
                     "payload_type": 113,
-                    "type": "frame",
-                    "ancillary_format": "closed_caption",
-                    "ancillary_url": "./test.txt",
-                    "ancillary_fps": "p59"
+                    "fps": "p59",
+                    "st40p_url": "./test.txt"
                 }
             ]
         },
diff --git a/config/rx_1v_1a_1anc.json b/config/rx_1v_1a_1anc.json
@@ -39,11 +39,13 @@
                     "audio_ptime": "1"
                 }
             ],
-            "ancillary": [
+            "st40p": [
                 {
                     "replicas": 1,
+                    "start_port": 40000,
                     "payload_type": 113,
-                    "start_port": 40000
+                    "fps": "p59",
+                    "st40p_url": ""
                 }
             ]
         }
diff --git a/config/rx_2v2dest_1a_1anc.json b/config/rx_2v2dest_1a_1anc.json
@@ -39,11 +39,13 @@
                     "audio_ptime": "1"
                 }
             ],
-            "ancillary": [
+            "st40p": [
                 {
                     "replicas": 1,
+                    "start_port": 40000,
                     "payload_type": 113,
-                    "start_port": 40000
+                    "fps": "p59",
+                    "st40p_url": ""
                 }
             ]
         },
diff --git a/config/tx_1v_1a_1anc.json b/config/tx_1v_1a_1anc.json
@@ -39,15 +39,13 @@
                     "audio_url": "./test.pcm"
                 }
             ],
-            "ancillary": [
+            "st40p": [
                 {
                     "replicas": 1,
                     "start_port": 40000,
                     "payload_type": 113,
-                    "type": "frame",
-                    "ancillary_format": "closed_caption",
-                    "ancillary_url": "./test.txt",
-                    "ancillary_fps": "p59"
+                    "fps": "p59",
+                    "st40p_url": "./test.txt"
                 }
             ]
         }
diff --git a/config/tx_2v2dest_1a_1anc.json b/config/tx_2v2dest_1a_1anc.json
@@ -39,15 +39,13 @@
                     "audio_url": "./test.pcm"
                 }
             ],
-            "ancillary": [
+            "st40p": [
                 {
                     "replicas": 1,
                     "start_port": 40000,
                     "payload_type": 113,
-                    "type": "frame",
-                    "ancillary_format": "closed_caption",
-                    "ancillary_url": "./test.txt",
-                    "ancillary_fps": "p59"
+                    "fps": "p59",
+                    "st40p_url": "./test.txt"
                 }
             ]
         },
diff --git a/tests/tools/RxTxApp/meson.build b/tests/tools/RxTxApp/meson.build
@@ -69,6 +69,9 @@ endif
 # simd build option, enable sse4.2 default, todo: do we need AVX2/AVX512 for app ?
 app_c_args += ['-msse4.2']
 
+# Keep column tracking enabled on large translation units to avoid misleading-indentation noise.
+app_c_args += ['-flarge-source-files']
+
 if is_windows
   ws2_32_dep = cc.find_library('ws2_32', required: true)
   mman_dep = cc.find_library('mman', required: true)
diff --git a/tests/tools/RxTxApp/src/app_base.h b/tests/tools/RxTxApp/src/app_base.h
@@ -14,6 +14,7 @@
 #include <mtl/st30_api.h>
 #include <mtl/st30_pipeline_api.h>
 #include <mtl/st40_api.h>
+#include <mtl/st40_pipeline_api.h>
 #include <mtl/st41_api.h>
 #include <mtl/st_pipeline_api.h>
 #include <pcap.h>
@@ -209,11 +210,18 @@ struct st_app_tx_audio_session {
 };
 
 struct st_app_tx_anc_session {
+  struct st_app_context* ctx;
+
   int idx;
   st40_tx_handle handle;
 
   uint16_t framebuff_cnt;
 
+  uint64_t frame_num;
+  double frame_time;
+  uint64_t local_tai_base_time;
+  struct st_user_time* user_time;
+
   uint16_t framebuff_producer_idx;
   uint16_t framebuff_consumer_idx;
   struct st_tx_frame* framebuffs;
@@ -480,6 +488,36 @@ struct st_app_tx_st22p_session {
   bool st22p_app_thread_stop;
 };
 
+struct st_app_tx_st40p_session {
+  struct st_app_context* ctx;
+
+  int idx;
+  st40p_tx_handle handle;
+  mtl_handle st;
+  int framebuff_cnt;
+
+  st_json_st40p_session_t* st40p;
+
+  char st40p_source_url[ST_APP_URL_MAX_LEN];
+  uint8_t* st40p_source_begin;
+  uint8_t* st40p_source_end;
+  uint8_t* st40p_frame_cursor;
+
+  double expect_fps;
+  double frame_time;
+  uint64_t frame_num;
+  uint64_t local_tai_base_time;
+  struct st_user_time* user_time;
+
+  size_t udw_payload_limit;
+
+  pthread_t st40p_app_thread;
+  bool st40p_app_thread_stop;
+
+  int fb_send;
+  int fb_send_done;
+};
+
 struct st_app_rx_st22p_session {
   int idx;
   mtl_handle st;
@@ -704,6 +742,10 @@ struct st_app_context {
   struct st_app_tx_st22p_session* tx_st22p_sessions;
   int tx_st22p_session_cnt;
 
+  char tx_st40p_url[ST_APP_URL_MAX_LEN];
+  struct st_app_tx_st40p_session* tx_st40p_sessions;
+  int tx_st40p_session_cnt;
+
   char tx_st20p_url[ST_APP_URL_MAX_LEN]; /* send st20p content url*/
   struct st_app_tx_st20p_session* tx_st20p_sessions;
   int tx_st20p_session_cnt;
diff --git a/tests/tools/RxTxApp/src/args.c b/tests/tools/RxTxApp/src/args.c
@@ -40,6 +40,8 @@ enum st_args_cmd {
   ST_ARG_TX_FMD_URL,
   ST_ARG_TX_FMD_SESSIONS_CNT,
   ST_ARG_TX_FMD_RTP_RING_SIZE,
+  ST_ARG_TX_ST40P_URL,
+  ST_ARG_TX_ST40P_SESSIONS_CNT,
   ST22_ARG_TX_SESSIONS_CNT,
   ST22_ARG_TX_URL,
   ST_ARG_RX_VIDEO_SESSIONS_CNT,
@@ -192,6 +194,8 @@ static struct option st_app_args_options[] = {
     {"tx_fmd_url", required_argument, 0, ST_ARG_TX_FMD_URL},
     {"tx_fmd_sessions_count", required_argument, 0, ST_ARG_TX_FMD_SESSIONS_CNT},
     {"tx_fmd_rtp_ring_size", required_argument, 0, ST_ARG_TX_FMD_RTP_RING_SIZE},
+    {"tx_st40p_url", required_argument, 0, ST_ARG_TX_ST40P_URL},
+    {"tx_st40p_sessions_count", required_argument, 0, ST_ARG_TX_ST40P_SESSIONS_CNT},
     {"tx_st22_sessions_count", required_argument, 0, ST22_ARG_TX_SESSIONS_CNT},
     {"tx_st22_url", required_argument, 0, ST22_ARG_TX_URL},
 
@@ -366,6 +370,7 @@ static int app_args_json(struct st_app_context* ctx, struct mtl_init_params* p,
   ctx->tx_anc_session_cnt = ctx->json_ctx->tx_anc_session_cnt;
   ctx->tx_fmd_session_cnt = ctx->json_ctx->tx_fmd_session_cnt;
   ctx->tx_st22p_session_cnt = ctx->json_ctx->tx_st22p_session_cnt;
+  ctx->tx_st40p_session_cnt = ctx->json_ctx->tx_st40p_session_cnt;
   ctx->tx_st20p_session_cnt = ctx->json_ctx->tx_st20p_session_cnt;
   ctx->tx_st30p_session_cnt = ctx->json_ctx->tx_st30p_session_cnt;
   ctx->rx_video_session_cnt = ctx->json_ctx->rx_video_session_cnt;
@@ -519,6 +524,12 @@ int st_app_parse_args(struct st_app_context* ctx, struct mtl_init_params* p, int
       case ST_ARG_TX_AUDIO_RTP_RING_SIZE:
         ctx->tx_audio_rtp_ring_size = atoi(optarg);
         break;
+      case ST_ARG_TX_ST40P_URL:
+        snprintf(ctx->tx_st40p_url, sizeof(ctx->tx_st40p_url), "%s", optarg);
+        break;
+      case ST_ARG_TX_ST40P_SESSIONS_CNT:
+        ctx->tx_st40p_session_cnt = atoi(optarg);
+        break;
       case ST_ARG_TX_ANC_URL:
         snprintf(ctx->tx_anc_url, sizeof(ctx->tx_anc_url), "%s", optarg);
         break;
diff --git a/tests/tools/RxTxApp/src/meson.build b/tests/tools/RxTxApp/src/meson.build
@@ -3,10 +3,11 @@
 
 sources = files('rxtx_app.c', 'args.c', 'parse_json.c', 'fmt.c',
 				'tx_st20p_app.c', 'rx_st20p_app.c',
-				'tx_st22p_app.c', 'rx_st22p_app.c',
-				'tx_ancillary_app.c', 'rx_ancillary_app.c',
-				'tx_fastmetadata_app.c', 'rx_fastmetadata_app.c',
-				'tx_st30p_app.c', 'rx_st30p_app.c',
+			'tx_st22p_app.c', 'rx_st22p_app.c',
+			'tx_ancillary_app.c', 'rx_ancillary_app.c',
+			'tx_fastmetadata_app.c', 'rx_fastmetadata_app.c',
+			'tx_st40p_app.c',
+			'tx_st30p_app.c', 'rx_st30p_app.c',
 				)
 
 if app_has_sdl2
diff --git a/tests/tools/RxTxApp/src/parse_json.c b/tests/tools/RxTxApp/src/parse_json.c
diff --git a/tests/tools/RxTxApp/src/parse_json.h b/tests/tools/RxTxApp/src/parse_json.h
diff --git a/tests/tools/RxTxApp/src/rxtx_app.c b/tests/tools/RxTxApp/src/rxtx_app.c
diff --git a/tests/tools/RxTxApp/src/tx_st40p_app.c b/tests/tools/RxTxApp/src/tx_st40p_app.c
diff --git a/tests/tools/RxTxApp/src/tx_st40p_app.h b/tests/tools/RxTxApp/src/tx_st40p_app.h

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,13 @@`
`45`	`45`	`"audio_ptime": "1"`
`46`	`46`	`}`
`47`	`47`	`],`
`48`		`- "ancillary": [`
	`48`	`+ "st40p": [`
`49`	`49`	`{`
`50`	`50`	`"replicas": 1,`
	`51`	`+ "start_port": 40000,`
`51`	`52`	`"payload_type": 113,`
`52`		`- "start_port": 40000`
	`53`	`+ "fps": "p59",`
	`54`	`+ "st40p_url": ""`
`53`	`55`	`}`
`54`	`56`	`]`
`55`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,15 +47,13 @@`
`47`	`47`	`"audio_url": "./test.pcm"`
`48`	`48`	`}`
`49`	`49`	`],`
`50`		`- "ancillary": [`
	`50`	`+ "st40p": [`
`51`	`51`	`{`
`52`	`52`	`"replicas": 1,`
`53`	`53`	`"start_port": 40000,`
`54`	`54`	`"payload_type": 113,`
`55`		`- "type": "frame",`
`56`		`- "ancillary_format": "closed_caption",`
`57`		`- "ancillary_url": "./test.txt",`
`58`		`- "ancillary_fps": "p59"`
	`55`	`+ "fps": "p59",`
	`56`	`+ "st40p_url": "./test.txt"`
`59`	`57`	`}`
`60`	`58`	`]`
`61`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,13 @@`
`39`	`39`	`"audio_ptime": "1"`
`40`	`40`	`}`
`41`	`41`	`],`
`42`		`- "ancillary": [`
	`42`	`+ "st40p": [`
`43`	`43`	`{`
`44`	`44`	`"replicas": 1,`
	`45`	`+ "start_port": 40000,`
`45`	`46`	`"payload_type": 113,`
`46`		`- "start_port": 40000`
	`47`	`+ "fps": "p59",`
	`48`	`+ "st40p_url": ""`
`47`	`49`	`}`
`48`	`50`	`]`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,13 @@`
`39`	`39`	`"audio_url": "./test.pcm"`
`40`	`40`	`}`
`41`	`41`	`],`
`42`		`- "ancillary": [`
	`42`	`+ "st40p": [`
`43`	`43`	`{`
`44`	`44`	`"replicas": 1,`
`45`	`45`	`"start_port": 40000,`
`46`	`46`	`"payload_type": 113,`
`47`		`- "type": "frame",`
`48`		`- "ancillary_format": "closed_caption",`
`49`		`- "ancillary_url": "./test.txt",`
`50`		`- "ancillary_fps": "p59"`
	`47`	`+ "fps": "p59",`
	`48`	`+ "st40p_url": "./test.txt"`
`51`	`49`	`}`
`52`	`50`	`]`
`53`	`51`	`}`