Merge branch 'main' into pstaszczuk/smoke-tests

Author: KarolinaPomian

app/sample/ext_frame/rx_st20_pipeline_dyn_ext_frame_sample.c

@@ -42,13 +42,23 @@ static int rx_st20p_query_ext_frame(void* priv, struct st_ext_frame* ext_frame,
   struct rx_st20p_sample_ctx* s = priv;
   int i = s->ext_idx;
   MTL_MAY_UNUSED(meta);
-
   /* you can check the timestamp from lib by meta->timestamp */
 
   ext_frame->addr[0] = s->ext_frames[i].buf_addr;
   ext_frame->iova[0] = s->ext_frames[i].buf_iova;
   ext_frame->size = s->ext_frames[i].buf_len;
 
+  uint8_t* addr = ext_frame->addr[0];
+  uint8_t planes = st_frame_fmt_planes(meta->fmt);
+  for (int plane = 0; plane < planes; plane++) {
+    if (plane > 0)
+      ext_frame->iova[plane] =
+          ext_frame->iova[plane - 1] + ext_frame->linesize[plane - 1] * meta->height;
+    ext_frame->linesize[plane] = st_frame_least_linesize(meta->fmt, meta->width, plane);
+    ext_frame->addr[plane] = addr;
+    addr += ext_frame->linesize[plane] * meta->height;
+  }
+
   /* save your private data here get it from st_frame.opaque */
   /* ext_frame->opaque = ?; */
 
@@ -150,6 +160,15 @@ int main(int argc, char** argv) {
   ret = rx_sample_parse_args(&ctx, argc, argv);
   if (ret < 0) return ret;
 
+  bool is_output_yuv420 = ctx.output_fmt == ST_FRAME_FMT_YUV420CUSTOM8 ||
+                          ctx.output_fmt == ST_FRAME_FMT_YUV420PLANAR8;
+  if (ctx.ext_frame && is_output_yuv420) {
+    warn(
+        "%s: external frame mode does not support yuv420 output format, use other format "
+        "e.g. yuv422\n",
+        __func__);
+  }
+
   /* enable auto start/stop */
   ctx.param.flags |= MTL_FLAG_DEV_AUTO_START_STOP;
   ctx.st = mtl_init(&ctx.param);
@@ -199,12 +218,13 @@ int main(int argc, char** argv) {
     ops_rx.framebuff_cnt = app[i]->fb_cnt;
     ops_rx.notify_frame_available = rx_st20p_frame_available;
 
-    if (equal) {
-      /* no convert, use ext frame for example */
+    if (equal || ctx.ext_frame) {
+      /* pre-allocate ext frames */
       app[i]->ext_frames =
           (struct st20_ext_frame*)malloc(sizeof(*app[i]->ext_frames) * app[i]->fb_cnt);
-      size_t framebuff_size =
-          st20_frame_size(ops_rx.transport_fmt, ops_rx.width, ops_rx.height);
+      size_t framebuff_size = st_frame_size(ops_rx.output_fmt, ops_rx.width,
+                                            ops_rx.height, ops_rx.interlaced);
+
       size_t fb_size = framebuff_size * app[i]->fb_cnt;
       /* alloc enough memory to hold framebuffers and map to iova */
       mtl_dma_mem_handle dma_mem = mtl_dma_mem_alloc(ctx.st, fb_size);
@@ -225,6 +245,7 @@ int main(int argc, char** argv) {
       /* use dynamic external frames */
       ops_rx.query_ext_frame = rx_st20p_query_ext_frame;
       ops_rx.flags |= ST20P_RX_FLAG_RECEIVE_INCOMPLETE_FRAME;
+      ops_rx.flags |= ST20P_RX_FLAG_EXT_FRAME;
     }
 
     st20p_rx_handle rx_handle = st20p_rx_create(ctx.st, &ops_rx);

lib/src/st2110/st_header.h

@@ -747,8 +747,6 @@ struct st_tx_audio_session_pacing {
   uint64_t cur_epochs;      /* epoch of current pkt */
   /* timestamp for rtp header */
   uint32_t rtp_time_stamp;
-  /* timestamp for pacing */
-  uint32_t pacing_time_stamp;
   uint64_t cur_epoch_time;
   /* in ns, tsc time cursor for packet pacing */
   uint64_t tsc_time_cursor;

lib/src/st2110/st_rx_video_session.c

@@ -1525,13 +1525,15 @@ static int rv_handle_frame_pkt(struct st_rx_video_session_impl* s, struct rte_mb
   /* find the target slot by tmstamp */
   bool exist_ts = false;
   struct st_rx_video_slot_impl* slot = rv_slot_by_tmstamp(s, tmstamp, NULL, &exist_ts);
-  if (!slot || !slot->frame) {
-    if (exist_ts) {
-      s->stat_pkts_redundant_dropped++;
-      slot->pkts_recv_per_port[s_port]++;
-    } else {
-      s->stat_pkts_no_slot++;
-    }
+  /* Based on rv_slot_by_tmstamp - exist_ts is only true when slot is found */
+  if (exist_ts && !slot->frame) {
+    s->stat_pkts_redundant_dropped++;
+    slot->pkts_recv_per_port[s_port]++;
+    return 0;
+  }
+
+  if ((!slot || !slot->frame) && !exist_ts) {
+    s->stat_pkts_no_slot++;
     return -EIO;
   }
 
@@ -1941,13 +1943,15 @@ static int rv_handle_st22_pkt(struct st_rx_video_session_impl* s, struct rte_mbu
   /* find the target slot by tmstamp */
   bool exist_ts = false;
   struct st_rx_video_slot_impl* slot = rv_slot_by_tmstamp(s, tmstamp, NULL, &exist_ts);
-  if (!slot || !slot->frame) {
-    if (exist_ts) {
-      s->stat_pkts_redundant_dropped++;
-      slot->pkts_recv_per_port[s_port]++;
-    } else {
-      s->stat_pkts_no_slot++;
-    }
+  /* Based on rv_slot_by_tmstamp - exist_ts is only true when slot is found */
+  if (exist_ts && !slot->frame) {
+    s->stat_pkts_redundant_dropped++;
+    slot->pkts_recv_per_port[s_port]++;
+    return 0;
+  }
+
+  if ((!slot || !slot->frame) && !exist_ts) {
+    s->stat_pkts_no_slot++;
     return -EIO;
   }
   uint8_t* bitmap = slot->frame_bitmap;
@@ -2111,13 +2115,15 @@ static int rv_handle_hdr_split_pkt(struct st_rx_video_session_impl* s,
   /* find the target slot by tmstamp */
   bool exist_ts = false;
   struct st_rx_video_slot_impl* slot = rv_slot_by_tmstamp(s, tmstamp, payload, &exist_ts);
-  if (!slot || !slot->frame) {
-    if (exist_ts) {
-      s->stat_pkts_redundant_dropped++;
-      slot->pkts_recv_per_port[s_port]++;
-    } else {
-      s->stat_pkts_no_slot++;
-    }
+  /* Based on rv_slot_by_tmstamp - exist_ts is only true when slot is found */
+  if (exist_ts && !slot->frame) {
+    s->stat_pkts_redundant_dropped++;
+    slot->pkts_recv_per_port[s_port]++;
+    return 0;
+  }
+
+  if ((!slot || !slot->frame) && !exist_ts) {
+    s->stat_pkts_no_slot++;
     return -EIO;
   }
   uint8_t* bitmap = slot->frame_bitmap;

lib/src/st2110/st_tx_audio_session.c

@@ -264,7 +264,7 @@ static int tx_audio_session_sync_pacing(struct mtl_main_impl* impl,
                                         struct st_tx_audio_session_impl* s, bool sync,
                                         uint64_t required_tai) {
   struct st_tx_audio_session_pacing* pacing = &s->pacing;
-  double pkt_time = pacing->trs;
+  long double pkt_time = pacing->trs;
   /* always use MTL_PORT_P for ptp now */
   uint64_t ptp_time = mt_get_ptp_time(impl, MTL_PORT_P);
   uint64_t next_epochs = pacing->cur_epochs + 1;
@@ -302,7 +302,18 @@ static int tx_audio_session_sync_pacing(struct mtl_main_impl* impl,
     }
   }
 
-  to_epoch = tx_audio_pacing_time(pacing, epochs) - ptp_time;
+  if (required_tai) {
+    to_epoch = (double)required_tai - ptp_time;
+    if (to_epoch > NS_PER_S) {
+      dbg("%s(%d), required tai %" PRIu64 " ptp_epochs %" PRIu64 " epochs %" PRIu64 "\n",
+          __func__, s->idx, required_tai, ptp_epochs, epochs);
+      s->stat_error_user_timestamp++;
+      to_epoch = NS_PER_S;  // do our best to slow down
+    }
+  } else {
+    to_epoch = tx_audio_pacing_time(pacing, epochs) - ptp_time;
+  }
+
   if (to_epoch < 0) {
     /* time bigger than the assigned epoch time */
     s->stat_epoch_mismatch++;
@@ -313,13 +324,27 @@ static int tx_audio_session_sync_pacing(struct mtl_main_impl* impl,
   if (epochs < next_epochs) s->stat_epoch_onward += (next_epochs - epochs);
 
   pacing->cur_epochs = epochs;
-  pacing->cur_epoch_time = tx_audio_pacing_time(pacing, epochs);
-  pacing->pacing_time_stamp = tx_audio_pacing_time_stamp(pacing, epochs);
-  pacing->rtp_time_stamp = pacing->pacing_time_stamp;
+
+  if (required_tai) {
+    pacing->cur_epoch_time = required_tai + pkt_time;  // prepare next packet
+    /*
+     * Cast [double] to intermediate [uint64_t] to extract 32 least significant bits.
+     * If calculated time stored in [double] is larger than max uint32_t,
+     * then result of direct cast to [uint32_t] results in max uint32_t which is not
+     * what we want. "& 0xffffffff" is used to extract 32 least significant bits
+     * without compiler trying to optimize-out intermediate cast.
+     */
+    pacing->rtp_time_stamp =
+        ((uint64_t)((required_tai / pkt_time) * pacing->pkt_time_sampling) & 0xffffffff);
+  } else {
+    pacing->cur_epoch_time = tx_audio_pacing_time(pacing, epochs);
+    pacing->rtp_time_stamp = tx_audio_pacing_time_stamp(pacing, epochs);
+  }
+
   if (s->ops.rtp_timestamp_delta_us) {
     double rtp_timestamp_delta_us = s->ops.rtp_timestamp_delta_us;
     int32_t rtp_timestamp_delta =
-        (rtp_timestamp_delta_us * NS_PER_US) * pacing->pkt_time_sampling / pacing->trs;
+        (rtp_timestamp_delta_us * NS_PER_US) * pacing->pkt_time_sampling / pkt_time;
     pacing->rtp_time_stamp += rtp_timestamp_delta;
   }
   pacing->tsc_time_cursor = (double)mt_get_tsc(impl) + to_epoch;