changeset 1339:cf44bc209040 trunk

[svn] - improve resampling rate detection algorithm - remove debugging code
author nenolod
date Tue, 27 Jun 2006 20:32:51 -0700
parents a299e816c2fd
children eaa1b6342e75
files ChangeLog Plugins/Input/mpg123/mpg123.c Plugins/Input/mpg123/resample.c
diffstat 3 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jun 27 19:52:20 2006 -0700
+++ b/ChangeLog	Tue Jun 27 20:32:51 2006 -0700
@@ -1,3 +1,12 @@
+2006-06-28 02:52:20 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1588]
+  - add a note explaining that this algorithm sucks and will be discarded before 1.1 release
+  
+
+  Changes:        Modified:
+  +3 -0           trunk/Plugins/Input/mpg123/mpg123.c  
+
+
 2006-06-28 02:46:46 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1586]
   - add missing declaration
--- a/Plugins/Input/mpg123/mpg123.c	Tue Jun 27 19:52:20 2006 -0700
+++ b/Plugins/Input/mpg123/mpg123.c	Tue Jun 27 20:32:51 2006 -0700
@@ -740,7 +740,7 @@
 	if (fr.down_sample)
 	{
 	    long n = mpgdec_freqs[fr.sampling_frequency];
-	    long m = n / fr.down_sample + 1;
+	    long m = n / (fr.down_sample * 2);
 
 	    mpgdec_synth_ntom_set_step(n, m);
 
--- a/Plugins/Input/mpg123/resample.c	Tue Jun 27 19:52:20 2006 -0700
+++ b/Plugins/Input/mpg123/resample.c	Tue Jun 27 20:32:51 2006 -0700
@@ -45,8 +45,6 @@
 	n *= NTOM_MUL;
 	ntom_step = n / m;
 
-	printf("mpgdec_synth_to_ntom_set_step: calculated step: %ld skip-samples\n", ntom_step);
-
 	if(ntom_step > 8*NTOM_MUL) {
 		fprintf(stderr,"max. 1:8 conversion allowed!\n");
 		exit(1);