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

pulse-server: tweak minreq and fragsize

Browse source 
Use time instead of samples to calculate the min
This commit is contained in:
Wim Taymans 2020-10-14 15:44:52 +02:00
parent 2ddcb7b002
commit c92ce17a9f
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/modules/module-protocol-pulse/defs.h
View file

@ -43,6 +43,7 @@
#define MAX_BUFFERS 64u #define MAX_BUFFERS 64u
#define MIN_SAMPLES 24u #define MIN_SAMPLES 24u
#define MIN_USEC (MIN_SAMPLES * SPA_USEC_PER_SEC / 48000u)
#define MAXLENGTH (4*1024*1024) /* 4MB */ #define MAXLENGTH (4*1024*1024) /* 4MB */
#define DEFAULT_TLENGTH_MSEC 2000 /* 2s */ #define DEFAULT_TLENGTH_MSEC 2000 /* 2s */

17
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -747,7 +747,7 @@ static const struct spa_pod *get_buffers_param(struct stream *s,
size = attr->minreq; size = attr->minreq;
} else { } else {
size = attr->fragsize; size = attr->fragsize;
maxsize = attr->fragsize; maxsize = attr->fragsize * MAX_BUFFERS;
} }
buffers = SPA_CLAMP(maxsize / size, MIN_BUFFERS, MAX_BUFFERS); buffers = SPA_CLAMP(maxsize / size, MIN_BUFFERS, MAX_BUFFERS);
@ -947,7 +947,7 @@ static uint32_t usec_to_bytes_round_up(uint64_t usec, const struct sample_spec *
static void fix_playback_buffer_attr(struct stream *s, struct buffer_attr *attr) static void fix_playback_buffer_attr(struct stream *s, struct buffer_attr *attr)
{ {
uint32_t frame_size, max_prebuf; uint32_t frame_size, max_prebuf, minreq;
frame_size = s->frame_size; frame_size = s->frame_size;
@ -971,7 +971,8 @@ static void fix_playback_buffer_attr(struct stream *s, struct buffer_attr *attr)
m -= m % frame_size; m -= m % frame_size;
attr->minreq = SPA_MIN(process, m); attr->minreq = SPA_MIN(process, m);
} }
attr->minreq = SPA_MAX(attr->minreq, MIN_SAMPLES * frame_size); minreq = usec_to_bytes_round_up(MIN_USEC, &s->ss);
attr->minreq = SPA_MAX(attr->minreq, minreq);
if (attr->tlength < attr->minreq+frame_size) if (attr->tlength < attr->minreq+frame_size)
attr->tlength = attr->minreq + frame_size; attr->tlength = attr->minreq + frame_size;
@ -1231,7 +1232,7 @@ error:
static void fix_record_buffer_attr(struct stream *s, struct buffer_attr *attr) static void fix_record_buffer_attr(struct stream *s, struct buffer_attr *attr)
{ {
uint32_t frame_size; uint32_t frame_size, minfrag;
frame_size = s->frame_size; frame_size = s->frame_size;
@ -1240,17 +1241,19 @@ static void fix_record_buffer_attr(struct stream *s, struct buffer_attr *attr)
attr->maxlength -= attr->maxlength % frame_size; attr->maxlength -= attr->maxlength % frame_size;
attr->maxlength = SPA_MAX(attr->maxlength, frame_size); attr->maxlength = SPA_MAX(attr->maxlength, frame_size);
minfrag = usec_to_bytes_round_up(MIN_USEC, &s->ss);
if (attr->fragsize == (uint32_t) -1 || attr->fragsize == 0) if (attr->fragsize == (uint32_t) -1 || attr->fragsize == 0)
attr->fragsize = usec_to_bytes_round_up(DEFAULT_FRAGSIZE_MSEC*1000, &s->ss); attr->fragsize = usec_to_bytes_round_up(DEFAULT_FRAGSIZE_MSEC*1000, &s->ss);
attr->fragsize -= attr->fragsize % frame_size; attr->fragsize -= attr->fragsize % frame_size;
attr->fragsize = SPA_MAX(attr->fragsize, minfrag);
attr->fragsize = SPA_MAX(attr->fragsize, frame_size); attr->fragsize = SPA_MAX(attr->fragsize, frame_size);
attr->fragsize = SPA_MAX(attr->fragsize, MIN_SAMPLES * frame_size);
if (attr->fragsize > attr->maxlength) if (attr->fragsize > attr->maxlength)
attr->fragsize = attr->maxlength; attr->fragsize = attr->maxlength;
pw_log_info(NAME" %p: maxlength:%u fragsize:%u", s, pw_log_info(NAME" %p: maxlength:%u fragsize:%u minfrag:%u", s,
attr->maxlength, attr->fragsize); attr->maxlength, attr->fragsize, minfrag);
} }
static int do_create_record_stream(struct client *client, uint32_t command, uint32_t tag, struct message *m) static int do_create_record_stream(struct client *client, uint32_t command, uint32_t tag, struct message *m)