Skip to contentSkip to conversation

i810_audio mono troubles

DISCUSSION Greg Pomerantz 2 participants 2 messages Dec 18, 2001

lore
Share & tools
lore
#0 lore raw

+++ drivers/sound/i810_audio.c Mon Dec 17 23:15:19 2001
@@ -609,6 +609,9 @@

new_rate = ac97_set_dac_rate(codec, rate);

+ if ((dmabuf->fmt & I810_FMT_STEREO) == 0)
+ new_rate *= 2;
+
if(new_rate != rate) {
dmabuf->rate = (new_rate * 48000)/clocking;
}
@@ -1687,6 +1690,12 @@
if (dmabuf->enable & ADC_RUNNING) {
stop_adc(state);
}
+
+ if (*(int *)arg == 0)
+ dmabuf->fmt &= ~I810_FMT_STEREO;
+ else
+ dmabuf->fmt |= I810_FMT_STEREO;
+
return put_user(1, (int *)arg);

case SNDCTL_DSP_GETBLKSIZE:

#1 lore raw
Quoted 14 lines · Greg Pomerantz

+++ drivers/sound/i810_audio.c Mon Dec 17 23:15:19 2001

(quoted diff) +3 -0
@@ -609,6 +609,9 @@
 
 	new_rate = ac97_set_dac_rate(codec, rate);
 
+	if ((dmabuf->fmt & I810_FMT_STEREO) == 0)
+		new_rate *= 2;
+
 	if(new_rate != rate) {
 		dmabuf->rate = (new_rate * 48000)/clocking;
 	}
@@ -1687,6 +1690,12 @@
 		if (dmabuf->enable & ADC_RUNNING) {
 			stop_adc(state);

Review line 1701

Quoted 10 lines
(quoted diff) +6 -0
 		}
+
+		if (*(int *)arg == 0)
+			dmabuf->fmt &= ~I810_FMT_STEREO;
+		else
+			dmabuf->fmt |= I810_FMT_STEREO;
+
 		return put_user(1, (int *)arg);
 
 	case SNDCTL_DSP_GETBLKSIZE:

OK, first off, Alan & Co. will shoot this one down because handling stereo/mono conversion belongs in user space (the agreed upon way of handling things evidently). Secondly, aside from that point, this is wrong anyway. You are dividing the play rate in half to compensate for the fact that the sound is being sent to two channels instead of one. So, now each channel is playing at half speed and slightly out of phase and with much reduced high frequency clarity. Instead, what you should do, is byte double the stream (CPU consuming). You would need to take any input buffer and copy every 16bit sample. A very simple (and non-optimized) stereo converter
might look like this:

short *input=&input_buffer, *output=&output_buffer; int i,j;

for(i=0, j=0;i < input_size;i++, j+=2)

	output[j] = output[j+1] = input[i];
Signature · 3 lines
 Doug Ledford <[email protected]>  http://people.redhat.com/dledford
      Please check my web site for aic7xxx updates/answers before
                      e-mailing me about problems