virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

swresample: Use double and float for matrixes for best quality and speed

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-08-18 01:07:32 +02:00
parent dcc506a91e
commit 740f5105d5
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libswresample/rematrix.c
View File

@ -73,6 +73,9 @@ int swr_set_matrix(struct SwrContext *s, const double *matrix, int stride)
for (out = 0; out < nb_out; out++) { for (out = 0; out < nb_out; out++) {
for (in = 0; in < nb_in; in++) for (in = 0; in < nb_in; in++)
s->matrix[out][in] = matrix[in]; s->matrix[out][in] = matrix[in];
if (s->int_sample_fmt == AV_SAMPLE_FMT_FLTP)
for (in = 0; in < nb_in; in++)
s->matrix_flt[out][in] = matrix[in];
matrix += stride; matrix += stride;
} }
s->rematrix_custom = 1; s->rematrix_custom = 1;
@ -354,6 +357,12 @@ av_cold static int auto_matrix(SwrContext *s)
} }
av_log(s, AV_LOG_DEBUG, "\n"); av_log(s, AV_LOG_DEBUG, "\n");
} }
if (s->int_sample_fmt == AV_SAMPLE_FMT_FLTP) {
int i;
for (i = 0; i < FF_ARRAY_ELEMS(s->matrix[0])*FF_ARRAY_ELEMS(s->matrix[0]); i++)
s->matrix_flt[0][i] = s->matrix[0][i];
}
return 0; return 0;
} }
@ -513,7 +522,7 @@ int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mus
float v=0; float v=0;
for(j=0; j<s->matrix_ch[out_i][0]; j++){ for(j=0; j<s->matrix_ch[out_i][0]; j++){
in_i= s->matrix_ch[out_i][1+j]; in_i= s->matrix_ch[out_i][1+j];
v+= ((float*)in->ch[in_i])[i] * s->matrix[out_i][in_i]; v+= ((float*)in->ch[in_i])[i] * s->matrix_flt[out_i][in_i];
} }
((float*)out->ch[out_i])[i]= v; ((float*)out->ch[out_i])[i]= v;
} }

3
libswresample/swresample_internal.h
View File

@ -168,7 +168,8 @@ struct SwrContext {
struct ResampleContext *resample; ///< resampling context struct ResampleContext *resample; ///< resampling context
struct Resampler const *resampler; ///< resampler virtual function table struct Resampler const *resampler; ///< resampler virtual function table
float matrix[SWR_CH_MAX][SWR_CH_MAX]; ///< floating point rematrixing coefficients double matrix[SWR_CH_MAX][SWR_CH_MAX]; ///< floating point rematrixing coefficients
float matrix_flt[SWR_CH_MAX][SWR_CH_MAX]; ///< single precision floating point rematrixing coefficients
uint8_t *native_matrix; uint8_t *native_matrix;
uint8_t *native_one; uint8_t *native_one;
uint8_t *native_simd_one; uint8_t *native_simd_one;