diff options
author | Lynne <dev@lynne.ee> | 2019-08-15 11:13:35 +0100 |
---|---|---|
committer | Lynne <dev@lynne.ee> | 2019-09-11 03:28:22 +0100 |
commit | 6b22e28f4c857b2d9c045001add083343f506d84 (patch) | |
tree | 703f78608be9880729a27e60922b85d61e933017 /libavcodec/opusdsp.c | |
parent | 40a433e34b3e7eaf9bad87858299dfb1172a2aaa (diff) | |
download | ffmpeg-6b22e28f4c857b2d9c045001add083343f506d84.tar.gz |
opusdsp: adjust and optimize C function to match assembly
The C and asm versions behaved differently _outside_ of the codec.
The C version returned pre-multiplied 'state' for the next execution
to use right away, while the assembly version outputted non-multiplied
'state' for the next execution to multiply to save instructions.
Since the initial state when initialized or seeking is always 0,
and since C and asm versions were never mixed, there was no issue.
However, comparing outputs directly in checkasm doesn't work without
dividing the initial state by CELT_EMPH_COEFF and multiplying the
returned state by CELT_EMPH_COEFF for the assembly function.
Since its actually faster to do this in C as well, copy the behavior the
asm versions use. As a reminder, the initial state 0 is divided by
CELT_EMPH_COEFF on seek and init (just in case in the future this is
changed, its technically more correct to init with CELT_EMPH_COEFF than 0,
however when seeking this will result in more audiable pops, unlike with 0
where the output gets in sync over a few samples).
Diffstat (limited to 'libavcodec/opusdsp.c')
-rw-r--r-- | libavcodec/opusdsp.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libavcodec/opusdsp.c b/libavcodec/opusdsp.c index 0e179c98c9..08df87ffbe 100644 --- a/libavcodec/opusdsp.c +++ b/libavcodec/opusdsp.c @@ -43,15 +43,10 @@ static void postfilter_c(float *data, int period, float *gains, int len) static float deemphasis_c(float *y, float *x, float coeff, int len) { - float state = coeff; + for (int i = 0; i < len; i++) + coeff = y[i] = x[i] + coeff*CELT_EMPH_COEFF; - for (int i = 0; i < len; i++) { - const float tmp = x[i] + state; - state = tmp * CELT_EMPH_COEFF; - y[i] = tmp; - } - - return state; + return coeff; } av_cold void ff_opus_dsp_init(OpusDSP *ctx) |