Skip to content

V
vlc-2-2
Commit 11785176 authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

transcode: fps sync calculation correction

parent 87cd07ca
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
modules/stream_out/transcode/video.c
View file @ 11785176
...@@ -662,17 +662,17 @@ static void OutputFrame( sout_stream_sys_t *p_sys, picture_t *p_pic, sout_stream ...@@ -662,17 +662,17 @@ static void OutputFrame( sout_stream_sys_t *p_sys, picture_t *p_pic, sout_stream
{ {
picture_t *p_pic2 = NULL; picture_t *p_pic2 = NULL;
mtime_t original_date = p_pic->date; const mtime_t original_date = p_pic->date;
bool b_need_duplicate=false; bool b_need_duplicate=false;
/* If input pts + input_frame_interval is lower than next_output_pts - output_frame_interval /* If input pts is lower than next_output_pts - output_frame_interval
* Then the future input frame should fit better and we can drop this one * Then the future input frame should fit better and we can drop this one
* *
* We check it here also because we can have case that video filters outputs multiple * We check it here also because we can have case that video filters outputs multiple
* pictures but we don't need to use them all, for example yadif2x and outputting to some * pictures but we don't need to use them all, for example yadif2x and outputting to some
* different fps value * different fps value
*/ */
if( ( p_pic->date ) < if( ( original_date ) <
( date_Get( &id->next_output_pts ) ) ) ( date_Get( &id->next_output_pts ) - (mtime_t)id->i_output_frame_interval ) )
{ {
#if 0 #if 0
msg_Dbg( p_stream, "dropping frame (%"PRId64" + %"PRId64" vs %"PRId64")", msg_Dbg( p_stream, "dropping frame (%"PRId64" + %"PRId64" vs %"PRId64")",
...@@ -900,15 +900,15 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id, ...@@ -900,15 +900,15 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id,
/*Input lipsync and drop check */ /*Input lipsync and drop check */
if( p_sys->b_master_sync ) if( p_sys->b_master_sync )
{ {
/* If input pts + input_frame_interval is lower than next_output_pts - output_frame_interval /* If input pts lower than next_output_pts - output_frame_interval
* Then the future input frame should fit better and we can drop this one * Then the future input frame should fit better and we can drop this one
* *
* We check this here as we don't need to run video filter at all for pictures * We check this here as we don't need to run video filter at all for pictures
* we are going to drop anyway * we are going to drop anyway
* *
* Duplication need is checked in OutputFrame */ * Duplication need is checked in OutputFrame */
if( ( p_pic->date + (mtime_t)id->i_input_frame_interval ) < if( ( p_pic->date ) <
( date_Get( &id->next_output_pts ) ) ) ( date_Get( &id->next_output_pts ) - (mtime_t)id->i_output_frame_interval ) )
{ {
#if 0 #if 0
msg_Dbg( p_stream, "dropping frame (%"PRId64" + %"PRId64" vs %"PRId64")", msg_Dbg( p_stream, "dropping frame (%"PRId64" + %"PRId64" vs %"PRId64")",
......
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