mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-20 00:31:13 +00:00
jitterbuffer: handle -1 input timestamps
Don't try to check a -1 timestamp against the max delay.
This commit is contained in:
parent
458cd4dcdc
commit
c262735164
1 changed files with 4 additions and 5 deletions
|
@ -215,11 +215,10 @@ calculate_skew (RTPJitterBuffer * jbuf, guint32 rtptime, GstClockTime time,
|
||||||
if (jbuf->clock_rate != clock_rate) {
|
if (jbuf->clock_rate != clock_rate) {
|
||||||
if (jbuf->clock_rate == -1) {
|
if (jbuf->clock_rate == -1) {
|
||||||
GST_DEBUG ("Clock rate changed from %" G_GUINT32_FORMAT " to %"
|
GST_DEBUG ("Clock rate changed from %" G_GUINT32_FORMAT " to %"
|
||||||
G_GUINT32_FORMAT, jbuf->clock_rate, clock_rate);
|
G_GUINT32_FORMAT, jbuf->clock_rate, clock_rate);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
GST_WARNING ("Clock rate changed from %" G_GUINT32_FORMAT " to %"
|
GST_WARNING ("Clock rate changed from %" G_GUINT32_FORMAT " to %"
|
||||||
G_GUINT32_FORMAT, jbuf->clock_rate, clock_rate);
|
G_GUINT32_FORMAT, jbuf->clock_rate, clock_rate);
|
||||||
}
|
}
|
||||||
jbuf->base_time = -1;
|
jbuf->base_time = -1;
|
||||||
jbuf->base_rtptime = -1;
|
jbuf->base_rtptime = -1;
|
||||||
|
@ -393,7 +392,7 @@ no_skew:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (out_time + max_delay < time) {
|
if (time != -1 && out_time + max_delay < time) {
|
||||||
/* if we are going to produce a timestamp that is later than the input
|
/* if we are going to produce a timestamp that is later than the input
|
||||||
* timestamp, we need to reset the jitterbuffer. Likely the server paused
|
* timestamp, we need to reset the jitterbuffer. Likely the server paused
|
||||||
* temporarily */
|
* temporarily */
|
||||||
|
|
Loading…
Reference in a new issue