set more reasonable cutoff for audio rate conversion
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Mar 2007 14:27:16 +0000 (14:27 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Mar 2007 14:27:16 +0000 (14:27 +0000)
Originally committed as revision 8486 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/resample.c
tests/ffmpeg.regression.ref
tests/libav.regression.ref
tests/rotozoom.regression.ref

index 043e812..ea5c6d6 100644 (file)
@@ -161,7 +161,8 @@ ReSampleContext *audio_resample_init(int output_channels, int input_channels,
     if(s->filter_channels>2)
       s->filter_channels = 2;
 
     if(s->filter_channels>2)
       s->filter_channels = 2;
 
-    s->resample_context= av_resample_init(output_rate, input_rate, 16, 10, 0, 1.0);
+#define TAPS 16
+    s->resample_context= av_resample_init(output_rate, input_rate, TAPS, 10, 0, 0.8);
 
     return s;
 }
 
     return s;
 }
index 3075776..69c6cc9 100644 (file)
@@ -166,12 +166,12 @@ stddev: 10.98 PSNR:27.30 bytes:7602176
 83f8df5d5f84480566af548bb037fceb *./data/out.wav
 stddev:9330.70 PSNR:16.92 bytes:1054720
 stddev:4396.13 PSNR:23.46 bytes:1052672
 83f8df5d5f84480566af548bb037fceb *./data/out.wav
 stddev:9330.70 PSNR:16.92 bytes:1054720
 stddev:4396.13 PSNR:23.46 bytes:1052672
-aefe11ab5067621a1c674859d6413891 *./data/a-ac3.rm
+dd68110cb7e5388392f89d5160d3a825 *./data/a-ac3.rm
 98203 ./data/a-ac3.rm
 98203 ./data/a-ac3.rm
-d3fff6ca152764d2c06e5cfcb314eff4 *./data/a-g726.wav
-24280 ./data/a-g726.wav
-2e59930d3078b2e8f9b5c9f5c5471c4f *./data/out.wav
-stddev:8465.92 PSNR:17.77 bytes:96256
+39878597b1d65cce473639a7d8c93b02 *./data/a-g726.wav
+24279 ./data/a-g726.wav
+888f2f016e608d044a1bacbca5497ed2 *./data/out.wav
+stddev:8368.02 PSNR:17.87 bytes:96256
 de3f0e1f50b19bd8572fdd3dee2e72c4 *./data/a-adpcm_ima.wav
 266300 ./data/a-adpcm_ima.wav
 60178d48204f5662d91776e36eddc82e *./data/out.wav
 de3f0e1f50b19bd8572fdd3dee2e72c4 *./data/a-adpcm_ima.wav
 266300 ./data/a-adpcm_ima.wav
 60178d48204f5662d91776e36eddc82e *./data/out.wav
index 7a1f38e..5aba127 100644 (file)
@@ -5,7 +5,7 @@ ffmpeg regression test
 786446e80ead936e5faa8f5908f19281 *./data/b-libav.asf
 339775 ./data/b-libav.asf
 ./data/b-libav.asf CRC=0x74113749
 786446e80ead936e5faa8f5908f19281 *./data/b-libav.asf
 339775 ./data/b-libav.asf
 ./data/b-libav.asf CRC=0x74113749
-1ce78eeb6881ffe5b649a9b5105de919 *./data/b-libav.rm
+1ad618e9fd318eb3483270cf9b9b3f43 *./data/b-libav.rm
 355405 ./data/b-libav.rm
 bdb7484c68db722f66ba1630cf79844c *./data/b-libav.mpg
 378880 ./data/b-libav.mpg
 355405 ./data/b-libav.rm
 bdb7484c68db722f66ba1630cf79844c *./data/b-libav.mpg
 378880 ./data/b-libav.mpg
@@ -25,12 +25,12 @@ f8ad5bd78f4d012a8ce9570aa395ac54 *./data/b-libav.flv
 16518706f425cb537362bfc1c58b8de5 *./data/b-libav.mov
 366923 ./data/b-libav.mov
 ./data/b-libav.mov CRC=0x45079dca
 16518706f425cb537362bfc1c58b8de5 *./data/b-libav.mov
 366923 ./data/b-libav.mov
 ./data/b-libav.mov CRC=0x45079dca
-8e9e0b1e7ceabc8640a5dfaf052d1675 *./data/b-libav.dv
+7820fa85ab86c62028d8dbda94589573 *./data/b-libav.dv
 3600000 ./data/b-libav.dv
 3600000 ./data/b-libav.dv
-./data/b-libav.dv CRC=0x39821db0
-193ade994aa9512e326cbc237f480b28 *./data/b-libav.gxf
+./data/b-libav.dv CRC=0xf517e829
+feb04ba3cf4f607d5527664eb69ec72e *./data/b-libav.gxf
 814640 ./data/b-libav.gxf
 814640 ./data/b-libav.gxf
-./data/b-libav.gxf CRC=0xaba4e1c5
+./data/b-libav.gxf CRC=0xa376c09e
 9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm
  317075 ./data/b-libav.pbm
 ./data/b-libav.pbm CRC=0xb92906cb
 9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm
  317075 ./data/b-libav.pbm
 ./data/b-libav.pbm CRC=0xb92906cb
index 453cbee..22c6e6b 100644 (file)
@@ -166,12 +166,12 @@ stddev:  3.44 PSNR:37.39 bytes:7602176
 83f8df5d5f84480566af548bb037fceb *./data/out.wav
 stddev:9330.70 PSNR:16.92 bytes:1054720
 stddev:4396.13 PSNR:23.46 bytes:1052672
 83f8df5d5f84480566af548bb037fceb *./data/out.wav
 stddev:9330.70 PSNR:16.92 bytes:1054720
 stddev:4396.13 PSNR:23.46 bytes:1052672
-aefe11ab5067621a1c674859d6413891 *./data/a-ac3.rm
+dd68110cb7e5388392f89d5160d3a825 *./data/a-ac3.rm
 98203 ./data/a-ac3.rm
 98203 ./data/a-ac3.rm
-d3fff6ca152764d2c06e5cfcb314eff4 *./data/a-g726.wav
-24280 ./data/a-g726.wav
-2e59930d3078b2e8f9b5c9f5c5471c4f *./data/out.wav
-stddev:8465.92 PSNR:17.77 bytes:96256
+39878597b1d65cce473639a7d8c93b02 *./data/a-g726.wav
+24279 ./data/a-g726.wav
+888f2f016e608d044a1bacbca5497ed2 *./data/out.wav
+stddev:8368.02 PSNR:17.87 bytes:96256
 de3f0e1f50b19bd8572fdd3dee2e72c4 *./data/a-adpcm_ima.wav
 266300 ./data/a-adpcm_ima.wav
 60178d48204f5662d91776e36eddc82e *./data/out.wav
 de3f0e1f50b19bd8572fdd3dee2e72c4 *./data/a-adpcm_ima.wav
 266300 ./data/a-adpcm_ima.wav
 60178d48204f5662d91776e36eddc82e *./data/out.wav