have less functions as inline

[ffmpeg] / libavcodec / resample2.c

diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c
index e88e709e78b037dc481a18e9571c37f7a86f6402..ffd6fc71c637475cd7e73f888901198968091e83 100644 (file)
--- a/libavcodec/resample2.c
+++ b/libavcodec/resample2.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
@@ -27,7 +26,6 @@
  */
 
 #include "avcodec.h"
-#include "common.h"
 #include "dsputil.h"
 
 #ifndef CONFIG_RESAMPLE_HP
@@ -40,7 +38,7 @@
 #define FELEM_MIN INT16_MIN
 #define WINDOW_TYPE 9
 #elif !defined(CONFIG_RESAMPLE_AUDIOPHILE_KIDDY_MODE)
-#define FILTER_SHIFT 22
+#define FILTER_SHIFT 30
 
 #define FELEM int32_t
 #define FELEM2 int64_t
@@ -51,9 +49,9 @@
 #else
 #define FILTER_SHIFT 0
 
-#define FELEM long double
-#define FELEM2 long double
-#define FELEML long double
+#define FELEM double
+#define FELEM2 double
+#define FELEML double
 #define WINDOW_TYPE 24
 #endif
 
@@ -95,7 +93,7 @@ static double bessel(double x){
  * @param type 0->cubic, 1->blackman nuttall windowed sinc, 2..16->kaiser windowed sinc beta=2..16
  */
 void av_build_filter(FELEM *filter, double factor, int tap_count, int phase_count, int scale, int type){
-    int ph, i, v;
+    int ph, i;
     double x, y, w, tab[tap_count];
     const int center= (tap_count-1)/2;
 
@@ -178,8 +176,8 @@ void av_build_filter(FELEM *filter, double factor, int tap_count, int phase_coun
 }
 
 /**
- * initalizes a audio resampler.
- * note, if either rate is not a integer then simply scale both rates up so they are
+ * Initializes an audio resampler.
+ * Note, if either rate is not an integer then simply scale both rates up so they are.
  */
 AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_size, int phase_shift, int linear, double cutoff){
     AVResampleContext *c= av_mallocz(sizeof(AVResampleContext));
@@ -268,13 +266,12 @@ int av_resample(AVResampleContext *c, short *dst, short *src, int *consumed, int
         }else if(sample_index + c->filter_length > src_size){
             break;
         }else if(c->linear){
-            int64_t v=0;
-            int sub_phase= (frac<<8) / c->src_incr;
+            FELEM2 v2=0;
             for(i=0; i<c->filter_length; i++){
-                FELEML coeff= filter[i]*(256 - sub_phase) + filter[i + c->filter_length]*sub_phase;
-                v += src[sample_index + i] * coeff;
+                val += src[sample_index + i] * (FELEM2)filter[i];
+                v2  += src[sample_index + i] * (FELEM2)filter[i + c->filter_length];
             }
-            val= v>>8;
+            val+=(v2-val)*(FELEML)frac / c->src_incr;
         }else{
             for(i=0; i<c->filter_length; i++){
                 val += src[sample_index + i] * (FELEM2)filter[i];