Mercurial > mplayer.hg

changeset 7318:85897ab199a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed message leveles (too many non-sense info messages)
author alex
date Sun, 08 Sep 2002 16:04:21 +0000
parents 64d665ae50f6
children 20acd78d1239
files libmpdemux/tv.c libmpdemux/tvi_v4l.c
diffstat 2 files changed, 16 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/tv.c	Sun Sep 08 14:55:03 2002 +0000
+++ b/libmpdemux/tv.c	Sun Sep 08 16:04:21 2002 +0000
@@ -141,7 +141,7 @@
     else
     {
 	mp_msg(MSGT_TV, MSGL_ERR, "Unknown format given: %s\n", tv_param_outfmt);
-	mp_msg(MSGT_TV, MSGL_INFO, "Using default: Planar YV12\n");
+	mp_msg(MSGT_TV, MSGL_V, "Using default: Planar YV12\n");
 	picture_format = IMGFMT_YV12;
     }
     funcs->control(tvh->priv, TVI_CONTROL_VID_SET_FORMAT, &picture_format);
@@ -157,7 +157,7 @@
     else if (!strcasecmp(tv_param_norm, "secam"))
 	tvh->norm = TV_NORM_SECAM;
 
-    mp_msg(MSGT_TV, MSGL_INFO, "Selected norm: %s\n", tv_param_norm);
+    mp_msg(MSGT_TV, MSGL_V, "Selected norm: %s\n", tv_param_norm);
     funcs->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm);
 
     /* limits on w&h are norm-dependent -- JM */
@@ -206,7 +206,7 @@
 	mp_msg(MSGT_TV, MSGL_WARN, "Unable to find selected channel list! (%s)\n",
 	    tv_param_chanlist);
     else
-	mp_msg(MSGT_TV, MSGL_INFO, "Selected channel list: %s (including %d channels)\n",
+	mp_msg(MSGT_TV, MSGL_V, "Selected channel list: %s (including %d channels)\n",
 	    chanlists[tvh->chanlist].name, chanlists[tvh->chanlist].count);
 
     if (tv_param_freq && tv_param_channel)
@@ -224,7 +224,7 @@
 	funcs->control(tvh->priv, TVI_CONTROL_TUN_SET_FREQ, &freq);
 
 	funcs->control(tvh->priv, TVI_CONTROL_TUN_GET_FREQ, &freq);
-	mp_msg(MSGT_TV, MSGL_INFO, "Selected frequency: %lu (%.3f)\n",
+	mp_msg(MSGT_TV, MSGL_V, "Selected frequency: %lu (%.3f)\n",
 	    freq, (float)freq/16);
     }
 
@@ -282,8 +282,6 @@
 
     sh_video->frametime = 1.0f/sh_video->fps;
 
-    printf("fps: %f, frametime: %f\n", sh_video->fps, sh_video->frametime);
-
     /* If playback only mode, go to immediate mode, fail silently */
     if(tv_param_immediate == 1)
         {
@@ -297,8 +295,6 @@
     /* set height */
     funcs->control(tvh->priv, TVI_CONTROL_VID_GET_HEIGHT, &sh_video->disp_h);
 
-    mp_msg(MSGT_TV, MSGL_INFO, "Output size: %dx%d\n", sh_video->disp_w, sh_video->disp_h);
-    
     demuxer->video->sh = sh_video;
     sh_video->ds = demuxer->video;
     demuxer->video->id = 0;
@@ -518,7 +514,7 @@
 	tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_SET_FREQ, &freq);
 
 	tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_GET_FREQ, &freq);
-	mp_msg(MSGT_TV, MSGL_INFO, "Current frequency: %lu (%.3f)\n",
+	mp_msg(MSGT_TV, MSGL_V, "Current frequency: %lu (%.3f)\n",
 	    freq, (float)freq/16);
     }
 }
--- a/libmpdemux/tvi_v4l.c	Sun Sep 08 14:55:03 2002 +0000
+++ b/libmpdemux/tvi_v4l.c	Sun Sep 08 16:04:21 2002 +0000
@@ -280,7 +280,7 @@
 
     /* audio chanlist */
 
