mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-equalizer-sink: reverted buffering logic back to how the ladspa sink did it

Browse source
This commit is contained in:
Jason Newton 2009-08-08 00:53:40 -07:00
parent 857eea0621
commit 4231ac444f
1 changed files with 75 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

178
src/modules/module-equalizer-sink.c
View file

@ -113,7 +113,7 @@ struct userdata {
float *Hs[2];//thread updatable copies float *Hs[2];//thread updatable copies
pa_aupdate *a_H; pa_aupdate *a_H;
pa_memchunk conv_buffer; pa_memchunk conv_buffer;
pa_memblockq *rendered_q; pa_memblockq *input_q;
pa_dbus_protocol *dbus_protocol; pa_dbus_protocol *dbus_protocol;
char *dbus_path; char *dbus_path;
@ -138,7 +138,7 @@ void fix_filter(float *H, size_t fft_size);
void interpolate(float *signal, size_t length, uint32_t *xs, float *ys, size_t n_points); void interpolate(float *signal, size_t length, uint32_t *xs, float *ys, size_t n_points);
static void array_out(const char *name, float *a, size_t length); static void array_out(const char *name, float *a, size_t length);
static int is_monotonic(uint32_t *xs, size_t length); static int is_monotonic(uint32_t *xs, size_t length);
static void process_samples(struct userdata *u); static void process_samples(struct userdata *u, pa_memchunk *tchunk);
static void input_buffer(struct userdata *u, pa_memchunk *in); static void input_buffer(struct userdata *u, pa_memchunk *in);
static void save_profile(struct userdata *u,char *name); static void save_profile(struct userdata *u,char *name);
static void save_state(struct userdata *u); static void save_state(struct userdata *u);
@ -273,9 +273,9 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
if (PA_MSGOBJECT(u->master)->process_msg(PA_MSGOBJECT(u->master), PA_SINK_MESSAGE_GET_LATENCY, &usec, 0, NULL) < 0) if (PA_MSGOBJECT(u->master)->process_msg(PA_MSGOBJECT(u->master), PA_SINK_MESSAGE_GET_LATENCY, &usec, 0, NULL) < 0)
usec = 0; usec = 0;
//usec+=pa_bytes_to_usec(u->latency * fs, ss); //usec += pa_bytes_to_usec(u->latency * fs, ss);
//usec+=pa_bytes_to_usec(u->samples_gathered * fs, ss); //usec += pa_bytes_to_usec(u->samples_gathered * fs, ss);
usec += pa_bytes_to_usec(pa_memblockq_get_length(u->rendered_q), ss); usec += pa_bytes_to_usec(pa_memblockq_get_length(u->input_q), ss);
/* Add the latency internal to our sink input on top */ /* Add the latency internal to our sink input on top */
usec += pa_bytes_to_usec(pa_memblockq_get_length(u->sink_input->thread_info.render_memblockq), &u->master->sample_spec); usec += pa_bytes_to_usec(pa_memblockq_get_length(u->sink_input->thread_info.render_memblockq), &u->master->sample_spec);
*((pa_usec_t*) data) = usec; *((pa_usec_t*) data) = usec;
@ -310,8 +310,10 @@ static void sink_request_rewind(pa_sink *s) {
pa_sink_assert_ref(s); pa_sink_assert_ref(s);
pa_assert_se(u = s->userdata); pa_assert_se(u = s->userdata);
//pa_memblockq_drop(u->input_q,pa_memblockq_get_length(u->input_q));
/* Just hand this one over to the master sink */ /* Just hand this one over to the master sink */
pa_sink_input_request_rewind(u->sink_input, s->thread_info.rewind_nbytes + pa_memblockq_get_length(u->rendered_q), TRUE, FALSE, FALSE); pa_sink_input_request_rewind(u->sink_input, s->thread_info.rewind_nbytes+pa_memblockq_get_length(u->input_q), TRUE, FALSE, FALSE);
} }
/* Called from I/O thread context */ /* Called from I/O thread context */
@ -327,34 +329,28 @@ static void sink_update_requested_latency(pa_sink *s) {
pa_sink_get_requested_latency_within_thread(s)); pa_sink_get_requested_latency_within_thread(s));
} }
static void process_samples(struct userdata *u){ static void process_samples(struct userdata *u, pa_memchunk *tchunk){
pa_memchunk tchunk;
size_t fs=pa_frame_size(&(u->sink->sample_spec)); size_t fs=pa_frame_size(&(u->sink->sample_spec));
while(u->samples_gathered >= u->R){ pa_assert(u->samples_gathered >= u->R);
float *dst; float *dst;
//pa_log("iter gathered: %ld", u->samples_gathered); tchunk->index=0;
//pa_memblockq_drop(u->rendered_q, tchunk.length); tchunk->length=u->R*fs;
tchunk.index=0; tchunk->memblock=pa_memblock_new(u->core->mempool, tchunk->length);
tchunk.length=u->R*fs; dst=((float*)pa_memblock_acquire(tchunk->memblock));
tchunk.memblock=pa_memblock_new(u->core->mempool, tchunk.length); for(size_t c=0;c < u->channels; c++) {
dst=((float*)pa_memblock_acquire(tchunk.memblock)); dsp_logic(
for(size_t c=0;c < u->channels; c++) { u->work_buffer,
dsp_logic( u->input[c],
u->work_buffer, u->overlap_accum[c],
u->input[c], u->H,
u->overlap_accum[c], u->W,
u->H, u->output_window,
u->W, u
u->output_window, );
u pa_sample_clamp(PA_SAMPLE_FLOAT32NE, dst + c, fs, u->work_buffer, sizeof(float), u->R);
);
pa_sample_clamp(PA_SAMPLE_FLOAT32NE, dst + c, fs, u->work_buffer, sizeof(float), u->R);
}
pa_memblock_release(tchunk.memblock);
pa_memblockq_push(u->rendered_q, &tchunk);
pa_memblock_unref(tchunk.memblock);
u->samples_gathered-=u->R;
} }
pa_memblock_release(tchunk->memblock);
u->samples_gathered-=u->R;
} }
typedef float v4sf __attribute__ ((__aligned__(v_size*sizeof(float)))); typedef float v4sf __attribute__ ((__aligned__(v_size*sizeof(float))));
@ -539,85 +535,59 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
struct userdata *u; struct userdata *u;
pa_sink_input_assert_ref(i); pa_sink_input_assert_ref(i);
pa_assert(chunk); pa_assert(chunk);
pa_assert_se(u = i->userdata); pa_assert(u = i->userdata);
pa_assert_se(u->sink); pa_assert(u->sink);
size_t fs = pa_frame_size(&(u->sink->sample_spec)); size_t fs = pa_frame_size(&(u->sink->sample_spec));
//size_t samples_requested = nbytes/fs;
size_t buffered_samples = pa_memblockq_get_length(u->rendered_q)/fs;
pa_memchunk tchunk; pa_memchunk tchunk;
chunk->memblock = NULL; chunk->memblock = NULL;
if (!u->sink || !PA_SINK_IS_OPENED(u->sink->thread_info.state)) if (!u->sink || !PA_SINK_IS_OPENED(u->sink->thread_info.state))
return -1; return -1;
/* Hmm, process any reweind request that might be queued up */ /* Hmm, process any rewind request that might be queued up */
pa_sink_process_rewind(u->sink, 0); pa_sink_process_rewind(u->sink, 0);
//pa_log("start output-buffered %ld, input-buffered %ld, requested %ld",buffered_samples,u->samples_gathered,samples_requested); //pa_log("start output-buffered %ld, input-buffered %ld, requested %ld",buffered_samples,u->samples_gathered,samples_requested);
struct timespec start, end; struct timespec start, end;
if(pa_memblockq_peek(u->rendered_q, &tchunk)==0){
*chunk = tchunk;
pa_memblockq_drop(u->rendered_q, chunk->length);
return 0;
}
/*
* Set the H filter
*/
unsigned H_i = pa_aupdate_read_begin(u->a_H);
u->H = u->Hs[H_i];
do{ do{
pa_memchunk *buffer;
size_t input_remaining = u->target_samples-u->samples_gathered; size_t input_remaining = u->target_samples-u->samples_gathered;
pa_assert(input_remaining>0); pa_assert(input_remaining>0);
//collect samples //collect samples
buffer = &u->conv_buffer; //buffer = &u->conv_buffer;
buffer->length = input_remaining*fs; //buffer->length = input_remaining*fs;
buffer->index = 0; //buffer->index = 0;
pa_memblock_ref(buffer->memblock); //pa_memblock_ref(buffer->memblock);
pa_sink_render_into(u->sink, buffer); //pa_sink_render_into(u->sink, buffer);
while(pa_memblockq_peek(u->input_q, &tchunk) < 0){
//if(u->sink->thread_info.rewind_requested) pa_sink_render(u->sink, input_remaining*fs, &tchunk);
// sink_request_rewind(u->sink); pa_memblockq_push(u->input_q, &tchunk);
pa_memblock_unref(tchunk.memblock);
//pa_memchunk p; }
//buffer = &p; tchunk.length = PA_MIN(input_remaining*fs, tchunk.length);
//pa_sink_render(u->sink, u->R*fs, buffer); pa_memblockq_drop(u->input_q,tchunk.length);
//buffer->length = PA_MIN(input_remaining*fs, buffer->length);
//debug block
//pa_memblockq_push(u->rendered_q, buffer);
//pa_memblock_unref(buffer->memblock);
//goto END;
//pa_log("asked for %ld input samples, got %ld samples",input_remaining,buffer->length/fs); //pa_log("asked for %ld input samples, got %ld samples",input_remaining,buffer->length/fs);
//copy new input /* copy new input */
gettime(start); gettime(start);
input_buffer(u, buffer); input_buffer(u, &tchunk);
gettime(end); gettime(end);
//pa_log("Took %0.5f seconds to setup", tdiff(end, start)*1e-9); //pa_log("Took %0.5f seconds to setup", tdiff(end, start)*1e-9);
pa_memblock_unref(tchunk.memblock);
}while(u->samples_gathered < u->R);
pa_memblock_unref(buffer->memblock); pa_assert(u->fft_size >= u->window_size);
pa_assert(u->R < u->window_size);
/* set the H filter */
unsigned H_i = pa_aupdate_read_begin(u->a_H);
u->H = u->Hs[H_i];
gettime(start);
/* process a block */
process_samples(u,chunk);
gettime(end);
//pa_log("Took %0.5f seconds to process", tdiff(end, start)*1e-9);
pa_aupdate_read_end(u->a_H);
pa_assert_se(u->fft_size >= u->window_size); pa_assert(chunk->memblock);
pa_assert_se(u->R < u->window_size);
//process every complete block on hand
gettime(start);
process_samples(u);
gettime(end);
//pa_log("Took %0.5f seconds to process", tdiff(end, start)*1e-9);
buffered_samples = pa_memblockq_get_length(u->rendered_q)/fs;
}while(buffered_samples < u->R);
//deque from rendered_q and output
pa_assert_se(pa_memblockq_peek(u->rendered_q, &tchunk)==0);
*chunk = tchunk;
pa_memblockq_drop(u->rendered_q, chunk->length);
pa_assert_se(chunk->memblock);
//pa_log("gave %ld", chunk->length/fs); //pa_log("gave %ld", chunk->length/fs);
//pa_log("end pop"); //pa_log("end pop");
return 0; return 0;
@ -638,20 +608,25 @@ static void sink_input_process_rewind_cb(pa_sink_input *i, size_t nbytes) {
if (u->sink->thread_info.rewind_nbytes > 0) { if (u->sink->thread_info.rewind_nbytes > 0) {
size_t max_rewrite; size_t max_rewrite;
max_rewrite = nbytes + pa_memblockq_get_length(u->rendered_q); //max_rewrite = nbytes;
max_rewrite = nbytes + pa_memblockq_get_length(u->input_q);
//PA_MIN(pa_memblockq_get_length(u->input_q), nbytes);
amount = PA_MIN(u->sink->thread_info.rewind_nbytes, max_rewrite); amount = PA_MIN(u->sink->thread_info.rewind_nbytes, max_rewrite);
u->sink->thread_info.rewind_nbytes = 0; u->sink->thread_info.rewind_nbytes = 0;
if (amount > 0) { if (amount > 0) {
//pa_sample_spec *ss = &u->sink->sample_spec; //pa_sample_spec *ss = &u->sink->sample_spec;
//pa_memblockq_seek(u->rendered_q, - (int64_t) amount, PA_SEEK_RELATIVE, TRUE); //invalidate the output q
pa_memblockq_seek(u->input_q, - (int64_t) amount, PA_SEEK_RELATIVE, TRUE);
//pa_memblockq_drop(u->input_q, pa_memblockq_get_length(u->input_q));
//pa_memblockq_seek(u->input_q, - (int64_t) amount, PA_SEEK_RELATIVE, TRUE);
pa_log_debug("Resetting equalizer"); pa_log_debug("Resetting equalizer");
u->samples_gathered = 0; u->samples_gathered = 0;
} }
} }
pa_sink_process_rewind(u->sink, amount); pa_sink_process_rewind(u->sink, amount);
//pa_memblockq_rewind(u->rendered_q, nbytes); pa_memblockq_rewind(u->input_q, nbytes);
} }
/* Called from I/O thread context */ /* Called from I/O thread context */
@ -664,7 +639,7 @@ static void sink_input_update_max_rewind_cb(pa_sink_input *i, size_t nbytes) {
if (!u->sink || !PA_SINK_IS_LINKED(u->sink->thread_info.state)) if (!u->sink || !PA_SINK_IS_LINKED(u->sink->thread_info.state))
return; return;
pa_memblockq_set_maxrewind(u->rendered_q, nbytes); pa_memblockq_set_maxrewind(u->input_q, nbytes);
pa_sink_set_max_rewind_within_thread(u->sink, nbytes); pa_sink_set_max_rewind_within_thread(u->sink, nbytes);
} }
@ -694,7 +669,6 @@ static void sink_input_update_sink_latency_range_cb(pa_sink_input *i) {
if (!u->sink || !PA_SINK_IS_LINKED(u->sink->thread_info.state)) if (!u->sink || !PA_SINK_IS_LINKED(u->sink->thread_info.state))
return; return;
size_t fs = pa_frame_size(&(u->sink->sample_spec));
//pa_sink_set_latency_range_within_thread(u->sink, u->master->thread_info.min_latency, u->latency*fs); //pa_sink_set_latency_range_within_thread(u->sink, u->master->thread_info.min_latency, u->latency*fs);
//pa_sink_set_latency_range_within_thread(u->sink, u->latency*fs, u->latency*fs ); //pa_sink_set_latency_range_within_thread(u->sink, u->latency*fs, u->latency*fs );
pa_sink_set_latency_range_within_thread(u->sink, i->sink->thread_info.min_latency, i->sink->thread_info.max_latency); pa_sink_set_latency_range_within_thread(u->sink, i->sink->thread_info.min_latency, i->sink->thread_info.max_latency);
@ -729,14 +703,14 @@ static void sink_input_attach_cb(pa_sink_input *i) {
pa_sink_set_rtpoll(u->sink, i->sink->rtpoll); pa_sink_set_rtpoll(u->sink, i->sink->rtpoll);
pa_sink_attach_within_thread(u->sink); pa_sink_attach_within_thread(u->sink);
size_t fs = pa_frame_size(&(u->sink->sample_spec)); //size_t fs = pa_frame_size(&(u->sink->sample_spec));
//pa_sink_set_latency_range_within_thread(u->sink, u->latency*fs, u->latency*fs); //pa_sink_set_latency_range_within_thread(u->sink, u->latency*fs, u->latency*fs);
//pa_sink_set_latency_range_within_thread(u->sink, u->latency*fs, u->master->thread_info.max_latency); //pa_sink_set_latency_range_within_thread(u->sink, u->latency*fs, u->master->thread_info.max_latency);
//TODO: setting this guy minimizes drop outs but doesn't get rid //TODO: setting this guy minimizes drop outs but doesn't get rid
//of them completely, figure out why //of them completely, figure out why
pa_sink_set_latency_range_within_thread(u->sink, u->master->thread_info.min_latency, u->latency*fs); //pa_sink_set_latency_range_within_thread(u->sink, u->master->thread_info.min_latency, u->latency*fs);
//TODO: this guy causes dropouts constantly+rewinds, it's unusable //TODO: this guy causes dropouts constantly+rewinds, it's unusable
//pa_sink_set_latency_range_within_thread(u->sink, u->master->thread_info.min_latency, u->master->thread_info.max_latency); pa_sink_set_latency_range_within_thread(u->sink, u->master->thread_info.min_latency, u->master->thread_info.max_latency);
} }
/* Called from main context */ /* Called from main context */
@ -906,7 +880,7 @@ int pa__init(pa_module*m) {
u->target_samples = 1*u->R; u->target_samples = 1*u->R;
u->samples_gathered = 0; u->samples_gathered = 0;
u->max_output = pa_frame_align(pa_mempool_block_size_max(m->core->mempool), &ss)/pa_frame_size(&ss); u->max_output = pa_frame_align(pa_mempool_block_size_max(m->core->mempool), &ss)/pa_frame_size(&ss);
u->rendered_q = pa_memblockq_new(0, MEMBLOCKQ_MAXLENGTH, u->target_samples*fs, fs, fs, 0, 0, NULL); u->input_q = pa_memblockq_new(0, MEMBLOCKQ_MAXLENGTH, 0, fs, 1, 1, 0, NULL);
u->a_H = pa_aupdate_new(); u->a_H = pa_aupdate_new();
u->conv_buffer.memblock = pa_memblock_new(u->core->mempool, u->target_samples*fs); u->conv_buffer.memblock = pa_memblock_new(u->core->mempool, u->target_samples*fs);
u->latency = u->R; u->latency = u->R;
@ -1062,11 +1036,9 @@ void pa__done(pa_module*m) {
pa_sink_input_unref(u->sink_input); pa_sink_input_unref(u->sink_input);
} }
if(u->conv_buffer.memblock) pa_aupdate_free(u->a_H);
pa_memblock_unref(u->conv_buffer.memblock); pa_memblock_unref(u->conv_buffer.memblock);
pa_memblockq_free(u->input_q);
if (u->rendered_q)
pa_memblockq_free(u->rendered_q);
fftwf_destroy_plan(u->inverse_plan); fftwf_destroy_plan(u->inverse_plan);
fftwf_destroy_plan(u->forward_plan); fftwf_destroy_plan(u->forward_plan);