devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Rename all the "lin_resample..." stuff to simply "resample_...".

Browse source 
Change-Id: I79f44f0dcc1b23b33a5040795220713660a1d18a
This commit is contained in:
Michael Sevakis 2013-05-07 00:35:46 -04:00
parent 5c3e190e8a
commit fce81a8a74
4 changed files with 42 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/rbcodec/SOURCES
View file

@ -12,7 +12,7 @@ dsp/dsp_misc.c
dsp/dsp_sample_input.c dsp/dsp_sample_input.c
dsp/dsp_sample_output.c dsp/dsp_sample_output.c
dsp/eq.c dsp/eq.c
dsp/lin_resample.c dsp/resample.c
dsp/pga.c dsp/pga.c
# ifdef HAVE_PITCHCONTROL # ifdef HAVE_PITCHCONTROL
dsp/tdspeed.c dsp/tdspeed.c

11
lib/rbcodec/dsp/dsp_arm.S
View file

@ -291,13 +291,12 @@ crossfeed_meier_process:
/**************************************************************************** /****************************************************************************
* int lin_resample_resample(struct resample_data *data, * int resample_linear(struct resample_data *data, struct dsp_buffer *src,
* struct dsp_buffer *src, * struct dsp_buffer *dst)
* struct dsp_buffer *dst)
*/ */
.section .text, "ax",%progbits .section .text, "ax",%progbits
.global lin_resample_resample .global resample_linear
lin_resample_resample: resample_linear:
@input: r0 = data, r1 = src, r2 = dst @input: r0 = data, r1 = src, r2 = dst
stmfd sp!, { r4-r11, lr } @ stack modified regs stmfd sp!, { r4-r11, lr } @ stack modified regs
ldr r4, [r0] @ r4 = data->delta ldr r4, [r0] @ r4 = data->delta
@ -397,7 +396,7 @@ lin_resample_resample:
str r6, [r2] @ dst->remcount = dstcount str r6, [r2] @ dst->remcount = dstcount
add sp, sp, #8 @ adjust stack for temp variables add sp, sp, #8 @ adjust stack for temp variables
ldmpc regs=r4-r11 @ ... and we're out ldmpc regs=r4-r11 @ ... and we're out
.size lin_resample_resample, .-lin_resample_resample .size resample_linear, .-resample_linear
/**************************************************************************** /****************************************************************************
* void pga_process(struct dsp_proc_entry *this, struct dsp_buffer **buf_p) * void pga_process(struct dsp_proc_entry *this, struct dsp_buffer **buf_p)

11
lib/rbcodec/dsp/dsp_cf.S
View file

@ -179,14 +179,13 @@ crossfeed_meier_process:
.size crossfeed_meier_process, .-crossfeed_meier_process .size crossfeed_meier_process, .-crossfeed_meier_process
/**************************************************************************** /****************************************************************************
* int lin_resample_resample(struct resample_data *data, * int resample_linear(struct resample_data *data, struct dsp_buffer *src,
* struct dsp_buffer *src, * struct dsp_buffer *dst)
* struct dsp_buffer *dst)
*/ */
.section .text .section .text
.align 2 .align 2
.global lin_resample_resample .global resample_linear
lin_resample_resample: resample_linear:
| input: 4(sp) = data, 8(sp) = src, 12(sp) = dst | input: 4(sp) = data, 8(sp) = src, 12(sp) = dst
lea.l -44(%sp), %sp | save non-volatiles lea.l -44(%sp), %sp | save non-volatiles
movem.l %d2-%d7/%a2-%a6, (%sp) | movem.l %d2-%d7/%a2-%a6, (%sp) |
@ -317,7 +316,7 @@ lin_resample_resample:
lea.l 44(%sp), %sp | cleanup stack lea.l 44(%sp), %sp | cleanup stack
rts | buh-bye rts | buh-bye
.size lin_resample_resample, .-lin_resample_resample .size resample_linear, .-resample_linear
/**************************************************************************** /****************************************************************************

63
lib/rbcodec/dsp/lin_resample.c → lib/rbcodec/dsp/resample.c
View file

@ -56,25 +56,25 @@ static struct resample_data
} resample_data[DSP_COUNT] IBSS_ATTR; } resample_data[DSP_COUNT] IBSS_ATTR;
/* Actual worker function. Implemented here or in target assembly code. */ /* Actual worker function. Implemented here or in target assembly code. */
int lin_resample_resample(struct resample_data *data, struct dsp_buffer *src, int resample_linear(struct resample_data *data, struct dsp_buffer *src,
struct dsp_buffer *dst); struct dsp_buffer *dst);
static void lin_resample_flush_data(struct resample_data *data) static void resample_flush_data(struct resample_data *data)
{ {
data->phase = 0; data->phase = 0;
data->last_sample[0] = 0; data->last_sample[0] = 0;
data->last_sample[1] = 0; data->last_sample[1] = 0;
} }
static void lin_resample_flush(struct dsp_proc_entry *this) static void resample_flush(struct dsp_proc_entry *this)
{ {
struct resample_data *data = (void *)this->data; struct resample_data *data = (void *)this->data;
data->resample_buf.remcount = 0; data->resample_buf.remcount = 0;
lin_resample_flush_data(data); resample_flush_data(data);
} }
static bool lin_resample_new_delta(struct resample_data *data, static bool resample_new_delta(struct resample_data *data,
struct sample_format *format) struct sample_format *format)
{ {
int32_t frequency = format->frequency; /* virtual samplerate */ int32_t frequency = format->frequency; /* virtual samplerate */
@ -86,7 +86,7 @@ static bool lin_resample_new_delta(struct resample_data *data,
/* NOTE: If fully glitch-free transistions from no resampling to /* NOTE: If fully glitch-free transistions from no resampling to
resampling are desired, last_sample history should be maintained resampling are desired, last_sample history should be maintained
even when not resampling. */ even when not resampling. */
lin_resample_flush_data(data); resample_flush_data(data);
return false; return false;
} }
@ -95,8 +95,8 @@ static bool lin_resample_new_delta(struct resample_data *data,
#if !defined(CPU_COLDFIRE) && !defined(CPU_ARM) #if !defined(CPU_COLDFIRE) && !defined(CPU_ARM)
/* Where the real work is done */ /* Where the real work is done */
int lin_resample_resample(struct resample_data *data, struct dsp_buffer *src, int resample_linear(struct resample_data *data, struct dsp_buffer *src,
struct dsp_buffer *dst) struct dsp_buffer *dst)
{ {
int ch = src->format.num_channels - 1; int ch = src->format.num_channels - 1;
uint32_t count = MIN(src->remcount, 0x8000); uint32_t count = MIN(src->remcount, 0x8000);
@ -155,8 +155,8 @@ int lin_resample_resample(struct resample_data *data, struct dsp_buffer *src,
/* Resample count stereo samples or stop when the destination is full. /* Resample count stereo samples or stop when the destination is full.
* Updates the src buffer and changes to its own output buffer to refer to * Updates the src buffer and changes to its own output buffer to refer to
* the resampled data. */ * the resampled data. */
static void lin_resample_process(struct dsp_proc_entry *this, static void resample_process(struct dsp_proc_entry *this,
struct dsp_buffer **buf_p) struct dsp_buffer **buf_p)
{ {
struct resample_data *data = (void *)this->data; struct resample_data *data = (void *)this->data;
struct dsp_buffer *src = *buf_p; struct dsp_buffer *src = *buf_p;
@ -175,7 +175,7 @@ static void lin_resample_process(struct dsp_proc_entry *this,
{ {
dst->bufcount = RESAMPLE_BUF_COUNT; dst->bufcount = RESAMPLE_BUF_COUNT;
int consumed = lin_resample_resample(data, src, dst); int consumed = resample_linear(data, src, dst);
/* Advance src by consumed amount */ /* Advance src by consumed amount */
if (consumed > 0) if (consumed > 0)
@ -188,9 +188,9 @@ static void lin_resample_process(struct dsp_proc_entry *this,
} }
/* Finish draining old samples then switch format or shut off */ /* Finish draining old samples then switch format or shut off */
static intptr_t lin_resample_new_format(struct dsp_proc_entry *this, static intptr_t resample_new_format(struct dsp_proc_entry *this,
struct dsp_config *dsp, struct dsp_config *dsp,
struct sample_format *format) struct sample_format *format)
{ {
struct resample_data *data = (void *)this->data; struct resample_data *data = (void *)this->data;
struct dsp_buffer *dst = &data->resample_buf; struct dsp_buffer *dst = &data->resample_buf;
@ -206,7 +206,7 @@ static intptr_t lin_resample_new_format(struct dsp_proc_entry *this,
if (format->frequency != frequency) if (format->frequency != frequency)
{ {
DEBUGF(" DSP_PROC_RESAMPLE- new delta\n"); DEBUGF(" DSP_PROC_RESAMPLE- new delta\n");
active = lin_resample_new_delta(data, format); active = resample_new_delta(data, format);
dsp_proc_activate(dsp, DSP_PROC_RESAMPLE, active); dsp_proc_activate(dsp, DSP_PROC_RESAMPLE, active);
} }
@ -223,8 +223,8 @@ static intptr_t lin_resample_new_format(struct dsp_proc_entry *this,
return PROC_NEW_FORMAT_DEACTIVATED; return PROC_NEW_FORMAT_DEACTIVATED;
} }
static void INIT_ATTR lin_resample_dsp_init(struct dsp_config *dsp, static void INIT_ATTR resample_dsp_init(struct dsp_config *dsp,
enum dsp_ids dsp_id) enum dsp_ids dsp_id)
{ {
int32_t *lbuf, *rbuf; int32_t *lbuf, *rbuf;
@ -252,34 +252,34 @@ static void INIT_ATTR lin_resample_dsp_init(struct dsp_config *dsp,
resample_data[dsp_id].resample_out_p[1] = rbuf; resample_data[dsp_id].resample_out_p[1] = rbuf;
} }
static void INIT_ATTR lin_resample_proc_init(struct dsp_proc_entry *this, static void INIT_ATTR resample_proc_init(struct dsp_proc_entry *this,
struct dsp_config *dsp) struct dsp_config *dsp)
{ {
dsp_proc_set_in_place(dsp, DSP_PROC_RESAMPLE, false); dsp_proc_set_in_place(dsp, DSP_PROC_RESAMPLE, false);
this->data = (intptr_t)&resample_data[dsp_get_id(dsp)]; this->data = (intptr_t)&resample_data[dsp_get_id(dsp)];
this->process = lin_resample_process; this->process = resample_process;
} }
/* DSP message hook */ /* DSP message hook */
static intptr_t lin_resample_configure(struct dsp_proc_entry *this, static intptr_t resample_configure(struct dsp_proc_entry *this,
struct dsp_config *dsp, struct dsp_config *dsp,
unsigned int setting, unsigned int setting,
intptr_t value) intptr_t value)
{ {
intptr_t retval = 0; intptr_t retval = 0;
switch (setting) switch (setting)
{ {
case DSP_INIT: case DSP_INIT:
lin_resample_dsp_init(dsp, (enum dsp_ids)value); resample_dsp_init(dsp, (enum dsp_ids)value);
break; break;
case DSP_FLUSH: case DSP_FLUSH:
lin_resample_flush(this); resample_flush(this);
break; break;
case DSP_PROC_INIT: case DSP_PROC_INIT:
lin_resample_proc_init(this, dsp); resample_proc_init(this, dsp);
break; break;
case DSP_PROC_CLOSE: case DSP_PROC_CLOSE:
@ -288,8 +288,7 @@ static intptr_t lin_resample_configure(struct dsp_proc_entry *this,
break; break;
case DSP_PROC_NEW_FORMAT: case DSP_PROC_NEW_FORMAT:
retval = lin_resample_new_format(this, dsp, retval = resample_new_format(this, dsp, (struct sample_format *)value);
(struct sample_format *)value);
break; break;
} }
@ -298,4 +297,4 @@ static intptr_t lin_resample_configure(struct dsp_proc_entry *this,
/* Database entry */ /* Database entry */
DSP_PROC_DB_ENTRY(RESAMPLE, DSP_PROC_DB_ENTRY(RESAMPLE,
lin_resample_configure); resample_configure);