Commit 24ab1abf authored by Michael Niedermayer's avatar Michael Niedermayer

resample: support double precission resampling

This commit is dedicated to the audiophiles who can hear it when a
needle is dropped on the moon.
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 3d9338b1
...@@ -143,6 +143,10 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap ...@@ -143,6 +143,10 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap
for(i=0;i<tap_count;i++) for(i=0;i<tap_count;i++)
((float*)filter)[ph * tap_count + i] = tab[i] * scale / norm; ((float*)filter)[ph * tap_count + i] = tab[i] * scale / norm;
break; break;
case AV_SAMPLE_FMT_DBL:
for(i=0;i<tap_count;i++)
((double*)filter)[ph * tap_count + i] = tab[i] * scale / norm;
break;
} }
} }
#if 0 #if 0
...@@ -211,6 +215,10 @@ ResampleContext *swri_resample_init(ResampleContext *c, int out_rate, int in_rat ...@@ -211,6 +215,10 @@ ResampleContext *swri_resample_init(ResampleContext *c, int out_rate, int in_rat
c->felem_size = 4; c->felem_size = 4;
c->filter_shift = 0; c->filter_shift = 0;
break; break;
case AV_SAMPLE_FMT_DBL:
c->felem_size = 8;
c->filter_shift = 0;
break;
default: default:
av_log(NULL, AV_LOG_ERROR, "Unsupported sample format\n"); av_log(NULL, AV_LOG_ERROR, "Unsupported sample format\n");
return NULL; return NULL;
...@@ -330,6 +338,26 @@ int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensatio ...@@ -330,6 +338,26 @@ int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensatio
#define OUT(d, v) d = v #define OUT(d, v) d = v
#include "resample_template.c" #include "resample_template.c"
#undef RENAME
#undef FELEM
#undef FELEM2
#undef DELEM
#undef FELEML
#undef OUT
#undef FELEM_MIN
#undef FELEM_MAX
#undef FILTER_SHIFT
#define RENAME(N) N ## _double
#define FILTER_SHIFT 0
#define DELEM double
#define FELEM double
#define FELEM2 double
#define FELEML double
#define OUT(d, v) d = v
#include "resample_template.c"
int swri_multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, AudioData *src, int src_size, int *consumed){ int swri_multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, AudioData *src, int src_size, int *consumed){
int i, ret= -1; int i, ret= -1;
...@@ -338,6 +366,7 @@ int swri_multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, Aud ...@@ -338,6 +366,7 @@ int swri_multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, Aud
if(c->format == AV_SAMPLE_FMT_S16) ret= swri_resample_int16(c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count); if(c->format == AV_SAMPLE_FMT_S16) ret= swri_resample_int16(c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
if(c->format == AV_SAMPLE_FMT_S32) ret= swri_resample_int32(c, (int32_t*)dst->ch[i], (const int32_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count); if(c->format == AV_SAMPLE_FMT_S32) ret= swri_resample_int32(c, (int32_t*)dst->ch[i], (const int32_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
if(c->format == AV_SAMPLE_FMT_FLT) ret= swri_resample_float(c, (float *)dst->ch[i], (const float *)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count); if(c->format == AV_SAMPLE_FMT_FLT) ret= swri_resample_float(c, (float *)dst->ch[i], (const float *)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
if(c->format == AV_SAMPLE_FMT_DBL) ret= swri_resample_double(c,(double *)dst->ch[i], (const double *)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
} }
return ret; return ret;
......
...@@ -85,6 +85,7 @@ void swri_resample_compensate(struct ResampleContext *c, int sample_delta, int c ...@@ -85,6 +85,7 @@ void swri_resample_compensate(struct ResampleContext *c, int sample_delta, int c
int swri_resample_int16(struct ResampleContext *c, int16_t *dst, const int16_t *src, int *consumed, int src_size, int dst_size, int update_ctx); int swri_resample_int16(struct ResampleContext *c, int16_t *dst, const int16_t *src, int *consumed, int src_size, int dst_size, int update_ctx);
int swri_resample_int32(struct ResampleContext *c, int32_t *dst, const int32_t *src, int *consumed, int src_size, int dst_size, int update_ctx); int swri_resample_int32(struct ResampleContext *c, int32_t *dst, const int32_t *src, int *consumed, int src_size, int dst_size, int update_ctx);
int swri_resample_float(struct ResampleContext *c, float *dst, const float *src, int *consumed, int src_size, int dst_size, int update_ctx); int swri_resample_float(struct ResampleContext *c, float *dst, const float *src, int *consumed, int src_size, int dst_size, int update_ctx);
int swri_resample_double(struct ResampleContext *c,double *dst, const double *src, int *consumed, int src_size, int dst_size, int update_ctx);
int swri_rematrix_init(SwrContext *s); int swri_rematrix_init(SwrContext *s);
int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mustcopy); int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mustcopy);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment