[MPlayer-cvslog] CVS: main/libmpcodecs ad_acm.c, 1.16, 1.17 ad_twin.c, 1.2, 1.3 ae_lame.c, 1.5, 1.6 vd.c, 1.83, 1.84 vd_ffmpeg.c, 1.159, 1.160 vd_vfw.c, 1.27, 1.28 vf_scale.c, 1.65, 1.66
Diego Biurrun CVS
syncmail at mplayerhq.hu
Fri Mar 24 09:12:05 CET 2006
CVS change done by Diego Biurrun CVS
Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv19521/libmpcodecs
Modified Files:
ad_acm.c ad_twin.c ae_lame.c vd.c vd_ffmpeg.c vd_vfw.c
vf_scale.c
Log Message:
Convert all if(verbose>X) to mp_msg_test calls.
Index: ad_acm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_acm.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ad_acm.c 12 Jan 2006 20:04:34 -0000 1.16
+++ ad_acm.c 24 Mar 2006 08:12:02 -0000 1.17
@@ -74,7 +74,7 @@
// priv->o_wf->wBitsPerSample = inf_fmt->wBitsPerSample;
priv->o_wf->cbSize = 0;
- if (verbose>0)
+ if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) )
{
mp_msg(MSGT_DECAUDIO, MSGL_V, "Input format:\n");
print_wave_header(in_fmt);
@@ -98,7 +98,7 @@
mp_msg(MSGT_WIN32, MSGL_V, "Audio codec opened OK! ;-)\n");
acmStreamSize(priv->handle, in_fmt->nBlockAlign, &srcsize, ACM_STREAMSIZEF_SOURCE);
- //if (verbose) printf("Audio ACM output buffer min. size: %ld (reported by codec)\n", srcsize);
+ //if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) ) printf("Audio ACM output buffer min. size: %ld (reported by codec)\n", srcsize);
srcsize *= 2;
//if (srcsize < MAX_OUTBURST) srcsize = MAX_OUTBURST;
if (!srcsize)
Index: ad_twin.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_twin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ad_twin.c 18 Nov 2005 14:39:21 -0000 1.2
+++ ad_twin.c 24 Mar 2006 08:12:02 -0000 1.3
@@ -110,11 +110,11 @@
priv->o_wf.wBitsPerSample=in_fmt->wBitsPerSample;
priv->o_wf.cbSize=0;
- if(verbose)
+ if( mp_msg_test(MSGT_DECAUDIO,MSGL_V) )
{
- mp_msg(MSGT_DECAUDIO, MSGL_INFO, "Input format:\n");
+ mp_msg(MSGT_DECAUDIO, MSGL_V, "Input format:\n");
print_wave_header(in_fmt);
- mp_msg(MSGT_DECAUDIO, MSGL_INFO, "Output fmt:\n");
+ mp_msg(MSGT_DECAUDIO, MSGL_V, "Output fmt:\n");
print_wave_header(&priv->o_wf);
}
memcpy(&priv->hi,&in_fmt[1],sizeof(headerInfo));
Index: ae_lame.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ae_lame.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ae_lame.c 18 Nov 2005 14:39:21 -0000 1.5
+++ ae_lame.c 24 Mar 2006 08:12:02 -0000 1.6
@@ -70,7 +70,6 @@
static int pass;
-extern int verbose;
static int bind_lame(audio_encoder_t *encoder, muxer_stream_t *mux_a)
{
@@ -192,7 +191,7 @@
mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_LameCantInit);
return 0;
}
- if(verbose>0) {
+ if( mp_msg_test(MSGT_MENCODER,MSGL_V) ) {
lame_print_config(lame);
lame_print_internals(lame);
}
Index: vd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- vd.c 18 Apr 2005 15:52:37 -0000 1.83
+++ vd.c 24 Mar 2006 08:12:02 -0000 1.84
@@ -174,7 +174,7 @@
// check if libvo and codec has common outfmt (no conversion):
csp_again:
- if(verbose>0){
+ if( mp_msg_test(MSGT_DECVIDEO,MSGL_V) ){
vf_instance_t* f=vf;
mp_msg(MSGT_DECVIDEO,MSGL_V,"Trying filter chain:");
for(f = vf ; f ; f = f->next)
Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- vd_ffmpeg.c 8 Feb 2006 23:22:29 -0000 1.159
+++ vd_ffmpeg.c 24 Mar 2006 08:12:02 -0000 1.160
@@ -1001,7 +1001,7 @@
}
assert(avctx->draw_horiz_band == mc_render_slice);
assert(avctx->release_buffer == mc_release_buffer);
- if(verbose > 4)
+ if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) )
printf("vd_ffmpeg::mc_get_buffer\n");
if(init_vo(sh,avctx->pix_fmt) < 0){
@@ -1068,7 +1068,7 @@
pic->type= FF_BUFFER_TYPE_USER;
render=(xvmc_render_state_t*)mpi->priv;//same as data[2]
- if(verbose > 4)
+ if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) )
printf("vd_ffmpeg::mc_get_buffer (render=%p)\n",render);
assert(render != 0);
assert(render->magic == MP_XVMC_RENDER_MAGIC);
@@ -1095,7 +1095,7 @@
//printf("R%X %X\n", pic->linesize[0], pic->data[0]);
//mark the surface as not requared for prediction
render=(xvmc_render_state_t*)pic->data[2];//same as mpi->priv
- if(verbose > 4)
+ if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) )
printf("vd_ffmpeg::mc_release_buffer (render=%p)\n",render);
assert(render!=NULL);
assert(render->magic==MP_XVMC_RENDER_MAGIC);
Index: vd_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_vfw.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vd_vfw.c 12 Jan 2006 20:04:34 -0000 1.27
+++ vd_vfw.c 24 Mar 2006 08:12:02 -0000 1.28
@@ -241,9 +241,9 @@
set_csp(priv->o_bih,sh->codec->outfmt[sh->outfmtidx]);
mp_msg(MSGT_WIN32, MSGL_V, "Input format:\n");
- if(verbose>0) print_video_header(sh->bih);
+ if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh->bih);
mp_msg(MSGT_WIN32, MSGL_V, "Output format:\n");
- if(verbose>0) print_video_header(priv->o_bih);
+ if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(priv->o_bih);
// set postprocessing level in xvid/divx4 .dll
ICSendMessage(priv->handle, ICM_USER+80, (long)(&divx_quality), 0);
Index: vf_scale.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_scale.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- vf_scale.c 21 Mar 2006 21:26:41 -0000 1.65
+++ vf_scale.c 24 Mar 2006 08:12:02 -0000 1.66
@@ -522,7 +522,7 @@
firstTime=0;
*flags= SWS_PRINT_INFO;
}
- else if(verbose>1) *flags= SWS_PRINT_INFO;
+ else if( mp_msg_test(MSGT_VFILTER,MSGL_DBG2) ) *flags= SWS_PRINT_INFO;
if(src_filter) sws_freeFilter(src_filter);
More information about the MPlayer-cvslog
mailing list