# HG changeset patch # User arpi # Date 997877340 0 # Node ID 81aa2d701ae001b124b996ce1726232a5ad496ad # Parent a444bd456fcc32f748b2a0c914f7ed245a448089 o_bps changes for hwac3 driver diff -r a444bd456fcc -r 81aa2d701ae0 dec_audio.c --- a/dec_audio.c Wed Aug 15 11:50:55 2001 +0000 +++ b/dec_audio.c Wed Aug 15 12:09:00 2001 +0000 @@ -69,6 +69,7 @@ #endif sh_audio->samplerate=0; //sh_audio->pcm_bswap=0; +sh_audio->o_bps=0; sh_audio->a_buffer_size=0; sh_audio->a_buffer=NULL; @@ -230,7 +231,8 @@ unsigned char *buffer; struct hwac3info ai; int len, skipped; - len = ds_get_packet(sh_audio->ds, &buffer); + len = ds_get_packet(sh_audio->ds, &buffer); // maybe 1 packet is not enough, + // at least for mpeg, PS packets contain about max. 2000 bytes of data. if(ac3_iec958_parse_syncinfo(buffer, len, &ai, &skipped) < 0) { fprintf(stderr, "AC3 stream not valid.\n"); driver = 0; @@ -242,10 +244,11 @@ break; } sh_audio->samplerate=ai.samplerate; -// sh_audio->samplesize=ai.framesize; + sh_audio->samplesize=ai.framesize; sh_audio->channels=1; sh_audio->i_bps=ai.bitrate*(1000/8); sh_audio->ac3_frame=malloc(6144); + sh_audio->o_bps=sh_audio->i_bps; // XXX FIXME!!! XXX break; } case AFM_ALAW: { @@ -293,10 +296,10 @@ if(!driver){ if(sh_audio->a_buffer) free(sh_audio->a_buffer); sh_audio->a_buffer=NULL; - sh_audio->o_bps=0; return 0; } + if(!sh_audio->o_bps) sh_audio->o_bps=sh_audio->channels*sh_audio->samplerate*sh_audio->samplesize; return driver; }