Mercurial > mplayer.hg
diff dec_audio.c @ 1289:3f490fad9bdf
some code clanup (first step to libdemuxer)
author | arpi |
---|---|
date | Sat, 07 Jul 2001 18:46:15 +0000 |
parents | cab5ba9ffc6c |
children | 36ed1692c0b8 |
line wrap: on
line diff
--- a/dec_audio.c Sat Jul 07 16:37:02 2001 +0000 +++ b/dec_audio.c Sat Jul 07 18:46:15 2001 +0000 @@ -31,11 +31,11 @@ #include "loader/DirectShow/DS_AudioDec.h" -static sh_audio_t* ac3_audio_sh=NULL; +static sh_audio_t* dec_audio_sh=NULL; // AC3 decoder buffer callback: static void ac3_fill_buffer(uint8_t **start,uint8_t **end){ - int len=ds_get_packet(ac3_audio_sh->ds,start); + int len=ds_get_packet(dec_audio_sh->ds,start); //printf("<ac3:%d>\n",len); if(len<0) *start = *end = NULL; @@ -43,6 +43,13 @@ *end = *start + len; } +// MP3 decoder buffer callback: +int mplayer_audio_read(char *buf,int size){ + int len; + len=demux_read_data(dec_audio_sh->ds,buf,size); + return len; +} + int init_audio(sh_audio_t *sh_audio){ @@ -177,7 +184,7 @@ } case 3: { // Dolby AC3 audio: - ac3_audio_sh=sh_audio; // save sh_audio for the callback: + dec_audio_sh=sh_audio; // save sh_audio for the callback: ac3_config.fill_buffer_callback = ac3_fill_buffer; ac3_config.num_output_ch = 2; ac3_config.flags = 0; @@ -221,6 +228,7 @@ } case 1: { // MPEG Audio: + dec_audio_sh=sh_audio; // save sh_audio for the callback: #ifdef USE_FAKE_MONO MP3_Init(fakemono); #else