[FFmpeg-devel] [PATCH] rtpdec: Fix RTP timestamp wraparound in Producer Reference Time

[Clément Péron]

On Fri, 6 Jun 2025 at 10:54, Clément Péron <peron.clem at gmail.com> wrote:
>
> The rtp_set_prft() function incorrectly calculates the timestamp delta
> when RTP timestamps wrap around the 32-bit boundary. The current code:
>
>     delta_timestamp = (int64_t)timestamp - (int64_t)s->last_rtcp_timestamp;
>
> treats both timestamps as large positive values, causing wraparound to
> produce a large negative delta instead of the correct small positive delta.
>
> For example, with a 90kHz video clock:
> - last_rtcp_timestamp = 0xFFFFFF00 (near wraparound)
> - timestamp = 0x00000100 (after wraparound)
> - Current result: delta ≈ -4.3 billion ticks ≈ -47,721 seconds
> - Expected result: delta ≈ +512 ticks ≈ +0.006 seconds
>
> This causes prft->wallclock to jump backward by approximately:
> - 90kHz video: ~47,721 seconds (~13.25 hours)
> - 48kHz audio: ~89,478 seconds (~24.9 hours)
> - 8kHz audio: ~536,871 seconds (~6.2 days)
>
> Fix by casting the subtraction result to int32_t, which correctly
> handles wraparound through modular arithmetic:
>
>     delta_timestamp = (int32_t)(timestamp - s->last_rtcp_timestamp);
>
> This ensures the delta is always in the range [-2^31, 2^31-1], making
> wraparound produce the correct small positive values.
>
> Fixes timing jumps in applications that rely on Producer Reference Time
> for media synchronization.

Sorry for missing my sign-off :(

Signed-off-by: Clément Péron <peron.clem at gmail.com>

> ---
>  libavformat/rtpdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
> index 729bf83685..7a658ad698 100644
> --- a/libavformat/rtpdec.c
> +++ b/libavformat/rtpdec.c
> @@ -642,7 +642,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;
> -    delta_timestamp = (int64_t)timestamp - (int64_t)s->last_rtcp_timestamp;
> +    delta_timestamp = (int32_t)(timestamp - s->last_rtcp_timestamp);
>      delta_time = av_rescale_q(delta_timestamp, s->st->time_base, AV_TIME_BASE_Q);
>
>      prft->wallclock = rtcp_time + delta_time;
> --
> 2.48.1
>