mirror of
https://github.com/mpv-player/mpv
synced 2025-01-23 16:13:39 +00:00
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
This commit is contained in:
parent
35b41e3920
commit
1908064274
@ -22,6 +22,9 @@ static int control(int cmd,int arg){
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int freq_id=0;
|
||||||
|
|
||||||
// open & setup audio device
|
// open & setup audio device
|
||||||
// return: 1=success 0=fail
|
// return: 1=success 0=fail
|
||||||
static int init(int rate,int channels,int format,int flags){
|
static int init(int rate,int channels,int format,int flags){
|
||||||
@ -29,6 +32,16 @@ static int init(int rate,int channels,int format,int flags){
|
|||||||
ao_data.outburst=2000;
|
ao_data.outburst=2000;
|
||||||
ao_data.format=format;
|
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;
|
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_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;
|
extern int vo_pts;
|
||||||
|
|
||||||
// return: how many bytes can be played without blocking
|
// return: how many bytes can be played without blocking
|
||||||
@ -64,6 +77,7 @@ static int get_space(){
|
|||||||
int y;
|
int y;
|
||||||
if(x<=0) return 0;
|
if(x<=0) return 0;
|
||||||
y=48000*4*x;y/=ao_data.outburst;y*=ao_data.outburst;
|
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);
|
// printf("diff: %5.3f -> %d \n",x,y);
|
||||||
return y;
|
return y;
|
||||||
}
|
}
|
||||||
@ -77,8 +91,10 @@ static int play(void* data,int len,int flags){
|
|||||||
else {
|
else {
|
||||||
int i;
|
int i;
|
||||||
unsigned short *s=data;
|
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
|
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;
|
return len;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user