[FFmpeg-devel] [PATCH 1/2] avformat/rtsp: parse framerate in sdp

[FFmpeg-devel] [PATCH 1/2] avformat/rtsp: parse framerate in sdp

[Marvin Scholz]

From: Erik Linge <erikli@axis.com>

Co-authored-by: Marvin Scholz <epirat07@gmail.com>
---
 libavformat/rtsp.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 5ea471b40c..6807e1d6b5 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -618,6 +618,13 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
                 s1->seen_fmtp = 1;
                 av_strlcpy(s1->delayed_fmtp, buf, sizeof(s1->delayed_fmtp));
             }
+        } else if (av_strstart(p, "framerate:", &p) && s->nb_streams > 0) {
+            // RFC 8866
+            double framerate;
+            if (av_sscanf(p, "%lf%c", &framerate, &(char){}) == 1) {
+                st = s->streams[s->nb_streams - 1];
+                st->avg_frame_rate = av_d2q(framerate, INT_MAX);
+            }
         } else if (av_strstart(p, "ssrc:", &p) && s->nb_streams > 0) {
             rtsp_st = rt->rtsp_streams[rt->nb_rtsp_streams - 1];
             get_word(buf1, sizeof(buf1), &p);
-- 
2.39.5 (Apple Git-154)

_______________________________________________
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/rtpdec_jpeg: Set width and heigh codec parameters

[Marvin Scholz]

From: Erik Linge <erikli@axis.com>

---
 libavformat/rtpdec_jpeg.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c
index 81036247c1..4d9ee0d754 100644
--- a/libavformat/rtpdec_jpeg.c
+++ b/libavformat/rtpdec_jpeg.c
@@ -233,6 +233,8 @@ static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg,
     q      = AV_RB8(buf + 5);   /* quantization factor (or table id) */
     width  = AV_RB8(buf + 6);   /* frame width in 8 pixel blocks */
     height = AV_RB8(buf + 7);   /* frame height in 8 pixel blocks */
+    st->codecpar->width = width*8;
+    st->codecpar->height = height*8;
     buf += 8;
     len -= 8;
 
-- 
2.39.5 (Apple Git-154)

_______________________________________________
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 1/2] avformat/rtsp: parse framerate in sdp

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1784 bytes --]

On Fri, May 23, 2025 at 01:59:37AM +0200, Marvin Scholz wrote:
> From: Erik Linge <erikli@axis.com>
> 
> Co-authored-by: Marvin Scholz <epirat07@gmail.com>
> ---
>  libavformat/rtsp.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
> index 5ea471b40c..6807e1d6b5 100644
> --- a/libavformat/rtsp.c
> +++ b/libavformat/rtsp.c
> @@ -618,6 +618,13 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
>                  s1->seen_fmtp = 1;
>                  av_strlcpy(s1->delayed_fmtp, buf, sizeof(s1->delayed_fmtp));
>              }
> +        } else if (av_strstart(p, "framerate:", &p) && s->nb_streams > 0) {
> +            // RFC 8866
> +            double framerate;
> +            if (av_sscanf(p, "%lf%c", &framerate, &(char){}) == 1) {
> +                st = s->streams[s->nb_streams - 1];
> +                st->avg_frame_rate = av_d2q(framerate, INT_MAX);
> +            }

mingw64:

src/libavformat/rtsp.c: In function ‘sdp_parse_line’:
src/libavformat/rtsp.c:624:58: error: empty scalar initializer
  624 |             if (av_sscanf(p, "%lf%c", &framerate, &(char){}) == 1) {
      |                                                          ^
src/libavformat/rtsp.c:624:58: note: (near initialization for ‘(anonymous)’)
make: *** [src/ffbuild/common.mak:81: libavformat/rtsp.o] Error 1
make: *** Waiting for unfinished jobs....


thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If one takes all money from those who grow wealth and gives it to those who
do not grow wealth, 10 years later, almost the same people who where wealthy
will be wealthy again, the same people who where poor will be poor again.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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 1/2] avformat/rtsp: parse framerate in sdp

[Marvin Scholz]

On 23 May 2025, at 18:06, Michael Niedermayer wrote:

> On Fri, May 23, 2025 at 01:59:37AM +0200, Marvin Scholz wrote:
>> From: Erik Linge <erikli@axis.com>
>>
>> Co-authored-by: Marvin Scholz <epirat07@gmail.com>
>> ---
>>  libavformat/rtsp.c | 7 +++++++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
>> index 5ea471b40c..6807e1d6b5 100644
>> --- a/libavformat/rtsp.c
>> +++ b/libavformat/rtsp.c
>> @@ -618,6 +618,13 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
>>                  s1->seen_fmtp = 1;
>>                  av_strlcpy(s1->delayed_fmtp, buf, sizeof(s1->delayed_fmtp));
>>              }
>> +        } else if (av_strstart(p, "framerate:", &p) && s->nb_streams > 0) {
>> +            // RFC 8866
>> +            double framerate;
>> +            if (av_sscanf(p, "%lf%c", &framerate, &(char){}) == 1) {
>> +                st = s->streams[s->nb_streams - 1];
>> +                st->avg_frame_rate = av_d2q(framerate, INT_MAX);
>> +            }
>
> mingw64:
>
> src/libavformat/rtsp.c: In function ‘sdp_parse_line’:
> src/libavformat/rtsp.c:624:58: error: empty scalar initializer
>   624 |             if (av_sscanf(p, "%lf%c", &framerate, &(char){}) == 1) {
>       |                                                          ^
> src/libavformat/rtsp.c:624:58: note: (near initialization for ‘(anonymous)’)
> make: *** [src/ffbuild/common.mak:81: libavformat/rtsp.o] Error 1
> make: *** Waiting for unfinished jobs....
>
>
> thx

Thanks for testing, I sent a new version that should fix this.

>
> [...]
>
> -- 
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> If one takes all money from those who grow wealth and gives it to those who
> do not grow wealth, 10 years later, almost the same people who where wealthy
> will be wealthy again, the same people who where poor will be poor again.
> _______________________________________________
> 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 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".