RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-20 18:28:01 +00:00
Code Issues Releases Wiki Activity

-frames and -benchmark options to make chl & gabucino happy

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1125 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi_esp 2001-06-13 21:55:24 +00:00
parent 50f47cfd50
commit fb0361090c
2 changed files with 36 additions and 4 deletions

3
cfg-mplayer.h
View File

@ -96,6 +96,9 @@ struct config conf[]={
{"framedrop", &frame_dropping, CONF_TYPE_FLAG, 0, 0, 1},
{"hardframedrop", &frame_dropping, CONF_TYPE_FLAG, 0, 0, 2},
{"noframedrop", &frame_dropping, CONF_TYPE_FLAG, 0, 1, 0},
{"frames", &play_n_frames, CONF_TYPE_INT, CONF_MIN, 0, 0},
{"benchmark", &benchmark, CONF_TYPE_FLAG, 0, 0, 1},
{"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 256},
{"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 256},

37
mplayer.c
View File

@ -281,6 +281,12 @@ void convert_linux(unsigned char *puc_y, int stride_y,
static vo_functions_t *video_out=NULL;
static ao_functions_t *audio_out=NULL;
double video_time_usage=0;
double vout_time_usage=0;
double audio_time_usage=0;
int total_time_usage_start=0;
int benchmark=0;
static int play_in_bg=0;
extern void avi_fixate();
@ -294,6 +300,8 @@ extern void avi_fixate();
void exit_player(char* how){
total_time_usage_start=GetTimer()-total_time_usage_start;
#ifdef HAVE_GUI
if ( !nogui )
{
@ -309,6 +317,20 @@ void exit_player(char* how){
if(how) printf("\nExiting... (%s)\n",how);
if(verbose) printf("max framesize was %d bytes\n",max_framesize);
if(benchmark){
double tot=video_time_usage+vout_time_usage+audio_time_usage;
double total_time_usage=(float)total_time_usage_start*0.000001;
printf("BENCHMARKs: V:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n",
video_time_usage,vout_time_usage,audio_time_usage,
total_time_usage-tot,total_time_usage);
if(total_time_usage>0.0)
printf("BENCHMARK%%: V:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n",
100.0*video_time_usage/total_time_usage,
100.0*vout_time_usage/total_time_usage,
100.0*audio_time_usage/total_time_usage,
100.0*(total_time_usage-tot)/total_time_usage,
100.0);
}
// restore terminal:
#ifdef HAVE_GUI
if ( nogui )
@ -401,6 +423,7 @@ float force_fps=0;
int force_srate=0;
float audio_delay=0;
int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
int play_n_frames=-1;
// screen info:
char* video_driver=NULL; //"mga"; // default
@ -1355,9 +1378,6 @@ float max_pts_correction=0;//default_max_pts_correction;
int eof=0;
int force_redraw=0;
float num_frames=0; // number of frames played
double video_time_usage=0;
double vout_time_usage=0;
double audio_time_usage=0;
int grab_frames=0;
char osd_text_buffer[64];
int drop_frame=0;
@ -1474,6 +1494,8 @@ printf("Start playing...\n");fflush(stdout);
InitTimer();
total_time_usage_start=GetTimer();
while(!eof){
/*========================== PLAY AUDIO ============================*/
@ -1791,7 +1813,9 @@ switch(sh_video->codec->driver){
if (verbose>0) printf("\nframe drop %d, %.2f\n", drop_frame, time_frame);
}
} else {
if(time_frame<-3*frame_time || time_frame>3*frame_time) time_frame=0;
if( (time_frame<-3*frame_time || time_frame>3*frame_time) || benchmark)
time_frame=0;
}
if(verbose>1)printf("sleep: %5.3f a:%6.3f v:%6.3f \n",time_frame,a_frame,v_frame);
@ -1812,6 +1836,11 @@ switch(sh_video->codec->driver){
current_module=NULL;
if(play_n_frames>=0){
--play_n_frames;
if(play_n_frames<0) exit_player("Requested number of frames played");
}
if(eof) break;
if(force_redraw){
--force_redraw;