AudioDriverPulseAudio: move Vector Cow access outside tight loop.

Replaced some in-loop uses of Vector.write with an out of loop ptrw,
to avoid a lot of superfluous reads on the CowData ref count.

(cherry picked from commit 47496a55bc)
This commit is contained in:
Ibrahn Sahir 2021-10-29 22:37:49 +01:00 committed by Rémi Verschelde
parent 1919b17e6e
commit 509f3c75a2
No known key found for this signature in database
GPG key ID: C3336907360768E1

View file

@ -381,16 +381,18 @@ void AudioDriverPulseAudio::thread_func(void *p_udata) {
ad->lock(); ad->lock();
ad->start_counting_ticks(); ad->start_counting_ticks();
int16_t *out_ptr = ad->samples_out.ptrw();
if (!ad->active) { if (!ad->active) {
for (unsigned int i = 0; i < ad->pa_buffer_size; i++) { for (unsigned int i = 0; i < ad->pa_buffer_size; i++) {
ad->samples_out.write[i] = 0; out_ptr[i] = 0;
} }
} else { } else {
ad->audio_server_process(ad->buffer_frames, ad->samples_in.ptrw()); ad->audio_server_process(ad->buffer_frames, ad->samples_in.ptrw());
if (ad->channels == ad->pa_map.channels) { if (ad->channels == ad->pa_map.channels) {
for (unsigned int i = 0; i < ad->pa_buffer_size; i++) { for (unsigned int i = 0; i < ad->pa_buffer_size; i++) {
ad->samples_out.write[i] = ad->samples_in[i] >> 16; out_ptr[i] = ad->samples_in[i] >> 16;
} }
} else { } else {
// Uneven amount of channels // Uneven amount of channels
@ -399,11 +401,11 @@ void AudioDriverPulseAudio::thread_func(void *p_udata) {
for (unsigned int i = 0; i < ad->buffer_frames; i++) { for (unsigned int i = 0; i < ad->buffer_frames; i++) {
for (int j = 0; j < ad->pa_map.channels - 1; j++) { for (int j = 0; j < ad->pa_map.channels - 1; j++) {
ad->samples_out.write[out_idx++] = ad->samples_in[in_idx++] >> 16; out_ptr[out_idx++] = ad->samples_in[in_idx++] >> 16;
} }
uint32_t l = ad->samples_in[in_idx++] >> 16; uint32_t l = ad->samples_in[in_idx++] >> 16;
uint32_t r = ad->samples_in[in_idx++] >> 16; uint32_t r = ad->samples_in[in_idx++] >> 16;
ad->samples_out.write[out_idx++] = (l + r) / 2; out_ptr[out_idx++] = (l + r) / 2;
} }
} }
} }