Change: STATIC_PAD to be disabled by default

Signed-off-by: Kasiewicz, Marek <[email protected]>

Author: Sakoram

include/st20_api.h

@@ -62,9 +62,11 @@ extern "C" {
 #define ST20_TX_FLAG_ENABLE_VSYNC (MTL_BIT32(5))
 /**
  * Flag bit in flags of struct st20_tx_ops.
- * If disable the static RL pad interval profiling.
+ * If enable the static RL pad interval profiling.
+ * Static padding is trained only for e810, it is not recommended to use this flag
+ * for other NICs.
  */
-#define ST20_TX_FLAG_DISABLE_STATIC_PAD_P (MTL_BIT32(6))
+#define ST20_TX_FLAG_ENABLE_STATIC_PAD_P (MTL_BIT32(6))
 /**
  * Flag bit in flags of struct st20_tx_ops.
  * If enable the rtcp.

include/st_pipeline_api.h

@@ -442,9 +442,11 @@ enum st20p_tx_flag {
    */
   ST20P_TX_FLAG_ENABLE_VSYNC = (MTL_BIT32(5)),
   /**
-   * If disable the static RL pad interval profiling.
+   * If enable the static RL pad interval profiling.
+   * Static padding is trained only for e810, it is not recommended to use this flag
+   * for other NICs.
    */
-  ST20P_TX_FLAG_DISABLE_STATIC_PAD_P = (MTL_BIT32(6)),
+  ST20P_TX_FLAG_ENABLE_STATIC_PAD_P = (MTL_BIT32(6)),
   /**
    * If enable the rtcp.
    */

lib/src/st2110/pipeline/st20_pipeline_tx.c

@@ -292,8 +292,8 @@ static int tx_st20p_create_transport(struct mtl_main_impl* impl, struct st20p_tx
   if (ops->flags & ST20P_TX_FLAG_USER_TIMESTAMP)
     ops_tx.flags |= ST20_TX_FLAG_USER_TIMESTAMP;
   if (ops->flags & ST20P_TX_FLAG_ENABLE_VSYNC) ops_tx.flags |= ST20_TX_FLAG_ENABLE_VSYNC;
-  if (ops->flags & ST20P_TX_FLAG_DISABLE_STATIC_PAD_P)
-    ops_tx.flags |= ST20_TX_FLAG_DISABLE_STATIC_PAD_P;
+  if (ops->flags & ST20P_TX_FLAG_ENABLE_STATIC_PAD_P)
+    ops_tx.flags |= ST20_TX_FLAG_ENABLE_STATIC_PAD_P;
   if (ops->flags & ST20P_TX_FLAG_ENABLE_RTCP) {
     ops_tx.flags |= ST20_TX_FLAG_ENABLE_RTCP;
     ops_tx.rtcp = ops->rtcp;

lib/src/st2110/st_tx_video_session.c

@@ -331,7 +331,7 @@ static int tv_train_pacing(struct mtl_main_impl* impl, struct st_tx_video_sessio
     info("%s(%d), user customized pad_interval %u\n", __func__, idx, resolved);
     return 0;
   }
-  if (!(s->ops.flags & ST20_TX_FLAG_DISABLE_STATIC_PAD_P)) {
+  if ((s->ops.flags & ST20_TX_FLAG_ENABLE_STATIC_PAD_P)) {
     resolved = st20_pacing_static_profiling(impl, s, s_port);
     if (resolved) {
       s->pacing.pad_interval = resolved;

tests/tools/RxTxApp/src/app_base.h

@@ -654,7 +654,7 @@ struct st_app_context {
   int tx_video_rtp_ring_size; /* the ring size for tx video rtp type */
   uint16_t tx_start_vrx;
   uint16_t tx_pad_interval;
-  bool tx_no_static_pad;
+  bool tx_static_pad;
   bool tx_ts_first_pkt;
   bool tx_ts_epoch;
   int32_t tx_ts_delta_us;

tests/tools/RxTxApp/src/args.c

@@ -57,7 +57,7 @@ enum st_args_cmd {
   ST_ARG_PACING_WAY,
   ST_ARG_START_VRX,
   ST_ARG_PAD_INTERVAL,
-  ST_ARG_NO_PAD_STATIC,
+  ST_ARG_PAD_STATIC,
   ST_ARG_SHAPING,
   ST_ARG_TIMESTAMP_FIRST_PKT,
   ST_ARG_TIMESTAMP_EPOCH,
@@ -209,7 +209,7 @@ static struct option st_app_args_options[] = {
     {"pacing_way", required_argument, 0, ST_ARG_PACING_WAY},
     {"start_vrx", required_argument, 0, ST_ARG_START_VRX},
     {"pad_interval", required_argument, 0, ST_ARG_PAD_INTERVAL},
-    {"no_static_pad", no_argument, 0, ST_ARG_NO_PAD_STATIC},
+    {"static_pad", no_argument, 0, ST_ARG_PAD_STATIC},
     {"shaping", required_argument, 0, ST_ARG_SHAPING},
     {"ts_first_pkt", no_argument, 0, ST_ARG_TIMESTAMP_FIRST_PKT},
     {"ts_delta_us", required_argument, 0, ST_ARG_TIMESTAMP_DELTA_US},
@@ -600,8 +600,8 @@ int st_app_parse_args(struct st_app_context* ctx, struct mtl_init_params* p, int
       case ST_ARG_PAD_INTERVAL:
         ctx->tx_pad_interval = atoi(optarg);
         break;
-      case ST_ARG_NO_PAD_STATIC:
-        ctx->tx_no_static_pad = true;
+      case ST_ARG_PAD_STATIC:
+        ctx->tx_static_pad = true;
         break;
       case ST_ARG_TIMESTAMP_FIRST_PKT:
         ctx->tx_ts_first_pkt = true;

tests/tools/RxTxApp/src/legacy/tx_video_app.c

@@ -790,7 +790,7 @@ static int app_tx_video_init(struct st_app_context* ctx, st_json_video_session_t
   ops.pad_interval = ctx->tx_pad_interval;
   ops.rtp_timestamp_delta_us = ctx->tx_ts_delta_us;
   if (s->enable_vsync) ops.flags |= ST20_TX_FLAG_ENABLE_VSYNC;
-  if (ctx->tx_no_static_pad) ops.flags |= ST20_TX_FLAG_DISABLE_STATIC_PAD_P;
+  if (ctx->tx_static_pad) ops.flags |= ST20_TX_FLAG_ENABLE_STATIC_PAD_P;
   if (ctx->tx_ts_first_pkt) ops.flags |= ST20_TX_FLAG_RTP_TIMESTAMP_FIRST_PKT;
   if (ctx->tx_ts_epoch) ops.flags |= ST20_TX_FLAG_RTP_TIMESTAMP_EPOCH;
   if (ctx->tx_no_bulk) ops.flags |= ST20_TX_FLAG_DISABLE_BULK;

tests/tools/RxTxApp/src/tx_st20p_app.c

@@ -286,7 +286,7 @@ static int app_tx_st20p_init(struct st_app_context* ctx, st_json_st20p_session_t
   ops.pad_interval = ctx->tx_pad_interval;
   ops.rtp_timestamp_delta_us = ctx->tx_ts_delta_us;
   ops.notify_event = app_tx_st20p_notify_event;
-  if (ctx->tx_no_static_pad) ops.flags |= ST20P_TX_FLAG_DISABLE_STATIC_PAD_P;
+  if (ctx->tx_static_pad) ops.flags |= ST20P_TX_FLAG_ENABLE_STATIC_PAD_P;
   if (st20p && st20p->enable_rtcp) ops.flags |= ST20P_TX_FLAG_ENABLE_RTCP;
   if (ctx->tx_ts_first_pkt) ops.flags |= ST20P_TX_FLAG_RTP_TIMESTAMP_FIRST_PKT;
   if (ctx->tx_ts_epoch) ops.flags |= ST20P_TX_FLAG_RTP_TIMESTAMP_EPOCH;