Mercurial > mplayer.hg

comparison libmpcodecs/ad_faad.c @ 17366:934380353fd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
massive attack: mp_msg printf format fixes
author rathann
date Thu, 12 Jan 2006 20:04:36 +0000
parents 6ff3379a0862
children caac2ca98168
comparison
equal deleted inserted replaced
17365:e2ca21ac42ce 17366:934380353fd6
149 faacDecClose(faac_hdec); 149 faacDecClose(faac_hdec);
150 // XXX: free a_in_buffer here or in uninit? 150 // XXX: free a_in_buffer here or in uninit?
151 return 0; 151 return 0;
152 } else { 152 } else {
153 mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Decoder init done (%dBytes)!\n", sh->a_in_buffer_len); // XXX: remove or move to debug! 153 mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Decoder init done (%dBytes)!\n", sh->a_in_buffer_len); // XXX: remove or move to debug!
154 mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Negotiated samplerate: %dHz channels: %d\n", faac_samplerate, faac_channels); 154 mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Negotiated samplerate: %ldHz channels: %d\n", faac_samplerate, faac_channels);
155 sh->channels = faac_channels; 155 sh->channels = faac_channels;
156 if (audio_output_channels <= 2) sh->channels = faac_channels > 1 ? 2 : 1; 156 if (audio_output_channels <= 2) sh->channels = faac_channels > 1 ? 2 : 1;
157 sh->samplerate = faac_samplerate; 157 sh->samplerate = faac_samplerate;
158 sh->samplesize=2; 158 sh->samplesize=2;
159 //sh->o_bps = sh->samplesize*faac_channels*faac_samplerate; 159 //sh->o_bps = sh->samplesize*faac_channels*faac_samplerate;
264 faacDecGetErrorMessage(faac_finfo.error)); 264 faacDecGetErrorMessage(faac_finfo.error));
265 } else if (faac_finfo.samples == 0) { 265 } else if (faac_finfo.samples == 0) {
266 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: Decoded zero samples!\n"); 266 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: Decoded zero samples!\n");
267 } else { 267 } else {
268 /* XXX: samples already multiplied by channels! */ 268 /* XXX: samples already multiplied by channels! */
269 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: Successfully decoded frame (%d Bytes)!\n", 269 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: Successfully decoded frame (%ld Bytes)!\n",
270 sh->samplesize*faac_finfo.samples); 270 sh->samplesize*faac_finfo.samples);
271 memcpy(buf+len,faac_sample_buffer, sh->samplesize*faac_finfo.samples); 271 memcpy(buf+len,faac_sample_buffer, sh->samplesize*faac_finfo.samples);
272 last_dec_len = sh->samplesize*faac_finfo.samples; 272 last_dec_len = sh->samplesize*faac_finfo.samples;
273 len += last_dec_len; 273 len += last_dec_len;
274 //printf("FAAD: buffer: %d bytes consumed: %d \n", k, faac_finfo.bytesconsumed); 274 //printf("FAAD: buffer: %d bytes consumed: %d \n", k, faac_finfo.bytesconsumed);