add retries to the initial read packet

Add retries to the initial read packet in FFmpeg to prevent immediate failures. This will aid in the synchronization of unicast FFmpeg streams and allow for some leniency in the RX session establishment.
OpenVisualCloud · Jul 2, 2024 · 68d2428 · 68d2428
1 parent 168f5ed
commit 68d2428
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/ecosystem/ffmpeg_plugin/mtl_st20p_rx.c b/ecosystem/ffmpeg_plugin/mtl_st20p_rx.c
@@ -185,7 +185,17 @@ static int mtl_st20p_read_packet(AVFormatContext* ctx, AVPacket* pkt) {
   struct st_frame* frame;
 
   dbg("%s(%d), start\n", __func__, s->idx);
-  frame = st20p_rx_get_frame(s->rx_handle);
+
+  if (0 == s->frame_counter) {
+    for (int i = 1; i <= 10; i++) {
+      frame = st20p_rx_get_frame(s->rx_handle);
+      if (frame)
+        break;
+      info(ctx, "%s(%d) session initialization retry %d\n", __func__, s->idx, i);
+    }
+  } else
+    frame = st20p_rx_get_frame(s->rx_handle);
+
   if (!frame) {
     info(ctx, "%s(%d), st20p_rx_get_frame timeout\n", __func__, s->idx);
     return AVERROR(EIO);

diff --git a/ecosystem/ffmpeg_plugin/mtl_st22p_rx.c b/ecosystem/ffmpeg_plugin/mtl_st22p_rx.c
@@ -312,7 +312,17 @@ static int mtl_st22p_read_packet(AVFormatContext* ctx, AVPacket* pkt) {
   struct st_frame* frame;
 
   dbg("%s(%d), start\n", __func__, s->idx);
-  frame = st22p_rx_get_frame(s->rx_handle);
+
+  if (0 == s->frame_counter) {
+    for (int i = 1; i <= 10; i++) {
+      frame = st22p_rx_get_frame(s->rx_handle);
+      if (frame)
+        break;
+      info(ctx, "%s(%d) session initialization retry %d\n", __func__, s->idx, i);
+    }
+  } else
+    frame = st22p_rx_get_frame(s->rx_handle);
+
   if (!frame) {
     info(ctx, "%s(%d), st22p_rx_get_frame timeout\n", __func__, s->idx);
     return AVERROR(EIO);

diff --git a/ecosystem/ffmpeg_plugin/mtl_st30p_rx.c b/ecosystem/ffmpeg_plugin/mtl_st30p_rx.c
@@ -197,7 +197,17 @@ static int mtl_st30p_read_packet(AVFormatContext* ctx, AVPacket* pkt) {
   struct st30_frame* frame;
 
   dbg("%s(%d), start\n", __func__, s->idx);
-  frame = st30p_rx_get_frame(s->rx_handle);
+
+  if (0 == s->frame_counter) {
+    for (int i = 1; i <= 10; i++) {
+      frame = st30p_rx_get_frame(s->rx_handle);
+      if (frame)
+        break;
+      info(ctx, "%s(%d) session initialization retry %d\n", __func__, s->idx, i);
+    }
+  } else
+    frame = st30p_rx_get_frame(s->rx_handle);
+
   if (!frame) {
     info(ctx, "%s(%d), st30p_rx_get_frame timeout\n", __func__, s->idx);
     return AVERROR(EIO);