ffmpeg | branch: master | Clément Péron <peron.c...@gmail.com> | Sun Jun 8 17:07:37 2025 +0200| [52441bd4cd0e85bf007473bd2eada2b2083aacf5] | committer: Michael Niedermayer
avformat/rtpdec: explicit timestamp wraparound handling Change delta_timestamp to int32_t and add explicit cast to handle RTP timestamp wraparound correctly. This fixes implementation-defined behavior when computing negative timestamp differences due to 32-bit wraparound. Signed-off-by: Clément Péron <peron.c...@gmail.com> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52441bd4cd0e85bf007473bd2eada2b2083aacf5 --- libavformat/rtpdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 2e2cbf5477..d54ac31eb0 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -597,6 +597,7 @@ static int rtp_set_prft(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestamp) { return AVERROR(ENOMEM); rtcp_time = ff_parse_ntp_time(s->last_rtcp_ntp_time) - NTP_OFFSET_US; + /* Cast to int32_t to handle timestamp wraparound correctly */ delta_timestamp = (int32_t)(timestamp - s->last_rtcp_timestamp); delta_time = av_rescale_q(delta_timestamp, s->st->time_base, AV_TIME_BASE_Q); @@ -624,10 +625,11 @@ static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestam if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE && s->ic->nb_streams > 1) { int64_t addend; - int delta_timestamp; + int32_t delta_timestamp; /* compute pts from timestamp with received ntp_time */ - delta_timestamp = timestamp - s->last_rtcp_timestamp; + /* Cast to int32_t to handle timestamp wraparound correctly */ + delta_timestamp = (int32_t)(timestamp - s->last_rtcp_timestamp); /* convert to the PTS timebase */ addend = av_rescale(s->last_rtcp_ntp_time - s->first_rtcp_ntp_time, s->st->time_base.den, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
