x86/vp9: add avx2 subpel MC SIMD for 10/12bpp

[ffmpeg] / libavcodec / aacenc_is.h

diff --git a/libavcodec/aacenc_is.h b/libavcodec/aacenc_is.h
index abb9b32daf54b29034eed2eaf5feaaa5eb8b0315..31bbacac5800460ceb8279a132d771d44f97d1d7 100644 (file)
--- a/libavcodec/aacenc_is.h
+++ b/libavcodec/aacenc_is.h
@@ -25,13 +25,15 @@
  * @author Rostislav Pehlivanov ( atomnuker gmail com )
  */
 
-#ifndef AVCODEC_AACENC_INTENSITY_STEREO_H
-#define AVCODEC_AACENC_INTENSITY_STEREO_H
+#ifndef AVCODEC_AACENC_IS_H
+#define AVCODEC_AACENC_IS_H
+
+#include "aacenc.h"
 
 /** Frequency in Hz for lower limit of intensity stereo **/
 #define INT_STEREO_LOW_LIMIT 6100
 
-struct is_error {
+struct AACISError {
     int pass;    /* 1 if dist2 <= dist1  */
     int phase;   /* -1 or +1             */
     float error; /* fabs(dist1 - dist2)  */
@@ -39,9 +41,10 @@ struct is_error {
     float dist2; /* From IS'd coeffs     */
 };
 
-struct is_error calc_is_encoding_err(AACEncContext *s, ChannelElement *cpe,
-                                     int start, int g, int w, float ener0,
-                                     float ener1, float ener01, int phase);
-void search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe);
+struct AACISError ff_aac_is_encoding_err(AACEncContext *s, ChannelElement *cpe,
+                                         int start, int w, int g, float ener0,
+                                         float ener1, float ener01,
+                                         int use_pcoeffs, int phase);
+void ff_aac_search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe);
 
-#endif /* AVCODEC_AACENC_INTENSITY_STEREO_H */
+#endif /* AVCODEC_AACENC_IS_H */