[Mplayer-cvslog] CVS: main dll_init.c,1.36,1.37

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv12037

Modified Files:
	dll_init.c 
Log Message:
added in/out format debug to acm init like in vfw init (for testing vivo decoder dll :)

Index: dll_init.c
===================================================================
RCS file: /cvsroot/mplayer/main/dll_init.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- dll_init.c	14 Nov 2001 11:16:45 -0000	1.36
+++ dll_init.c	10 Dec 2001 17:22:52 -0000	1.37
@@ -51,8 +51,29 @@
     sh_audio->o_wf.wFormatTag=WAVE_FORMAT_PCM;
     sh_audio->o_wf.nBlockAlign=2*in_fmt->nChannels;
     sh_audio->o_wf.wBitsPerSample=16;
+//    sh_audio->o_wf.wBitsPerSample=in_fmt->wBitsPerSample;
     sh_audio->o_wf.cbSize=0;
 
+    if(verbose) {
+	printf("Input format:\n");
+	    printf("  wFormatTag %d\n", in_fmt->wFormatTag);
+	    printf("  nChannels %d\n", in_fmt->nChannels);
+	    printf("  nSamplesPerSec %ld\n", in_fmt->nSamplesPerSec);
+	    printf("  nAvgBytesPerSec %d\n", in_fmt->nAvgBytesPerSec);
+	    printf("  nBlockAlign %d\n", in_fmt->nBlockAlign);
+	    printf("  wBitsPerSample %d\n", in_fmt->wBitsPerSample);
+	    printf("  cbSize %d\n", in_fmt->cbSize);
+	printf("Output fmt:\n");
+	    printf("  wFormatTag %d\n", sh_audio->o_wf.wFormatTag);
+	    printf("  nChannels %d\n", sh_audio->o_wf.nChannels);
+	    printf("  nSamplesPerSec %ld\n", sh_audio->o_wf.nSamplesPerSec);
+	    printf("  nAvgBytesPerSec %d\n", sh_audio->o_wf.nAvgBytesPerSec);
+	    printf("  nBlockAlign %d\n", sh_audio->o_wf.nBlockAlign);
+	    printf("  wBitsPerSample %d\n", sh_audio->o_wf.wBitsPerSample);
+	    printf("  cbSize %d\n", sh_audio->o_wf.cbSize);
+    }
+
+
     win32_codec_name = sh_audio->codec->dll;
     ret=acmStreamOpen(&sh_audio->srcstream,(HACMDRIVER)NULL,
                     in_fmt,&sh_audio->o_wf,
@@ -132,7 +153,12 @@
         hr=acmStreamConvert(sh_audio->srcstream,&ash,0);
         if(hr){
           mp_msg(MSGT_WIN32,MSGL_DBG2,"ACM_Decoder: acmStreamConvert error %d\n",(int)hr);
-          
+          switch(hr)
+	  {
+	    case ACMERR_NOTPOSSIBLE:
+	    case ACMERR_UNPREPARED:
+		mp_msg(MSGT_WIN32, MSGL_DBG2, "ACM_Decoder: acmStreamConvert error: probarly not initialized!\n");
+	  }  
 //					return -1;
         }
         if(verbose>1)