Add: RX timestamp to st30_frame & st40_frame_info

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

Author: Sakoram

include/st30_api.h

@@ -278,6 +278,8 @@ struct st30_rx_frame_meta {
   enum st10_timestamp_fmt tfmt;
   /** Frame timestamp value */
   uint64_t timestamp;
+  /** TAI timestamp measured right after the RTP packet for this frame was received */
+  uint64_t timestamp_first_pkt;
   /** Timestamp value in the rtp header */
   uint32_t rtp_timestamp;
   /** received data size for current frame */

include/st30_pipeline_api.h

@@ -85,6 +85,9 @@ struct st30_frame {
    * 'pkts_total,' which serves as an indicator of signal quality.  */
   uint32_t pkts_recv[MTL_SESSION_PORT_MAX];
 
+  /** TAI timestamp measured right after the first packet of the frame was received */
+  uint64_t receive_timestamp;
+
   /** priv pointer for lib, do not touch this */
   void* priv;
 };

include/st40_pipeline_api.h

@@ -45,6 +45,9 @@ struct st40_frame_info {
    * 'pkts_total,' which serves as an indicator of signal quality.  */
   uint32_t pkts_recv[MTL_SESSION_PORT_MAX];
 
+  /** TAI timestamp measured right after the RTP packet for this frame was received */
+  uint64_t receive_timestamp;
+
   /** priv pointer for lib, do not touch this */
   void* priv;
 };

lib/src/st2110/pipeline/st30_pipeline_rx.c

@@ -89,6 +89,7 @@ static int rx_st30p_frame_ready(void* priv, void* addr, struct st30_rx_frame_met
   frame->data_size = meta->frame_recv_size;
   frame->tfmt = meta->tfmt;
   frame->timestamp = meta->timestamp;
+  frame->receive_timestamp = meta->timestamp_first_pkt;
   frame->rtp_timestamp = meta->rtp_timestamp;
   framebuff->stat = ST30P_RX_FRAME_READY;
   /* point to next */
@@ -186,6 +187,7 @@ static int rx_st30p_init_fbs(struct st30p_rx_ctx* ctx, struct st30p_rx_ops* ops)
     frame->ptime = ops->ptime;
     /* same to framebuffer size */
     frame->buffer_size = frame->data_size = ops->framebuff_size;
+    frame->receive_timestamp = 0;
     dbg("%s(%d), init fb %u\n", __func__, idx, i);
   }
 

lib/src/st2110/pipeline/st40_pipeline_rx.c

@@ -86,6 +86,14 @@ static int rx_st40p_rtp_ready(void* priv) {
   mbuf = st40_rx_get_mbuf(ctx->transport, &usrptr, &len);
   if (!mbuf) return -EBUSY;
 
+  struct rte_mbuf* pkt = mbuf;
+  enum mtl_port port = mt_port_by_id(ctx->impl, pkt->port);
+  uint64_t receive_timestamp = 0;
+  if (port < MTL_PORT_MAX)
+    receive_timestamp = mt_mbuf_time_stamp(ctx->impl, pkt, port);
+  else
+    receive_timestamp = mtl_ptp_read_time(ctx->impl);
+
   uint32_t hdr_bytes = sizeof(struct st40_rfc8331_rtp_hdr);
   if (len < hdr_bytes) {
     warn("%s(%d), RTP packet too small (%u < %u)\n", __func__, ctx->idx, len, hdr_bytes);
@@ -109,6 +117,7 @@ static int rx_st40p_rtp_ready(void* priv) {
   }
 
   frame_info = &framebuff->frame_info;
+  frame_info->receive_timestamp = receive_timestamp;
 
   /* parse RTP packet and copy metadata */
   payload = (uint8_t*)(hdr + 1);
@@ -314,6 +323,7 @@ static int rx_st40p_init_fbs(struct st40p_rx_ctx* ctx, struct st40p_rx_ops* ops)
     frame_info->udw_buffer_fill = 0;
     frame_info->meta_num = 0;
     frame_info->meta = framebuff->meta;
+    frame_info->receive_timestamp = 0;
     frame_info->priv = framebuff;
 
     dbg("%s(%d), init fb %u\n", __func__, idx, i);

lib/src/st2110/st_header.h

@@ -1033,6 +1033,7 @@ struct st_rx_audio_session_impl {
   int redundant_error_cnt[MTL_SESSION_PORT_MAX];
 
   uint32_t first_pkt_rtp_ts; /* rtp time stamp for the first pkt */
+  uint64_t first_pkt_ptp_ts; /* PTP time stamp for the first pkt */
   int64_t tmstamp;
   size_t frame_recv_size;
 

lib/src/st2110/st_rx_audio_session.c

@@ -288,8 +288,11 @@ static int rx_audio_session_handle_frame_pkt(struct mtl_main_impl* impl,
     return -EINVAL;
   }
 
+  enum mtl_port port = mt_port_logic2phy(s->port_maps, s_port);
+
   if (s->st30_pkt_idx == 0) {
     s->first_pkt_rtp_ts = tmstamp;
+    s->first_pkt_ptp_ts = mt_mbuf_time_stamp(impl, mbuf, port);
   }
 
   if (unlikely(s->latest_seq_id[s_port] == -1)) s->latest_seq_id[s_port] = seq_id - 1;
@@ -359,7 +362,6 @@ static int rx_audio_session_handle_frame_pkt(struct mtl_main_impl* impl,
   s->st30_pkt_idx++;
 
   if (s->enable_timing_parser) {
-    enum mtl_port port = mt_port_logic2phy(s->port_maps, s_port);
     ra_tp_on_packet(s, s_port, tmstamp, mt_mbuf_time_stamp(impl, mbuf, port));
   }
 
@@ -388,6 +390,7 @@ static int rx_audio_session_handle_frame_pkt(struct mtl_main_impl* impl,
 
     meta->tfmt = ST10_TIMESTAMP_FMT_MEDIA_CLK;
     meta->timestamp = s->first_pkt_rtp_ts;
+    meta->timestamp_first_pkt = s->first_pkt_ptp_ts;
     meta->fmt = ops->fmt;
     meta->sampling = ops->sampling;
     meta->channel = ops->channel;