RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 04:17:05 +00:00
Code Issues Projects Releases Wiki Activity

swr: add native_simd_one

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-04 23:35:19 +02:00
parent e3e398b80b
commit 4cfc92081d
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libswresample/rematrix.c
View File

@ -403,6 +403,7 @@ av_cold void swri_rematrix_free(SwrContext *s){
av_freep(&s->native_matrix); av_freep(&s->native_matrix);
av_freep(&s->native_one); av_freep(&s->native_one);
av_freep(&s->native_simd_matrix); av_freep(&s->native_simd_matrix);
av_freep(&s->native_simd_one);
} }
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){

1
libswresample/swresample_internal.h
View File

@ -134,6 +134,7 @@ struct SwrContext {
float matrix[SWR_CH_MAX][SWR_CH_MAX]; ///< floating point rematrixing coefficients float matrix[SWR_CH_MAX][SWR_CH_MAX]; ///< 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_matrix; uint8_t *native_simd_matrix;
int32_t matrix32[SWR_CH_MAX][SWR_CH_MAX]; ///< 17.15 fixed point rematrixing coefficients int32_t matrix32[SWR_CH_MAX][SWR_CH_MAX]; ///< 17.15 fixed point rematrixing coefficients
uint8_t matrix_ch[SWR_CH_MAX][SWR_CH_MAX+1]; ///< Lists of input channels per output channel that have non zero rematrixing coefficients uint8_t matrix_ch[SWR_CH_MAX][SWR_CH_MAX+1]; ///< Lists of input channels per output channel that have non zero rematrixing coefficients

5
libswresample/x86/swresample_x86.c
View File

@ -169,6 +169,7 @@ av_cold void swri_rematrix_init_x86(struct SwrContext *s){
s->mix_2_1_simd = ff_mix_2_1_a_int16_sse2; s->mix_2_1_simd = ff_mix_2_1_a_int16_sse2;
} }
s->native_simd_matrix = av_mallocz(2 * num * sizeof(int16_t)); s->native_simd_matrix = av_mallocz(2 * num * sizeof(int16_t));
s->native_simd_one = av_mallocz(2 * sizeof(int16_t));
for(i=0; i<nb_out; i++){ for(i=0; i<nb_out; i++){
int sh = 0; int sh = 0;
for(j=0; j<nb_in; j++) for(j=0; j<nb_in; j++)
@ -180,6 +181,8 @@ av_cold void swri_rematrix_init_x86(struct SwrContext *s){
((((int*)s->native_matrix)[i * nb_in + j]) + (1<<sh>>1)) >> sh; ((((int*)s->native_matrix)[i * nb_in + j]) + (1<<sh>>1)) >> sh;
} }
} }
((int16_t*)s->native_simd_one)[1] = 14;
((int16_t*)s->native_simd_one)[0] = 16384;
} else if(s->midbuf.fmt == AV_SAMPLE_FMT_FLTP){ } else if(s->midbuf.fmt == AV_SAMPLE_FMT_FLTP){
if(mm_flags & AV_CPU_FLAG_SSE) { if(mm_flags & AV_CPU_FLAG_SSE) {
s->mix_1_1_simd = ff_mix_1_1_a_float_sse; s->mix_1_1_simd = ff_mix_1_1_a_float_sse;
@ -191,5 +194,7 @@ av_cold void swri_rematrix_init_x86(struct SwrContext *s){
} }
s->native_simd_matrix = av_mallocz(num * sizeof(float)); s->native_simd_matrix = av_mallocz(num * sizeof(float));
memcpy(s->native_simd_matrix, s->native_matrix, num * sizeof(float)); memcpy(s->native_simd_matrix, s->native_matrix, num * sizeof(float));
s->native_simd_one = av_mallocz(sizeof(float));
memcpy(s->native_simd_one, s->native_one, sizeof(float));
} }
} }