RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

DVD PCM audio support 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@402 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi_esp 2001-04-14 15:25:11 +00:00
parent b69222c3da
commit c412ed4241
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DOCS/codecs.conf
View File

@ -317,6 +317,12 @@ audiocodec pcm
format 0x1
driver pcm
audiocodec dvdpcm
info "Uncompressed DVD PCM"
status working
format 0x10001
driver dvdpcm
audiocodec ac3
info "AC3"
status working

1
codec-cfg.c
View File

@ -201,6 +201,7 @@ static short get_driver(char *s,int audioflag)
"alaw",
"msgsm",
"dshow",
"dvdpcm",
NULL
};
static char *videodrv[] = {

24
dec_audio.c
View File

@ -5,7 +5,7 @@ int driver=sh_audio->codec->driver;
sh_audio->samplesize=2;
sh_audio->samplerate=0;
sh_audio->pcm_bswap=0;
//sh_audio->pcm_bswap=0;
sh_audio->a_buffer_size=16384; // default size, maybe not enough for Win32/ACM
sh_audio->a_buffer=NULL;
@ -63,18 +63,18 @@ case 4: {
break;
}
case 2: {
// if(file_format==DEMUXER_TYPE_AVI){ // FIXME!!!!!!!
// AVI PCM Audio:
WAVEFORMATEX *h=&sh_audio->wf;
sh_audio->channels=h->nChannels;
sh_audio->samplerate=h->nSamplesPerSec;
sh_audio->samplesize=(h->wBitsPerSample+7)/8;
// } else {
// // DVD PCM audio:
// sh_audio->channels=2;
// sh_audio->samplerate=48000;
break;
}
case 8: {
// DVD PCM Audio:
sh_audio->channels=2;
sh_audio->samplerate=48000;
// sh_audio->pcm_bswap=1;
// }
break;
}
case 3: {
@ -149,17 +149,19 @@ int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int maxlen){
len=MP3_DecodeFrame(buf,-1);
sh_audio->channels=2; // hack
break;
case 2: // PCM
case 2: // AVI PCM
{ len=demux_read_data(sh_audio->ds,buf,OUTBURST);
if(sh_audio->pcm_bswap){
int j;
break;
}
case 8: // DVD PCM
{ int j;
len=demux_read_data(sh_audio->ds,buf,OUTBURST);
//if(i&1){ printf("Warning! pcm_audio_size&1 !=0 (%d)\n",i);i&=~1; }
for(j=0;j<len;j+=2){
char x=buf[j];
buf[j]=buf[j+1];
buf[j+1]=x;
}
}
break;
}
case 5: // aLaw decoder

2
mplayer.c
View File

@ -728,7 +728,7 @@ switch(file_format){
if(verbose) printf("detected MPG-PS audio format: %d\n",d_audio->type);
switch(d_audio->type){
case 1: sh_audio->format=0x50;break; // mpeg
case 2: sh_audio->format=0x2;break; // pcm
case 2: sh_audio->format=0x10001;break; // dvd pcm
case 3: sh_audio->format=0x2000;break; // ac3
default: has_audio=0; // unknown type
}