diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-22 12:44:49 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-22 12:49:29 +0100 |
| commit | c66bd8f3ff2809876795594a9e2fa3cc76462e09 (patch) | |
| tree | 94cf09deeff4407631d78d6b2daf0b4cd2622297 /libavcodec/ac3dsp.h | |
| parent | 9dc57688c8e250a669c8f601b909eaf411199d94 (diff) | |
| parent | b57e38f52cc3f31a27105c28887d57cd6812c3eb (diff) | |
| download | ffmpeg-streaming-c66bd8f3ff2809876795594a9e2fa3cc76462e09.zip ffmpeg-streaming-c66bd8f3ff2809876795594a9e2fa3cc76462e09.tar.gz | |
Merge commit 'b57e38f52cc3f31a27105c28887d57cd6812c3eb'
* commit 'b57e38f52cc3f31a27105c28887d57cd6812c3eb':
ac3dsp: x86: Replace inline asm for in-decoder downmixing with standalone asm
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/ac3dsp.h')
| -rw-r--r-- | libavcodec/ac3dsp.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libavcodec/ac3dsp.h b/libavcodec/ac3dsp.h index b4de307..161de4c 100644 --- a/libavcodec/ac3dsp.h +++ b/libavcodec/ac3dsp.h @@ -132,11 +132,10 @@ typedef struct AC3DSPContext { void (*sum_square_butterfly_float)(float sum[4], const float *coef0, const float *coef1, int len); - void (*downmix)(float **samples, float **matrix, int out_ch, - int in_ch, int len); - - void (*downmix_fixed)(int32_t **samples, int16_t **matrix, int out_ch, - int in_ch, int len); + int out_channels; + int in_channels; + void (*downmix)(float **samples, float **matrix, int len); + void (*downmix_fixed)(int32_t **samples, int16_t **matrix, int len); /** * Apply symmetric window in 16-bit fixed-point. @@ -158,4 +157,11 @@ void ff_ac3dsp_init_arm(AC3DSPContext *c, int bit_exact); void ff_ac3dsp_init_x86(AC3DSPContext *c, int bit_exact); void ff_ac3dsp_init_mips(AC3DSPContext *c, int bit_exact); +void ff_ac3dsp_downmix(AC3DSPContext *c, float **samples, float **matrix, + int out_ch, int in_ch, int len); +void ff_ac3dsp_downmix_fixed(AC3DSPContext *c, int32_t **samples, int16_t **matrix, + int out_ch, int in_ch, int len); + +void ff_ac3dsp_set_downmix_x86(AC3DSPContext *c); + #endif /* AVCODEC_AC3DSP_H */ |
