Commit 0224dc73 authored by Jean-Paul Saman's avatar Jean-Paul Saman

davinci encoder: remove framerate debugging

parent b4e6c46e
...@@ -59,12 +59,6 @@ struct encoder_sys_t ...@@ -59,12 +59,6 @@ struct encoder_sys_t
XDM_BufDesc in; XDM_BufDesc in;
XDM_BufDesc out; XDM_BufDesc out;
/* stats */
mtime_t i_pts_start;
mtime_t i_pts_end;
int i_fps;
int i_pics;
}; };
/***************************************************************************** /*****************************************************************************
...@@ -151,7 +145,7 @@ int OpenVideoEncoder( vlc_object_t *p_this ) ...@@ -151,7 +145,7 @@ int OpenVideoEncoder( vlc_object_t *p_this )
params.maxFrameRate = p_enc->fmt_out.video.i_frame_rate_base ? params.maxFrameRate = p_enc->fmt_out.video.i_frame_rate_base ?
p_enc->fmt_out.video.i_frame_rate * 1000 / p_enc->fmt_out.video.i_frame_rate * 1000 /
p_enc->fmt_out.video.i_frame_rate_base : p_enc->fmt_out.video.i_frame_rate_base :
25000; /* Frames per 1000 seconds */ 50000; /* Frames per 1000 seconds */
params.maxBitRate = p_enc->fmt_out.i_bitrate params.maxBitRate = p_enc->fmt_out.i_bitrate
+ p_enc->i_tolerance; + p_enc->i_tolerance;
...@@ -263,7 +257,6 @@ static int davinci_InitBuffers( encoder_t *p_enc ) ...@@ -263,7 +257,6 @@ static int davinci_InitBuffers( encoder_t *p_enc )
p_enc->fmt_out.video.i_frame_rate * 1000 / p_enc->fmt_out.video.i_frame_rate * 1000 /
p_enc->fmt_out.video.i_frame_rate_base : p_enc->fmt_out.video.i_frame_rate_base :
p_enc->i_iframes * 1000; /* Frames per 1000 seconds */ p_enc->i_iframes * 1000; /* Frames per 1000 seconds */
p_sys->i_fps = dparams.refFrameRate / 1000;
dparams.targetFrameRate = dparams.refFrameRate; /* input fps = output fps */ dparams.targetFrameRate = dparams.refFrameRate; /* input fps = output fps */
dparams.targetBitRate = p_enc->fmt_out.i_bitrate; dparams.targetBitRate = p_enc->fmt_out.i_bitrate;
dparams.intraFrameInterval = p_enc->i_iframes; dparams.intraFrameInterval = p_enc->i_iframes;
...@@ -332,29 +325,6 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pic ) ...@@ -332,29 +325,6 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pic )
return NULL; return NULL;
} }
p_sys->i_pics++;
if( p_sys->i_pics == 1 )
{
p_sys->i_pts_start = mdate();
}
if( p_sys->i_pics == p_sys->i_fps )
{
mtime_t i_diff; /* in us */
double f_fps;
p_sys->i_pts_end = mdate(); /* in us */
i_diff = (p_sys->i_pts_end - p_sys->i_pts_start);
f_fps = (double)((i_diff / (int64_t)p_sys->i_pics)); /* 1 frame per us */
f_fps = ((double)1/f_fps) * (double)1000000;
msg_Info( p_enc, "Encoder: %d frames per %"PRId64" micro seconds (%4.2f fps)",
p_sys->i_pics, i_diff, f_fps );
/* reset timers */
p_sys->i_pics = 0;
p_sys->i_pts_start = p_sys->i_pts_end = (mtime_t)0;
}
davinci_CopyPictureToXDM( p_enc, &p_sys->in, p_pic ); davinci_CopyPictureToXDM( p_enc, &p_sys->in, p_pic );
/* Configure input */ /* Configure input */
...@@ -416,3 +386,4 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pic ) ...@@ -416,3 +386,4 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pic )
return p_block; return p_block;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment