[FFmpeg-devel] [PATCH] avformat/whip: simplify the udp read in whip_write_packet (PR #20339)

[FFmpeg-devel] [PATCH] avformat/whip: simplify the udp read in whip_write_packet (PR #20339)

[Jack Lau via ffmpeg-devel]

PR #20339 opened by Jack Lau (JackLau)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20339
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20339.patch

Reduce nested if statements to make the code structure clearer

Signed-off-by: Jack Lau <jacklau1222@qq.com>


>From 74004772075c5cf4856d05a7dc6560d343525f81 Mon Sep 17 00:00:00 2001
From: Jack Lau <jacklau1222@qq.com>
Date: Tue, 26 Aug 2025 06:08:36 +0800
Subject: [PATCH] avformat/whip: simplify the udp read in whip_write_packet

Reduce nested if statements to make the code structure clearer

Signed-off-by: Jack Lau <jacklau1222@qq.com>
---
 libavformat/whip.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/libavformat/whip.c b/libavformat/whip.c
index 69f1010ee8..fd34e83f71 100644
--- a/libavformat/whip.c
+++ b/libavformat/whip.c
@@ -1761,18 +1761,20 @@ static int whip_write_packet(AVFormatContext *s, AVPacket *pkt)
      * and RTCP like PLI requests, then respond to them.
      */
     ret = ffurl_read(whip->udp, whip->buf, sizeof(whip->buf));
-    if (ret > 0) {
-        if (is_dtls_packet(whip->buf, ret)) {
-            if ((ret = ffurl_write(whip->dtls_uc, whip->buf, ret)) < 0) {
-                av_log(whip, AV_LOG_ERROR, "Failed to handle DTLS message\n");
-                goto end;
-            }
-        }
-    } else if (ret != AVERROR(EAGAIN)) {
-        av_log(whip, AV_LOG_ERROR, "Failed to read from UDP socket\n");
+    if (ret < 0) {
+        if (ret == AVERROR(EAGAIN))
+            goto write_packet;
         goto end;
     }
-
+    if (!ret)
+        goto end;
+    if (is_dtls_packet(whip->buf, ret)) {
+        if ((ret = ffurl_write(whip->dtls_uc, whip->buf, ret)) < 0) {
+            av_log(whip, AV_LOG_ERROR, "Failed to handle DTLS message\n");
+            goto end;
+        }
+    }
+write_packet:
     if (whip->h264_annexb_insert_sps_pps && st->codecpar->codec_id == AV_CODEC_ID_H264) {
         if ((ret = h264_annexb_insert_sps_pps(s, pkt)) < 0) {
             av_log(whip, AV_LOG_ERROR, "Failed to insert SPS/PPS before IDR\n");
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org