Ticket #1459: mplayer-quiet-time-2010-06.patch

stream/cache2.c

@@ -143 +143 @@
 
     newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
     if(newb<min_fill) min_fill=newb; // statistics...
+        //if(newb<min_fill) min_fill=newb; // buffer underrun, rebuffer...
 
 //    printf("*** newb: %d bytes ***\n",newb);
 

DOCS/man/en/mplayer.1

@@ -746 +746 @@
 handle carriage return (i.e.\& \\r).
 .
 .TP
+.B "\-quiet-time <n>\ "
+Reduce console output updates to n per tenth of a second.
+Values of 5 or more work around slow terminals.
+See \-quiet for more.
+.
+.TP
 .B \-priority <prio> (Windows and OS/2 only)
 Set process priority for MPlayer according to the predefined
 priorities available under Windows and OS/2.

mplayer.c

@@ -98 +98 @@
 int slave_mode=0;
 int player_idle_mode=0;
 int quiet=0;
+int quiet_time=0;
 int enable_mouse_movements=0;
 float start_volume = -1;
 
@@ -2077 +2078 @@
 
 static void adjust_sync_and_print_status(int between_frames, float timing_error)
 {
+    static unsigned last_status_update=0;
+    unsigned now=GetTimerMS();
+    if (quiet_time && now >= (last_status_update + quiet_time * 100)) 
+        last_status_update=now;
+
     current_module="av_sync";
-
+    
     if(mpctx->sh_audio){
         double a_pts, v_pts;
 
@@ -2128 +2134 @@
                 c_total+=x;
             }
             if(!quiet)
-                print_status(a_pts - audio_delay, AV_delay, c_total);
+                if (!quiet_time || (last_status_update == now))
+                    print_status(a_pts - audio_delay, AV_delay, c_total);
         }
 
     } else {
         // No audio:
 
         if (!quiet)
-            print_status(0, 0, 0);
+            if (!quiet_time || (last_status_update == now))
+                print_status(0, 0, 0);
     }
 }
 

cfg-common.h

@@ -300 +300 @@
     {"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
     {"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
     {"really-quiet", &verbose, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_PRE_PARSE, 0, -10, NULL},
+    {"quiet-time", &quiet_time, CONF_TYPE_INT, CONF_RANGE, 0, 65536, NULL},
     {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL},
     {"msglevel", msgl_config, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
     {"msgcolor", &mp_msg_color, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},

mencoder.c

@@ -139 +139 @@
 
 int out_file_format=MUXER_TYPE_AVI;     // default to AVI
 int quiet=0;
+int quiet_time=0;
 double video_time_usage=0;
 double vout_time_usage=0;
 double max_video_time_usage=0;
@@ -1639 +1640 @@
              / (float)(sh_audio->audio.dwLength);
         }
 #endif
+    static unsigned last_status_update=0;
+    unsigned now=GetTimerMS();
+    if (quiet_time && now >= (last_status_update + quiet_time * 100))
+       last_status_update=now;
+
       if(!quiet) {
         if( mp_msg_test(MSGT_STATUSLINE,MSGL_V) ) {
+                if (!quiet_time || (last_status_update == now))
                 mp_msg(MSGT_STATUSLINE,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb  A-V:%5.3f [%d:%d] A/Vms %d/%d D/B/S %d/%d/%d \r",
                 mux_v->timer, decoded_frameno, (int)(p*100),
                 (t>1) ? (int)(decoded_frameno/t+0.5) : 0,
@@ -1653 +1660 @@
                         duplicatedframes, badframes, skippedframes
                 );
         } else
+        if (!quiet_time || (last_status_update == now))
         mp_msg(MSGT_STATUSLINE,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %5.2ffps Trem:%4dmin %3dmb  A-V:%5.3f [%d:%d]\r",
             mux_v->timer, decoded_frameno, (int)(p*100),
             (t>1) ? (float)(decoded_frameno/t) : 0,