diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-10 20:11:31 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-10 20:11:31 +0000 |
| commit | 4ed2269c7bcf84052a9419a8ecb5a456d63b0844 (patch) | |
| tree | 2b6b6533a8abf0613737b20a72bf6f3bddc2c447 /dec_audio.c | |
| parent | 5bc4ac55eedf76d507c1960435f1694f41ed0410 (diff) | |
| download | mpv-4ed2269c7bcf84052a9419a8ecb5a456d63b0844.tar.bz2 mpv-4ed2269c7bcf84052a9419a8ecb5a456d63b0844.tar.xz | |
changed for updated DShow wrapper api
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3443 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dec_audio.c')
| -rw-r--r-- | dec_audio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dec_audio.c b/dec_audio.c index 7c0a04d3e3..d69086f864 100644 --- a/dec_audio.c +++ b/dec_audio.c @@ -52,6 +52,7 @@ int fakemono=0; #ifdef USE_DIRECTSHOW #include "loader/DirectShow/DS_AudioDec.h" +static void* ds_adec=NULL; #endif #ifdef HAVE_OGGVORBIS @@ -231,7 +232,7 @@ case AFM_DSHOW: #else // Win32 DShow audio codec: // printf("DShow_audio: channs=%d rate=%d\n",sh_audio->channels,sh_audio->samplerate); - if(DS_AudioDecoder_Open(sh_audio->codec->dll,&sh_audio->codec->guid,sh_audio->wf)){ + if(!(ds_adec=DS_AudioDecoder_Open(sh_audio->codec->dll,&sh_audio->codec->guid,sh_audio->wf))){ mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_MissingDLLcodec,sh_audio->codec->dll); driver=0; } else { @@ -977,7 +978,7 @@ int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen){ case AFM_DSHOW: // DirectShow { int size_in=0; int size_out=0; - int srcsize=DS_AudioDecoder_GetSrcSize(maxlen); + int srcsize=DS_AudioDecoder_GetSrcSize(ds_adec, maxlen); mp_msg(MSGT_DECAUDIO,MSGL_DBG3,"DShow says: srcsize=%d (buffsize=%d) out_size=%d\n",srcsize,sh_audio->a_in_buffer_size,maxlen); if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!! if(sh_audio->a_in_buffer_len<srcsize){ @@ -985,7 +986,7 @@ int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen){ demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len], srcsize-sh_audio->a_in_buffer_len); } - DS_AudioDecoder_Convert(sh_audio->a_in_buffer,sh_audio->a_in_buffer_len, + DS_AudioDecoder_Convert(ds_adec, sh_audio->a_in_buffer,sh_audio->a_in_buffer_len, buf,maxlen, &size_in,&size_out); mp_dbg(MSGT_DECAUDIO,MSGL_DBG2,"DShow: audio %d -> %d converted (in_buf_len=%d of %d) %d\n",size_in,size_out,sh_audio->a_in_buffer_len,sh_audio->a_in_buffer_size,ds_tell_pts(sh_audio->ds)); if(size_in>=sh_audio->a_in_buffer_len){ |