mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-rtp: fix ptime and target_buffer checks

Browse source 
target_buffer is in samples and ptime in msec so we can't really compare
them. Use psamples instead, which is ptime but then as samples.

See #4095
This commit is contained in:
Wim Taymans 2024-07-19 13:17:51 +02:00
parent 9a313a5d42
commit 8a62563d5b
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/module-rtp/stream.c
View file

@ -452,7 +452,7 @@ struct rtp_stream *rtp_stream_new(struct pw_core *core,
min_samples = msec_to_samples(impl, min_ptime);
max_samples = msec_to_samples(impl, max_ptime);
float ptime = 0;
float ptime = 0.0f;
if ((str = pw_properties_get(props, "rtp.ptime")) != NULL)
if (!spa_atof(str, &ptime))
ptime = 0.0f;
@ -502,14 +502,16 @@ struct rtp_stream *rtp_stream_new(struct pw_core *core,
impl->target_buffer = msec_to_samples(impl, latency_msec);
impl->max_error = msec_to_samples(impl, ERROR_MSEC);
if (impl->target_buffer < ptime) {
pw_log_warn("sess.latency.msec cannot be lower than rtp.ptime");
if (impl->target_buffer < impl->psamples) {
pw_log_warn("sess.latency.msec %f cannot be lower than rtp.ptime %f",
latency_msec, ptime);
impl->target_buffer = impl->psamples;
}
/* We're not expecting odd ptimes, so this modulo should be 0 */
if (fmodf(impl->target_buffer, ptime) != 0) {
pw_log_warn("sess.latency.msec should be an integer multiple of rtp.ptime");
if (fmodf(impl->target_buffer, impl->psamples) != 0) {
pw_log_warn("sess.latency.msec %f should be an integer multiple of rtp.ptime %f",
latency_msec, ptime);
impl->target_buffer = (uint32_t)((impl->target_buffer / ptime) * impl->psamples);
}