[FFmpeg-devel] [PATCH 1/2] avformat/whip: Remove unnecessary pkt checks

[FFmpeg-devel] [PATCH 1/2] avformat/whip: Remove unnecessary pkt checks

[Steven Liu]

h264_annexb_insert_sps_pps (called after write_packet)
reorganizes PPS, SPS, and IDR packets in H.264 streams.
Since write_packet already validates pkt,
redundant null checks in h264_annexb_insert_sps_pps can be removed.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
---
 libavformat/whip.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavformat/whip.c b/libavformat/whip.c
index 0671e23635..ce06a66bc4 100644
--- a/libavformat/whip.c
+++ b/libavformat/whip.c
@@ -1660,8 +1660,6 @@ static int h264_annexb_insert_sps_pps(AVFormatContext *s, AVPacket *pkt)
     uint8_t unit_type, sps_seen = 0, pps_seen = 0, idr_seen = 0, *out;
     const uint8_t *buf, *buf_end, *r1;
 
-    if (!pkt || !pkt->data || pkt->size <= 0)
-        return ret;
     if (!par || !par->extradata || par->extradata_size <= 0)
         return ret;
 
-- 
2.39.3 (Apple Git-146)

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] avformat/whip: check the exchange sdp url is start with http

[Steven Liu]

Make sure the WHIP protocol performs the SDP offer/answer
exchange with the WebRTC peer over HTTP.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
---
 libavformat/whip.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavformat/whip.c b/libavformat/whip.c
index ce06a66bc4..b78ad27858 100644
--- a/libavformat/whip.c
+++ b/libavformat/whip.c
@@ -732,10 +732,18 @@ static int exchange_sdp(AVFormatContext *s)
     URLContext *whip_uc = NULL;
     AVDictionary *opts = NULL;
     char *hex_data = NULL;
+    const char *proto_name = avio_find_protocol_name(s->url);
 
     /* To prevent a crash during cleanup, always initialize it. */
     av_bprint_init(&bp, 1, MAX_SDP_SIZE);
 
+    if (!av_strstart(proto_name, "http", NULL)) {
+        av_log(whip, AV_LOG_ERROR, "WHIP: Protocol %s is not supported by RTC, choose http, url is %s\n",
+            proto_name, s->url);
+        ret = AVERROR(EINVAL);
+        goto end;
+    }
+
     if (!whip->sdp_offer || !strlen(whip->sdp_offer)) {
         av_log(whip, AV_LOG_ERROR, "WHIP: No offer to exchange\n");
         ret = AVERROR(EINVAL);
-- 
2.39.3 (Apple Git-146)

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 2/2] avformat/whip: check the exchange sdp url is start with http

[Jack Lau]

> On Jun 6, 2025, at 11:02, Steven Liu <lq@chinaffmpeg.org> wrote:
> 
> Make sure the WHIP protocol performs the SDP offer/answer
> exchange with the WebRTC peer over HTTP.
> 
> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
> ---
> libavformat/whip.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
> 
> diff --git a/libavformat/whip.c b/libavformat/whip.c
> index ce06a66bc4..b78ad27858 100644
> --- a/libavformat/whip.c
> +++ b/libavformat/whip.c
> @@ -732,10 +732,18 @@ static int exchange_sdp(AVFormatContext *s)
>     URLContext *whip_uc = NULL;
>     AVDictionary *opts = NULL;
>     char *hex_data = NULL;
> +    const char *proto_name = avio_find_protocol_name(s->url);
> 
>     /* To prevent a crash during cleanup, always initialize it. */
>     av_bprint_init(&bp, 1, MAX_SDP_SIZE);
> 
> +    if (!av_strstart(proto_name, "http", NULL)) {
> +        av_log(whip, AV_LOG_ERROR, "WHIP: Protocol %s is not supported by RTC, choose http, url is %s\n",
> +            proto_name, s->url);
> +        ret = AVERROR(EINVAL);
> +        goto end;
> +    }
> +
>     if (!whip->sdp_offer || !strlen(whip->sdp_offer)) {
>         av_log(whip, AV_LOG_ERROR, "WHIP: No offer to exchange\n");
>         ret = AVERROR(EINVAL);
> -- 
> 2.39.3 (Apple Git-146)
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe”.

patchset LGTM

Thanks
Jack



_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".