From 92d84f32528abba061f8b890d9718e2db5f9fba6 Mon Sep 17 00:00:00 2001 From: arpi_esp Date: Wed, 28 Mar 2001 21:45:12 +0000 Subject: finished DirectShow audio code git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@238 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index b556971ef5..98fd22a4be 100644 --- a/mplayer.c +++ b/mplayer.c @@ -1220,6 +1220,13 @@ if(has_audio==7){ if(!DS_AudioDecoder_Open(avi_header.audio_codec,avi_header.auds_guid,in_fmt)){ MP3_channels=avi_header.wf.nChannels; MP3_samplerate=avi_header.wf.nSamplesPerSec; + + avi_header.audio_in_minsize=2*avi_header.wf.nBlockAlign; + if(avi_header.audio_in_minsize<8192) avi_header.audio_in_minsize=8192; + a_in_buffer_size=avi_header.audio_in_minsize; + a_in_buffer=malloc(a_in_buffer_size); + a_in_buffer_len=0; + } else { printf("Could not load/initialize Win32/DirctShow AUDIO codec (missing .AX file?)\n"); if((in_fmt->wFormatTag)==0x55){ @@ -1489,6 +1496,33 @@ while(has_audio){ if(ret>0) a_buffer_len+=ret; break; } + case 7: // DirectShow + { int ret; + int len=a_buffer_size-a_buffer_len; + int size_in=0; + int size_out=0; + int srcsize=DS_AudioDecoder_GetSrcSize(len); + if(verbose>2)printf("DShow says: srcsize=%d (buffsize=%d) out_size=%d\n",srcsize,a_in_buffer_size,len); + if(srcsize>a_in_buffer_size) srcsize=a_in_buffer_size; // !!!!!! + if(a_in_buffer_len2)printf("DShow: audio %d -> %d converted (in_buf_len=%d of %d)\n",size_in,size_out,a_in_buffer_len,a_in_buffer_size); + if(size_in>=a_in_buffer_len){ + a_in_buffer_len=0; + } else { + a_in_buffer_len-=size_in; + memcpy(a_in_buffer,&a_in_buffer[size_in],a_in_buffer_len); + } + a_buffer_len+=size_out; + + break; + } + } } current_module=NULL; // Leave AUDIO decoder module -- cgit v1.2.3