mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-29 14:44:17 +00:00
resample into core
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@254 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale committed
1 parent
7dc6dd3f5a
commit
111a0f6deb
12 files changed
+360
-281
No files matched your search
@@ -34,56 +34,6 @@
|
||||
|
||||
static const char modname[] = "mod_rawaudio";
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(a,b) ((a) < (b) ? (a) : (b))
|
||||
#endif
|
||||
|
||||
#ifndef MAX
|
||||
#define MAX(a,b) ((a) > (b) ? (a) : (b))
|
||||
#endif
|
||||
|
||||
#define QUALITY 1
|
||||
|
||||
struct raw_resampler {
|
||||
void *resampler;
|
||||
int from;
|
||||
int to;
|
||||
double factor;
|
||||
float *buf;
|
||||
int buf_len;
|
||||
int buf_size;
|
||||
float *new_buf;
|
||||
int new_buf_len;
|
||||
int new_buf_size;
|
||||
};
|
||||
|
||||
struct raw_context {
|
||||
struct raw_resampler *enc;
|
||||
struct raw_resampler *dec;
|
||||
};
|
||||
|
||||
|
||||
static int resample(void *handle, double factor, float *src, int srclen, float *dst, int dstlen, int last)
|
||||
{
|
||||
int o=0, srcused=0, srcpos=0, out=0;
|
||||
|
||||
for(;;) {
|
||||
int srcBlock = MIN(srclen-srcpos, srclen);
|
||||
int lastFlag = (last && (srcBlock == srclen-srcpos));
|
||||
o = resample_process(handle, factor, &src[srcpos], srcBlock, lastFlag, &srcused, &dst[out], dstlen-out);
|
||||
//printf("resampling %d/%d (%d) %d %f\n", srcpos, srclen, MIN(dstlen-out, dstlen), srcused, factor);
|
||||
|
||||
srcpos += srcused;
|
||||
if (o >= 0) {
|
||||
out += o;
|
||||
}
|
||||
if (o < 0 || (o == 0 && srcpos == srclen)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
|
||||
static switch_status switch_raw_init(switch_codec *codec, switch_codec_flag flags, const struct switch_codec_settings *codec_settings)
|
||||
{
|
||||
@@ -96,10 +46,6 @@ static switch_status switch_raw_init(switch_codec *codec, switch_codec_flag flag
|
||||
if (!(encoding || decoding)) {
|
||||
return SWITCH_STATUS_FALSE;
|
||||
} else {
|
||||
if (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context)))) {
|
||||
return SWITCH_STATUS_MEMERR;
|
||||
}
|
||||
codec->private = context;
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
}
|
||||
@@ -114,56 +60,13 @@ static switch_status switch_raw_encode(switch_codec *codec,
|
||||
int *encoded_rate,
|
||||
unsigned int *flag)
|
||||
{
|
||||
struct raw_context *context = codec->private;
|
||||
|
||||
/* NOOP indicates that the audio in is already the same as the audio out, so no conversion was necessary.
|
||||
TBD Support varying number of channels
|
||||
*/
|
||||
//printf("encode %d->%d (%d)\n", other_codec->implementation->samples_per_second, codec->implementation->samples_per_second, decoded_rate);
|
||||
|
||||
if (other_codec &&
|
||||
codec->implementation->samples_per_second != other_codec->implementation->samples_per_second &&
|
||||
decoded_rate != other_codec->implementation->samples_per_second) {
|
||||
const short *ddp = decoded_data;
|
||||
short *edp = encoded_data;
|
||||
size_t ddplen = decoded_data_len / 2;
|
||||
|
||||
if (!context->enc) {
|
||||
|
||||
if (!(context->enc = switch_core_alloc(codec->memory_pool, sizeof(struct raw_resampler)))) {
|
||||
return SWITCH_STATUS_MEMERR;
|
||||
}
|
||||
|
||||
context->enc->from = other_codec->implementation->samples_per_second;
|
||||
context->enc->to = codec->implementation->samples_per_second;
|
||||
context->enc->factor = ((double)context->enc->to / (double)context->enc->from);
|
||||
|
||||
context->enc->resampler = resample_open(QUALITY, context->enc->factor, context->enc->factor);
|
||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activate Encode Resample %d->%d %f\n", context->enc->from, context->enc->to, context->enc->factor);
|
||||
context->enc->buf_size = codec->implementation->bytes_per_frame * 10;
|
||||
context->enc->buf = (float *) switch_core_alloc(codec->memory_pool, context->enc->buf_size);
|
||||
context->enc->new_buf_size = codec->implementation->bytes_per_frame * 10;
|
||||
context->enc->new_buf = (float *) switch_core_alloc(codec->memory_pool, context->enc->new_buf_size);
|
||||
}
|
||||
|
||||
if (context->enc) {
|
||||
context->enc->buf_len = switch_short_to_float(decoded_data, context->enc->buf, (int)ddplen);
|
||||
context->enc->new_buf_len = resample(context->enc->resampler,
|
||||
context->enc->factor,
|
||||
context->enc->buf,
|
||||
context->enc->buf_len,
|
||||
context->enc->new_buf,
|
||||
context->enc->new_buf_size,
|
||||
0);
|
||||
switch_float_to_short(context->enc->new_buf, edp, decoded_data_len * 2);
|
||||
*encoded_data_len = context->enc->new_buf_len * 2;
|
||||
*encoded_rate = context->enc->to;
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
return SWITCH_STATUS_GENERR;
|
||||
/* NOOP indicates that the audio in is already the same as the audio out, so no conversion was necessary.*/
|
||||
if (decoded_rate != codec->implementation->samples_per_second) {
|
||||
memcpy(encoded_data, decoded_data, decoded_data_len);
|
||||
*encoded_data_len = decoded_data_len;
|
||||
return SWITCH_STATUS_RESAMPLE;
|
||||
}
|
||||
|
||||
return SWITCH_STATUS_NOOP;
|
||||
}
|
||||
|
||||
@@ -177,72 +80,18 @@ static switch_status switch_raw_decode(switch_codec *codec,
|
||||
int *decoded_rate,
|
||||
unsigned int *flag)
|
||||
{
|
||||
struct raw_context *context = codec->private;
|
||||
|
||||
//printf("decode %d->%d (%d)\n", other_codec->implementation->samples_per_second, codec->implementation->samples_per_second, encoded_rate);
|
||||
|
||||
|
||||
if (other_codec &&
|
||||
codec->implementation->samples_per_second != other_codec->implementation->samples_per_second &&
|
||||
encoded_rate != other_codec->implementation->samples_per_second) {
|
||||
short *ddp = decoded_data;
|
||||
const short *edp = encoded_data;
|
||||
size_t edplen = encoded_data_len / 2;
|
||||
|
||||
if (!context->dec) {
|
||||
if (!(context->dec = switch_core_alloc(codec->memory_pool, sizeof(struct raw_resampler)))) {
|
||||
return SWITCH_STATUS_MEMERR;
|
||||
}
|
||||
|
||||
|
||||
context->dec->from = other_codec->implementation->samples_per_second;
|
||||
context->dec->to = codec->implementation->samples_per_second;
|
||||
context->dec->factor = ((double)context->dec->from / (double)context->dec->to);
|
||||
|
||||
context->dec->resampler = resample_open(QUALITY, context->dec->factor, context->dec->factor);
|
||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activate Decode Resample %d->%d %f\n", context->dec->from, context->dec->to, context->dec->factor);
|
||||
|
||||
context->dec->buf_size = codec->implementation->bytes_per_frame * 10;
|
||||
context->dec->buf = (float *) switch_core_alloc(codec->memory_pool, context->dec->buf_size);
|
||||
context->dec->new_buf_size = codec->implementation->bytes_per_frame * 10;
|
||||
context->dec->new_buf = (float *) switch_core_alloc(codec->memory_pool, context->dec->new_buf_size);
|
||||
}
|
||||
|
||||
if (context->dec) {
|
||||
context->dec->buf_len = switch_short_to_float(encoded_data, context->dec->buf, (int)edplen);
|
||||
context->dec->new_buf_len = resample(context->dec->resampler,
|
||||
context->dec->factor,
|
||||
context->dec->buf,
|
||||
context->dec->buf_len,
|
||||
context->dec->new_buf,
|
||||
context->dec->new_buf_size,
|
||||
0);
|
||||
switch_float_to_short(context->dec->new_buf, ddp, (int)edplen);
|
||||
*decoded_data_len = context->dec->new_buf_len * 2;
|
||||
*decoded_rate = context->dec->to;
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
return SWITCH_STATUS_GENERR;
|
||||
if (encoded_rate != other_codec->implementation->samples_per_second) {
|
||||
memcpy(decoded_data, encoded_data, encoded_data_len);
|
||||
*decoded_data_len = encoded_data_len;
|
||||
return SWITCH_STATUS_RESAMPLE;
|
||||
}
|
||||
|
||||
|
||||
return SWITCH_STATUS_NOOP;
|
||||
}
|
||||
|
||||
|
||||
static switch_status switch_raw_destroy(switch_codec *codec)
|
||||
{
|
||||
struct raw_context *context = codec->private;
|
||||
|
||||
if (context->enc && context->enc->resampler){
|
||||
resample_close(context->enc->resampler);
|
||||
}
|
||||
|
||||
if (context->dec && context->dec->resampler){
|
||||
resample_close(context->dec->resampler);
|
||||
}
|
||||
|
||||
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user