From 1908064274a0df78a896c4b8bac34669c9534137 Mon Sep 17 00:00:00 2001 From: arpi Date: Tue, 22 Jan 2002 02:15:23 +0000 Subject: [PATCH] passing samplerate to LPCM writer - 44, 32 and 96khz are also supported from now git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4301 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_mpegpes.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index 598db3673b..7936e7fa1c 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -22,12 +22,25 @@ static int control(int cmd,int arg){ 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 @@ static void audio_resume() } 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 @@ static int get_space(){ 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 @@ static int play(void* data,int len,int flags){ else { int i; unsigned short *s=data; +// if(len>2000) len=2000; + printf("ao_mpegpes: len=%d \n",len); for(i=0;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; }