c9bcbe202d
Creates a standard buffer passing, local data passing and messaging system for processing stages. Stages can be moved to their own source files to reduce clutter and ease assimilation of new ones. dsp.c becomes dsp_core.c which supports an engine and framework for effects. Formats and change notifications are passed along with the buffer so that they arrive at the correct time at each stage in the chain regardless of the internal delays of a particular one. Removes restrictions on the number of samples that can be processed at a time and it pays attention to destination buffer size restrictions without having to limit input count, which also allows pcmbuf to remain fuller and safely set its own buffer limits as it sees fit. There is no longer a need to query input/output counts given a certain number of input samples; just give it the sizes of the source and destination buffers. Works in harmony with stages that are not deterministic in terms of sample input/output ratio (like both resamplers but most notably the timestretch). As a result it fixes quirks with timestretch hanging up with certain settings and it now operates properly throughout its full settings range. Change-Id: Ib206ec78f6f6c79259c5af9009fe021d68be9734 Reviewed-on: http://gerrit.rockbox.org/200 Reviewed-by: Michael Sevakis <jethead71@rockbox.org> Tested-by: Michael Sevakis <jethead71@rockbox.org>
281 lines
8.3 KiB
C
281 lines
8.3 KiB
C
/***************************************************************************
|
|
* __________ __ ___.
|
|
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
|
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
|
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
|
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
|
* \/ \/ \/ \/ \/
|
|
* $Id$
|
|
*
|
|
* Copyright (C) 2005 Miika Pekkarinen
|
|
* Copyright (C) 2012 Michael Sevakis
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
****************************************************************************/
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "dsp.h"
|
|
#include "fracmul.h"
|
|
#include "fixedpoint.h"
|
|
#include "dsp_sample_io.h"
|
|
#include <string.h>
|
|
#include "dsp_proc_entry.h"
|
|
|
|
/**
|
|
* Linear interpolation resampling that introduces a one sample delay because
|
|
* of our inability to look into the future at the end of a frame.
|
|
*/
|
|
|
|
#if 0 /* Set to '1' to enable debug messages */
|
|
#include <debug.h>
|
|
#else
|
|
#undef DEBUGF
|
|
#define DEBUGF(...)
|
|
#endif
|
|
|
|
#define RESAMPLE_BUF_COUNT 192 /* Per channel, per DSP */
|
|
|
|
/* Data for each resampler on each DSP */
|
|
static struct resample_data
|
|
{
|
|
uint32_t delta; /* 00h: Phase delta for each step */
|
|
uint32_t phase; /* 04h: Current phase [pos16|frac16] */
|
|
int32_t last_sample[2]; /* 08h: Last samples for interpolation (L+R) */
|
|
int32_t frequency; /* 10h: Virtual samplerate */
|
|
/* 14h */
|
|
struct dsp_config *dsp; /* The DSP for this resampler */
|
|
struct dsp_buffer resample_buf; /* Buffer descriptor for resampled data */
|
|
int32_t resample_buf_arr[2][RESAMPLE_BUF_COUNT]; /* Actual output data */
|
|
} resample_data[DSP_COUNT] IBSS_ATTR;
|
|
|
|
/* Actual worker function. Implemented here or in target assembly code. */
|
|
int lin_resample_resample(struct resample_data *data, struct dsp_buffer *src,
|
|
struct dsp_buffer *dst);
|
|
|
|
static void lin_resample_flush_data(struct resample_data *data)
|
|
{
|
|
data->phase = 0;
|
|
data->last_sample[0] = 0;
|
|
data->last_sample[1] = 0;
|
|
}
|
|
|
|
static void lin_resample_flush(struct dsp_proc_entry *this)
|
|
{
|
|
struct resample_data *data = (void *)this->data;
|
|
data->resample_buf.remcount = 0;
|
|
lin_resample_flush_data(data);
|
|
}
|
|
|
|
static bool lin_resample_new_delta(struct resample_data *data,
|
|
struct dsp_buffer *buf)
|
|
{
|
|
int32_t frequency = buf->format.frequency; /* virtual samplerate */
|
|
|
|
data->frequency = frequency;
|
|
data->delta = fp_div(frequency, NATIVE_FREQUENCY, 16);
|
|
|
|
if (frequency == NATIVE_FREQUENCY)
|
|
{
|
|
/* NOTE: If fully glitch-free transistions from no resampling to
|
|
resampling are desired, last_sample history should be maintained
|
|
even when not resampling. */
|
|
lin_resample_flush_data(data);
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
#if !defined(CPU_COLDFIRE) && !defined(CPU_ARM)
|
|
/* Where the real work is done */
|
|
int lin_resample_resample(struct resample_data *data, struct dsp_buffer *src,
|
|
struct dsp_buffer *dst)
|
|
{
|
|
int ch = src->format.num_channels - 1;
|
|
uint32_t count = MIN(src->remcount, 0x8000);
|
|
uint32_t delta = data->delta;
|
|
uint32_t phase, pos;
|
|
int32_t *d;
|
|
|
|
do
|
|
{
|
|
const int32_t *s = src->p32[ch];
|
|
|
|
d = dst->p32[ch];
|
|
int32_t *dmax = d + dst->bufcount;
|
|
|
|
phase = data->phase;
|
|
pos = phase >> 16;
|
|
pos = MIN(pos, count);
|
|
|
|
int32_t last = pos > 0 ? s[pos - 1] : data->last_sample[ch];
|
|
|
|
if (pos < count)
|
|
{
|
|
while (1)
|
|
{
|
|
*d++ = last + FRACMUL((phase & 0xffff) << 15, s[pos] - last);
|
|
phase += delta;
|
|
pos = phase >> 16;
|
|
|
|
if (pos >= count || d >= dmax)
|
|
break;
|
|
|
|
if (pos > 0)
|
|
last = s[pos - 1];
|
|
}
|
|
|
|
if (pos > 0)
|
|
{
|
|
pos = MIN(pos, count);
|
|
last = s[pos - 1];
|
|
}
|
|
}
|
|
|
|
data->last_sample[ch] = last;
|
|
}
|
|
while (--ch >= 0);
|
|
|
|
/* Wrap phase accumulator back to start of next frame. */
|
|
data->phase = phase - (pos << 16);
|
|
|
|
dst->remcount = d - dst->p32[0];
|
|
|
|
return pos;
|
|
}
|
|
#endif /* CPU */
|
|
|
|
/* 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
|
|
* the resampled data. */
|
|
static void lin_resample_process(struct dsp_proc_entry *this,
|
|
struct dsp_buffer **buf_p)
|
|
{
|
|
struct resample_data *data = (void *)this->data;
|
|
struct dsp_buffer *src = *buf_p;
|
|
struct dsp_buffer *dst = &data->resample_buf;
|
|
|
|
*buf_p = dst;
|
|
|
|
if (dst->remcount > 0)
|
|
return; /* data still remains */
|
|
|
|
int channels = src->format.num_channels;
|
|
|
|
dst->remcount = 0;
|
|
dst->p32[0] = data->resample_buf_arr[0];
|
|
dst->p32[1] = data->resample_buf_arr[channels - 1];
|
|
|
|
if (src->remcount > 0)
|
|
{
|
|
dst->bufcount = RESAMPLE_BUF_COUNT;
|
|
|
|
int consumed = lin_resample_resample(data, src, dst);
|
|
|
|
/* Advance src by consumed amount */
|
|
if (consumed > 0)
|
|
dsp_advance_buffer32(src, consumed);
|
|
}
|
|
/* else purged resample_buf */
|
|
|
|
/* Inherit in-place processed mask from source buffer */
|
|
dst->proc_mask = src->proc_mask;
|
|
}
|
|
|
|
/* Finish draining old samples then switch format or shut off */
|
|
static void lin_resample_new_format(struct dsp_proc_entry *this,
|
|
struct dsp_buffer **buf_p)
|
|
{
|
|
struct resample_data *data = (void *)this->data;
|
|
struct dsp_buffer *src = *buf_p;
|
|
struct dsp_buffer *dst = &data->resample_buf;
|
|
|
|
if (dst->remcount > 0)
|
|
{
|
|
*buf_p = dst;
|
|
return; /* data still remains */
|
|
}
|
|
|
|
DSP_PRINT_FORMAT(DSP_PROC_RESAMPLE, DSP_PROC_RESAMPLE, src->format);
|
|
|
|
struct dsp_config *dsp = data->dsp;
|
|
int32_t frequency = data->frequency;
|
|
bool active = dsp_proc_active(dsp, DSP_PROC_RESAMPLE);
|
|
|
|
if (src->format.frequency != frequency)
|
|
{
|
|
DEBUGF(" DSP_PROC_RESAMPLE- new delta\n");
|
|
active = lin_resample_new_delta(data, src);
|
|
dsp_proc_activate(dsp, DSP_PROC_RESAMPLE, active);
|
|
}
|
|
|
|
/* Everything after us is NATIVE_FREQUENCY */
|
|
struct sample_format f = src->format;
|
|
f.frequency = NATIVE_FREQUENCY;
|
|
f.codec_frequency = NATIVE_FREQUENCY;
|
|
|
|
if (!active)
|
|
{
|
|
DEBUGF(" DSP_PROC_RESAMPLE- not active\n");
|
|
dst->format = f; /* Keep track */
|
|
return; /* No resampling required */
|
|
}
|
|
|
|
format_change_ack(&src->format);
|
|
|
|
if (EQU_SAMPLE_FORMAT(f, dst->format))
|
|
{
|
|
DEBUGF(" DSP_PROC_RESAMPLE- same dst format\n");
|
|
format_change_ack(&f); /* Nothing changed that matters downstream */
|
|
}
|
|
|
|
dst->format = f;
|
|
dsp_proc_call(this, buf_p, 0);
|
|
}
|
|
|
|
/* DSP message hook */
|
|
static intptr_t lin_resample_configure(struct dsp_proc_entry *this,
|
|
struct dsp_config *dsp,
|
|
unsigned int setting,
|
|
intptr_t value)
|
|
{
|
|
switch (setting)
|
|
{
|
|
case DSP_INIT:
|
|
/* Always enable resampler so that format changes may be monitored and
|
|
* it self-activated when required */
|
|
dsp_proc_enable(dsp, DSP_PROC_RESAMPLE, true);
|
|
break;
|
|
|
|
case DSP_FLUSH:
|
|
lin_resample_flush(this);
|
|
break;
|
|
|
|
case DSP_PROC_INIT:
|
|
this->data = (intptr_t)&resample_data[dsp_get_id(dsp)];
|
|
this->ip_mask = 0; /* Not in-place */
|
|
this->process[0] = lin_resample_process;
|
|
this->process[1] = lin_resample_new_format;
|
|
((struct resample_data *)this->data)->dsp = dsp;
|
|
break;
|
|
|
|
case DSP_PROC_CLOSE:
|
|
/* This stage should be enabled at all times */
|
|
DEBUGF("DSP_PROC_RESAMPLE- Error: Closing!\n");
|
|
break;
|
|
}
|
|
|
|
return 1;
|
|
(void)value;
|
|
}
|
|
|
|
/* Database entry */
|
|
DSP_PROC_DB_ENTRY(RESAMPLE,
|
|
lin_resample_configure);
|