summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-21 23:05:05 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-21 23:05:05 +0000
commit199173c7e547122030c67d23d4211a6cefac77d1 (patch)
treec1baa34a31a75dcd7cb1af90d2da76a7d57e673f /mplayer.c
parentd44dc01224b68c49fedf6eb1b615e9cae0c3169c (diff)
downloadmpv-199173c7e547122030c67d23d4211a6cefac77d1.tar.bz2
mpv-199173c7e547122030c67d23d4211a6cefac77d1.tar.xz
cache full status added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2354 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index 5300fa1527..19600888cc 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -224,6 +224,13 @@ extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) inde
extern int force_ni;
extern int pts_from_bps;
+// cache2:
+#ifdef USE_STREAM_CACHE
+extern int cache_fill_status;
+#else
+#define cache_fill_status 0
+#endif
+
static float default_max_pts_correction=-1;//0.01f;
static float max_pts_correction=0;//default_max_pts_correction;
@@ -1531,7 +1538,7 @@ if(1)
else
max_pts_correction=sh_video->frametime*0.10; // +-10% of time
sh_audio->timer+=x; c_total+=x;
- if(!quiet) mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f V:%6.1f A-V:%7.3f ct:%7.3f %3d/%3d %2d%% %2d%% %4.1f%% %d %d\r",
+ if(!quiet) mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f V:%6.1f A-V:%7.3f ct:%7.3f %3d/%3d %2d%% %2d%% %4.1f%% %d %d %d%%\r",
a_pts-audio_delay-delay,v_pts,AV_delay,c_total,
(int)sh_video->num_frames,(int)sh_video->num_frames_decoded,
(sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0,
@@ -1539,6 +1546,7 @@ if(1)
(sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0
,drop_frame_cnt
,output_quality
+ ,cache_fill_status
);
fflush(stdout);
}
@@ -1547,11 +1555,14 @@ if(1)
// No audio:
if(!quiet)
- mp_msg(MSGT_AVSYNC,MSGL_STATUS,"V:%6.1f %3d %2d%% %2d%% %3.1f%% \r",d_video->pts,
+ mp_msg(MSGT_AVSYNC,MSGL_STATUS,"V:%6.1f %3d %2d%% %2d%% %4.1f%% %d %d %d%%\r",d_video->pts,
(int)sh_video->num_frames,
(sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0,
(sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0,
(sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0
+ ,drop_frame_cnt
+ ,output_quality
+ ,cache_fill_status
);
fflush(stdout);