Mercurial > mplayer.hg

comparison libmpcodecs/ad_acm.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 c0068de90f44
children 3fe3b2b3a6ce
comparison
equal deleted inserted replaced
17365:e2ca21ac42ce 17366:934380353fd6
151 return(uninit(sh)); 151 return(uninit(sh));
152 case ACMERR_UNPREPARED: 152 case ACMERR_UNPREPARED:
153 case ACMERR_NOTPOSSIBLE: 153 case ACMERR_NOTPOSSIBLE:
154 return; 154 return;
155 default: 155 default:
156 mp_msg(MSGT_WIN32, MSGL_WARN, "ACM_Decoder: unknown error occurred: %d\n", ret); 156 mp_msg(MSGT_WIN32, MSGL_WARN, "ACM_Decoder: unknown error occurred: %ld\n", ret);
157 return; 157 return;
158 } 158 }
159 159
160 MSACM_UnregisterAllDrivers(); 160 MSACM_UnregisterAllDrivers();
161 161
187 DWORD srcsize=0; 187 DWORD srcsize=0;
188 DWORD len=minlen; 188 DWORD len=minlen;
189 acm_context_t *priv = sh_audio->context; 189 acm_context_t *priv = sh_audio->context;
190 190
191 acmStreamSize(priv->handle, len, &srcsize, ACM_STREAMSIZEF_DESTINATION); 191 acmStreamSize(priv->handle, len, &srcsize, ACM_STREAMSIZEF_DESTINATION);
192 mp_msg(MSGT_WIN32,MSGL_DBG3,"acm says: srcsize=%ld (buffsize=%d) out_size=%d\n",srcsize,sh_audio->a_in_buffer_size,len); 192 mp_msg(MSGT_WIN32,MSGL_DBG3,"acm says: srcsize=%ld (buffsize=%d) out_size=%ld\n",srcsize,sh_audio->a_in_buffer_size,len);
193 193
194 if(srcsize<sh_audio->wf->nBlockAlign){ 194 if(srcsize<sh_audio->wf->nBlockAlign){
195 srcsize=sh_audio->wf->nBlockAlign; 195 srcsize=sh_audio->wf->nBlockAlign;
196 acmStreamSize(priv->handle, srcsize, &len, ACM_STREAMSIZEF_SOURCE); 196 acmStreamSize(priv->handle, srcsize, &len, ACM_STREAMSIZEF_SOURCE);
197 if(len>maxlen) len=maxlen; 197 if(len>maxlen) len=maxlen;
202 if(sh_audio->a_in_buffer_len<srcsize){ 202 if(sh_audio->a_in_buffer_len<srcsize){
203 sh_audio->a_in_buffer_len+= 203 sh_audio->a_in_buffer_len+=
204 demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len], 204 demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len],
205 srcsize-sh_audio->a_in_buffer_len); 205 srcsize-sh_audio->a_in_buffer_len);
206 } 206 }
207 mp_msg(MSGT_WIN32,MSGL_DBG3,"acm convert %d -> %d bytes\n",sh_audio->a_in_buffer_len,len); 207 mp_msg(MSGT_WIN32,MSGL_DBG3,"acm convert %d -> %ld bytes\n",sh_audio->a_in_buffer_len,len);
208 memset(&ash, 0, sizeof(ash)); 208 memset(&ash, 0, sizeof(ash));
209 ash.cbStruct=sizeof(ash); 209 ash.cbStruct=sizeof(ash);
210 ash.fdwStatus=0; 210 ash.fdwStatus=0;
211 ash.dwUser=0; 211 ash.dwUser=0;
212 ash.pbSrc=sh_audio->a_in_buffer; 212 ash.pbSrc=sh_audio->a_in_buffer;
227 case ACMERR_UNPREPARED: 227 case ACMERR_UNPREPARED:
228 mp_msg(MSGT_WIN32, MSGL_DBG2, "ACM_Decoder: acmStreamConvert error: probarly not initialized!\n"); 228 mp_msg(MSGT_WIN32, MSGL_DBG2, "ACM_Decoder: acmStreamConvert error: probarly not initialized!\n");
229 } 229 }
230 // return -1; 230 // return -1;
231 } 231 }
232 mp_msg(MSGT_WIN32,MSGL_DBG2,"acm converted %d -> %d\n",ash.cbSrcLengthUsed,ash.cbDstLengthUsed); 232 mp_msg(MSGT_WIN32,MSGL_DBG2,"acm converted %ld -> %ld\n",ash.cbSrcLengthUsed,ash.cbDstLengthUsed);
233 if(ash.cbSrcLengthUsed>=sh_audio->a_in_buffer_len){ 233 if(ash.cbSrcLengthUsed>=sh_audio->a_in_buffer_len){
234 sh_audio->a_in_buffer_len=0; 234 sh_audio->a_in_buffer_len=0;
235 } else { 235 } else {
236 sh_audio->a_in_buffer_len-=ash.cbSrcLengthUsed; 236 sh_audio->a_in_buffer_len-=ash.cbSrcLengthUsed;
237 memcpy(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[ash.cbSrcLengthUsed],sh_audio->a_in_buffer_len); 237 memcpy(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[ash.cbSrcLengthUsed],sh_audio->a_in_buffer_len);