mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

stream: update for rate

Browse source
This commit is contained in:
Wim Taymans 2018-07-17 17:40:33 +02:00
parent 27d34dde88
commit ffde111099
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/stream.c
View file

@ -1367,18 +1367,19 @@ int pa_stream_get_time(pa_stream *s, pa_usec_t *r_usec)
pw_stream_get_time(s->stream, &t); pw_stream_get_time(s->stream, &t);
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
now = ts.tv_sec * SPA_NSEC_PER_SEC + ts.tv_nsec; now = SPA_TIMESPEC_TO_TIME(&ts);
delay = (now - t.now) / PA_NSEC_PER_USEC; delay = (now - t.now) / PA_NSEC_PER_USEC;
if (t.rate.denom != 0) if (t.rate.num != 0)
res = delay + ((t.ticks * t.rate.num * PA_USEC_PER_SEC) / t.rate.denom); res = delay + ((t.ticks * t.rate.denom * PA_USEC_PER_SEC) / t.rate.num);
else else
res = 0; res = 0;
if (r_usec) if (r_usec)
*r_usec = res; *r_usec = res;
pw_log_trace("stream %p: %ld %ld %ld %ld %d/%d %ld", s, now, t.now, delay, t.ticks, t.rate.num, t.rate.denom, res); pw_log_debug("stream %p: %ld %ld %ld %ld %d/%d %ld",
s, now, t.now, delay, t.ticks, t.rate.num, t.rate.denom, res);
return 0; return 0;
} }

2
src/volume.c
View file

@ -787,7 +787,7 @@ pa_cvolume* pa_cvolume_scale(pa_cvolume *v, pa_volume_t max) {
return v; return v;
} }
pa_cvolume* pa_cvolume_scale_mask(pa_cvolume *v, pa_volume_t max, pa_channel_map *cm, pa_channel_position_mask_t mask) { pa_cvolume* pa_cvolume_scale_mask(pa_cvolume *v, pa_volume_t max, const pa_channel_map *cm, pa_channel_position_mask_t mask) {
unsigned c; unsigned c;
pa_volume_t t = 0; pa_volume_t t = 0;