-    mp_msg(MSGT_TV, MSGL_INFO, " Audio devices: %d\n", priv->capability.audios);
+    mp_msg(MSGT_TV, MSGL_V, " Audio devices: %d\n", priv->capability.audios);
 
     for (i = 0; i < priv->capability.audios; i++)
     {
@@ -541,14 +541,14 @@
 {
     priv->shutdown = 1;
 
-    mp_msg(MSGT_TV, MSGL_INFO, "Waiting for threads to finish... ");
+    mp_msg(MSGT_TV, MSGL_V, "Waiting for threads to finish... ");
     if (!tv_param_noaudio) {
 	pthread_join(priv->audio_grabber_thread, NULL);
 	pthread_mutex_destroy(&priv->audio_starter);
 	pthread_mutex_destroy(&priv->skew_mutex);
     }
     pthread_join(priv->video_grabber_thread, NULL);
-    mp_msg(MSGT_TV, MSGL_INFO, "done\n");
+    mp_msg(MSGT_TV, MSGL_V, "done\n");
 
     priv->audio[priv->audio_id].volume = 0;
     priv->audio[priv->audio_id].flags |= VIDEO_AUDIO_MUTE;
@@ -591,7 +591,7 @@
     cnt = bufsize/(priv->width*priv->bytesperline);
     if (cnt < 2) cnt = 2;
     
-    mp_msg(MSGT_TV, MSGL_INFO, "Allocating a ring buffer for %d frames, %d MB total size.\n",
+    mp_msg(MSGT_TV, MSGL_V, "Allocating a ring buffer for %d frames, %d MB total size.\n",
 	   cnt, cnt*priv->width*priv->bytesperline/(1024*1024));
 
     return cnt;
@@ -617,10 +617,10 @@
 	priv->bytesperline = priv->width * 2;
     }
 
-    mp_msg(MSGT_TV, MSGL_INFO, "Picture values:\n");
-    mp_msg(MSGT_TV, MSGL_INFO, " Depth: %d, Palette: %d (Format: %s)\n", priv->picture.depth,
+    mp_msg(MSGT_TV, MSGL_V, "Picture values:\n");
+    mp_msg(MSGT_TV, MSGL_V, " Depth: %d, Palette: %d (Format: %s)\n", priv->picture.depth,
 	priv->picture.palette, vo_format_name(priv->format));
-    mp_msg(MSGT_TV, MSGL_INFO, " Brightness: %d, Hue: %d, Colour: %d, Contrast: %d\n",
+    mp_msg(MSGT_TV, MSGL_V, " Brightness: %d, Hue: %d, Colour: %d, Contrast: %d\n",
 	priv->picture.brightness, priv->picture.hue,
 	priv->picture.colour, priv->picture.contrast);
     
@@ -802,7 +802,7 @@
 
 	    output_fmt = priv->format;
 	    (int)*(void **)arg = output_fmt;
-	    mp_msg(MSGT_TV, MSGL_INFO, "Output format: %s\n", vo_format_name(output_fmt));
+	    mp_msg(MSGT_TV, MSGL_V, "Output format: %s\n", vo_format_name(output_fmt));
 	    return(TVI_CONTROL_TRUE);
 	}
 	case TVI_CONTROL_VID_SET_FORMAT:
@@ -829,7 +829,7 @@
 	{
 	    int req_width = (int)*(void **)arg;
 	    
-	    mp_msg(MSGT_TV, MSGL_INFO, "Requested width: %d\n", req_width);
+	    mp_msg(MSGT_TV, MSGL_V, "Requested width: %d\n", req_width);
 	    if ((req_width >= priv->capability.minwidth) &&
 		(req_width <= priv->capability.maxwidth))
 		return(TVI_CONTROL_TRUE);
@@ -845,7 +845,7 @@
 	{
 	    int req_height = (int)*(void **)arg;
 	    
-	    mp_msg(MSGT_TV, MSGL_INFO, "Requested height: %d\n", req_height);
+	    mp_msg(MSGT_TV, MSGL_V, "Requested height: %d\n", req_height);
 	    if ((req_height >= priv->capability.minheight) &&
 		(req_height <= priv->capability.maxheight))
 		return(TVI_CONTROL_TRUE);
@@ -932,7 +932,7 @@
 		return(TVI_CONTROL_FALSE);
 	    }
 	    
-	    mp_msg(MSGT_TV, MSGL_INFO, "Tuner (%s) range: %lu -> %lu\n", priv->tuner.name,
+	    mp_msg(MSGT_TV, MSGL_V, "Tuner (%s) range: %lu -> %lu\n", priv->tuner.name,
 		priv->tuner.rangelow, priv->tuner.rangehigh);
 	    return(TVI_CONTROL_TRUE);
 	}