[Mplayer-cvslog] CVS: main dll_init.c,1.12,1.13
Szabolcs Berecz
szabii at users.sourceforge.net
Tue Apr 24 01:15:00 CEST 2001
Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv1991
Modified Files:
dll_init.c
Log Message:
warnings killed
Index: dll_init.c
===================================================================
RCS file: /cvsroot/mplayer/main/dll_init.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** dll_init.c 2001/04/23 03:42:17 1.12
--- dll_init.c 2001/04/23 23:14:58 1.13
***************
*** 54,58 ****
printf("ACM_Decoder: Unappropriate audio format\n");
else
! printf("ACM_Decoder: acmStreamOpen error %d", ret);
sh_audio->srcstream=NULL;
return 0;
--- 54,58 ----
printf("ACM_Decoder: Unappropriate audio format\n");
else
! printf("ACM_Decoder: acmStreamOpen error %d", (int)ret);
sh_audio->srcstream=NULL;
return 0;
***************
*** 64,72 ****
if(srcsize<OUTBURST) srcsize=OUTBURST;
sh_audio->audio_out_minsize=srcsize; // audio output min. size
! if(verbose) printf("Audio ACM output buffer min. size: %d\n",srcsize);
acmStreamSize(sh_audio->srcstream, srcsize, &srcsize, ACM_STREAMSIZEF_DESTINATION);
sh_audio->audio_in_minsize=srcsize; // audio input min. size
! if(verbose) printf("Audio ACM input buffer min. size: %d\n",srcsize);
sh_audio->a_in_buffer_size=sh_audio->audio_in_minsize;
--- 64,72 ----
if(srcsize<OUTBURST) srcsize=OUTBURST;
sh_audio->audio_out_minsize=srcsize; // audio output min. size
! if(verbose) printf("Audio ACM output buffer min. size: %ld\n",srcsize);
acmStreamSize(sh_audio->srcstream, srcsize, &srcsize, ACM_STREAMSIZEF_DESTINATION);
sh_audio->audio_in_minsize=srcsize; // audio input min. size
! if(verbose) printf("Audio ACM input buffer min. size: %ld\n",srcsize);
sh_audio->a_in_buffer_size=sh_audio->audio_in_minsize;
***************
*** 82,86 ****
DWORD srcsize=0;
acmStreamSize(sh_audio->srcstream,len , &srcsize, ACM_STREAMSIZEF_DESTINATION);
! if(verbose>=3)printf("acm says: srcsize=%d (buffsize=%d) out_size=%d\n",srcsize,sh_audio->a_in_buffer_size,len);
// if(srcsize==0) srcsize=((WAVEFORMATEX *)&sh_audio->o_wf_ext)->nBlockAlign;
if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!!
--- 82,86 ----
DWORD srcsize=0;
acmStreamSize(sh_audio->srcstream,len , &srcsize, ACM_STREAMSIZEF_DESTINATION);
! if(verbose>=3)printf("acm says: srcsize=%ld (buffsize=%d) out_size=%d\n",srcsize,sh_audio->a_in_buffer_size,len);
// if(srcsize==0) srcsize=((WAVEFORMATEX *)&sh_audio->o_wf_ext)->nBlockAlign;
if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!!
***************
*** 100,109 ****
hr=acmStreamPrepareHeader(sh_audio->srcstream,&ash,0);
if(hr){
! printf("ACM_Decoder: acmStreamPrepareHeader error %d\n",hr);
return -1;
}
hr=acmStreamConvert(sh_audio->srcstream,&ash,0);
if(hr){
! printf("ACM_Decoder: acmStreamConvert error %d\n",hr);
return -1;
}
--- 100,109 ----
hr=acmStreamPrepareHeader(sh_audio->srcstream,&ash,0);
if(hr){
! printf("ACM_Decoder: acmStreamPrepareHeader error %d\n",(int)hr);
return -1;
}
hr=acmStreamConvert(sh_audio->srcstream,&ash,0);
if(hr){
! printf("ACM_Decoder: acmStreamConvert error %d\n",(int)hr);
return -1;
}
***************
*** 118,122 ****
hr=acmStreamUnprepareHeader(sh_audio->srcstream,&ash,0);
if(hr){
! printf("ACM_Decoder: acmStreamUnprepareHeader error %d\n",hr);
}
return len;
--- 118,122 ----
hr=acmStreamUnprepareHeader(sh_audio->srcstream,&ash,0);
if(hr){
! printf("ACM_Decoder: acmStreamUnprepareHeader error %d\n",(int)hr);
}
return len;
***************
*** 147,151 ****
ret = ICDecompressGetFormat(sh_video->hic, sh_video->bih, &sh_video->o_bih);
if(ret){
! printf("ICDecompressGetFormat failed: Error %d\n", ret);
return 0;
}
--- 147,151 ----
ret = ICDecompressGetFormat(sh_video->hic, sh_video->bih, &sh_video->o_bih);
if(ret){
! printf("ICDecompressGetFormat failed: Error %d\n", (int)ret);
return 0;
}
***************
*** 222,245 ****
if(verbose) {
printf("Starting decompression, format:\n");
! printf(" biSize %d\n", sh_video->bih->biSize);
! printf(" biWidth %d\n", sh_video->bih->biWidth);
! printf(" biHeight %d\n", sh_video->bih->biHeight);
printf(" biPlanes %d\n", sh_video->bih->biPlanes);
printf(" biBitCount %d\n", sh_video->bih->biBitCount);
! printf(" biCompression 0x%x ('%.4s')\n", sh_video->bih->biCompression, &sh_video->bih->biCompression);
! printf(" biSizeImage %d\n", sh_video->bih->biSizeImage);
printf("Dest fmt:\n");
! printf(" biSize %d\n", sh_video->o_bih.biSize);
! printf(" biWidth %d\n", sh_video->o_bih.biWidth);
! printf(" biHeight %d\n", sh_video->o_bih.biHeight);
printf(" biPlanes %d\n", sh_video->o_bih.biPlanes);
printf(" biBitCount %d\n", sh_video->o_bih.biBitCount);
! printf(" biCompression 0x%x ('%.4s')\n", sh_video->o_bih.biCompression, &sh_video->o_bih.biCompression);
! printf(" biSizeImage %d\n", sh_video->o_bih.biSizeImage);
}
ret = ICDecompressQuery(sh_video->hic, sh_video->bih, &sh_video->o_bih);
if(ret){
! printf("ICDecompressQuery failed: Error %d\n", ret);
return 0;
}
--- 222,245 ----
if(verbose) {
printf("Starting decompression, format:\n");
! printf(" biSize %ld\n", sh_video->bih->biSize);
! printf(" biWidth %ld\n", sh_video->bih->biWidth);
! printf(" biHeight %ld\n", sh_video->bih->biHeight);
printf(" biPlanes %d\n", sh_video->bih->biPlanes);
printf(" biBitCount %d\n", sh_video->bih->biBitCount);
! printf(" biCompression 0x%lx ('%.4s')\n", sh_video->bih->biCompression, (char *)&sh_video->bih->biCompression);
! printf(" biSizeImage %ld\n", sh_video->bih->biSizeImage);
printf("Dest fmt:\n");
! printf(" biSize %ld\n", sh_video->o_bih.biSize);
! printf(" biWidth %ld\n", sh_video->o_bih.biWidth);
! printf(" biHeight %ld\n", sh_video->o_bih.biHeight);
printf(" biPlanes %d\n", sh_video->o_bih.biPlanes);
printf(" biBitCount %d\n", sh_video->o_bih.biBitCount);
! printf(" biCompression 0x%lx ('%.4s')\n", sh_video->o_bih.biCompression, (char *)&sh_video->o_bih.biCompression);
! printf(" biSizeImage %ld\n", sh_video->o_bih.biSizeImage);
}
ret = ICDecompressQuery(sh_video->hic, sh_video->bih, &sh_video->o_bih);
if(ret){
! printf("ICDecompressQuery failed: Error %d\n", (int)ret);
return 0;
}
***************
*** 249,253 ****
ret = ICDecompressBegin(sh_video->hic, sh_video->bih, &sh_video->o_bih);
if(ret){
! printf("ICDecompressBegin failed: Error %d\n", ret);
return 0;
}
--- 249,253 ----
ret = ICDecompressBegin(sh_video->hic, sh_video->bih, &sh_video->o_bih);
if(ret){
! printf("ICDecompressBegin failed: Error %d\n", (int)ret);
return 0;
}
***************
*** 268,272 ****
sh_video->our_out_buffer = shmem_alloc(sh_video->o_bih.biSizeImage);
if(!sh_video->our_out_buffer){
! printf("not enough memory for decoded picture buffer (%d bytes)\n", sh_video->o_bih.biSizeImage);
return 0;
}
--- 268,272 ----
sh_video->our_out_buffer = shmem_alloc(sh_video->o_bih.biSizeImage);
if(!sh_video->our_out_buffer){
! printf("not enough memory for decoded picture buffer (%ld bytes)\n", sh_video->o_bih.biSizeImage);
return 0;
}
_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog
More information about the MPlayer-cvslog
mailing list