avcodec/mips: preload data in hevc sao edge 45 degree filter msa functions

[ffmpeg] / libavcodec / opusenc_psy.c

diff --git a/libavcodec/opusenc_psy.c b/libavcodec/opusenc_psy.c
index 7c356fc56874acd0a7a05dc6889b0ad0550db91d..bb673bef68ad12f994fbb88ffff95ff4658689be 100644 (file)
--- a/libavcodec/opusenc_psy.c
+++ b/libavcodec/opusenc_psy.c
@@ -299,7 +299,7 @@ static void celt_gauge_psy_weight(OpusPsyContext *s, OpusPsyStep **start,
     }
 
     tonal /= 1333136.0f;
-    f_out->spread = av_clip(lrintf(tonal), 0, 3);
+    f_out->spread = av_clip_uintp2(lrintf(tonal), 2);
 
     rate = ((float)s->avctx->bit_rate) + frame_bits*frame_size*16;
     rate *= s->lambda;
@@ -507,7 +507,7 @@ av_cold int ff_opus_psy_init(OpusPsyContext *s, AVCodecContext *avctx,
             ret = AVERROR(ENOMEM);
             goto fail;
         }
-        ff_generate_window_func(s->window[i], 2*len, WFUNC_SINE, &tmp);
+        generate_window_func(s->window[i], 2*len, WFUNC_SINE, &tmp);
         if ((ret = ff_mdct15_init(&s->mdct[i], 0, i + 3, 68 << (CELT_BLOCK_NB - 1 - i))))
             goto fail;
     }