[Mplayer-cvslog] CVS: main/libao2 ao_mpegpes.c,1.2,1.3

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libao2
In directory mplayer:/var/tmp.root/cvs-serv6331

Modified Files:
	ao_mpegpes.c 
Log Message:
passing samplerate to LPCM writer - 44, 32 and 96khz are also supported from now

Index: ao_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_mpegpes.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ao_mpegpes.c	24 Nov 2001 05:21:22 -0000	1.2
+++ ao_mpegpes.c	22 Jan 2002 02:15:23 -0000	1.3
@@ -22,12 +22,25 @@
     return -1;
 }
 
+
+static int freq_id=0;
+
 // open & setup audio device
 // return: 1=success 0=fail
 static int init(int rate,int channels,int format,int flags){
 
     ao_data.outburst=2000;
     ao_data.format=format;
+    
+    switch(rate){
+	case 48000:	freq_id=0;break;
+	case 96000:	freq_id=1;break;
+	case 44100:	freq_id=2;break;
+	case 32000:	freq_id=3;break;
+	default:
+	    fprintf(stderr,"ao_mpegpes: %d Hz not supported, try to resample (RTFM)\n",rate);
+	    return 0;
+    }
 
     return 1;
 }
@@ -55,7 +68,7 @@
 }
 
 void send_pes_packet(unsigned char* data,int len,int id,int timestamp);
-void send_lpcm_packet(unsigned char* data,int len,int id,int timestamp);
+void send_lpcm_packet(unsigned char* data,int len,int id,int timestamp,int freq_id);
 extern int vo_pts;
 
 // return: how many bytes can be played without blocking
@@ -64,6 +77,7 @@
     int y;
     if(x<=0) return 0;
     y=48000*4*x;y/=ao_data.outburst;y*=ao_data.outburst;
+//    if(y>2000) y=2000;
 //    printf("diff: %5.3f -> %d  \n",x,y);
     return y;
 }
@@ -77,8 +91,10 @@
     else {
 	int i;
 	unsigned short *s=data;
+//	if(len>2000) len=2000;
+	printf("ao_mpegpes: len=%d  \n",len);
 	for(i=0;i<len/2;i++) s[i]=(s[i]>>8)|(s[i]<<8); // le<->be
-	send_lpcm_packet(data,len,0xA0,ao_data.pts);
+	send_lpcm_packet(data,len,0xA0,ao_data.pts,freq_id);
     }
     return len;
 }