diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-04 23:35:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-04 23:50:45 +0200 |
| commit | 4cfc92081dfe9dfd14045b99b60e531b4f2cf6e7 (patch) | |
| tree | f0d0405320f54cfc7a80963d32e139f492f361b9 | |
| parent | e3e398b80be483e99eeda08d96c7409cfb6706cf (diff) | |
| download | ffmpeg-4cfc92081dfe9dfd14045b99b60e531b4f2cf6e7.tar.gz | |
swr: add native_simd_one
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswresample/rematrix.c | 1 | ||||
| -rw-r--r-- | libswresample/swresample_internal.h | 1 | ||||
| -rw-r--r-- | libswresample/x86/swresample_x86.c | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index 3abfb3e760..48aff3be7f 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -403,6 +403,7 @@ av_cold void swri_rematrix_free(SwrContext *s){ av_freep(&s->native_matrix); av_freep(&s->native_one); 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){ diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h index 17b85d5263..108f837f23 100644 --- a/libswresample/swresample_internal.h +++ b/libswresample/swresample_internal.h @@ -134,6 +134,7 @@ struct SwrContext { float matrix[SWR_CH_MAX][SWR_CH_MAX]; ///< floating point rematrixing coefficients uint8_t *native_matrix; uint8_t *native_one; + uint8_t *native_simd_one; uint8_t *native_simd_matrix; 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 diff --git a/libswresample/x86/swresample_x86.c b/libswresample/x86/swresample_x86.c index e18f0c57ba..581dc17e85 100644 --- a/libswresample/x86/swresample_x86.c +++ b/libswresample/x86/swresample_x86.c @@ -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->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++){ int sh = 0; 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; } } + ((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){ if(mm_flags & AV_CPU_FLAG_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)); 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)); } } |