Ticket #1334: vlc_transcode_drift_fps.diff

transcode.c

@@ -440 +440 @@
-    /* Sync */
-    vlc_bool_t      b_master_sync;
-    mtime_t         i_master_drift;
+    long            i_master_sync_drift;
-};
-
-struct decoder_owner_sys_t
@@ -1559 +1560 @@
-        if( p_sys->b_master_sync )
-        {
-            mtime_t i_dts = date_Get( &id->interpolated_pts ) + 1;
-MASTER_SYNC_MAX_DRIFT
-MASTER_SYNC_MAX_DRIFT 
+p_sys->i_master_sync_drift 
+p_sys->i_master_sync_drift
-            {
-                msg_Dbg( p_stream, "drift is too high, resetting master sync" );
-                date_Set( &id->interpolated_pts, p_audio_buf->start_date );
@@ -2016 +2017 @@
-            id->p_encoder->fmt_out.video.i_frame_rate_base = 1;
-        }
-    }
+    p_sys->i_master_sync_drift=(MASTER_SYNC_MAX_DRIFT*id->p_decoder->fmt_out.video.i_frame_rate)/(p_sys->f_fps*id->p_decoder->fmt_out.video.i_frame_rate_base);
+    msg_Dbg( p_stream, "master sync %d", p_sys->i_master_sync_drift);
-
+
-    id->p_encoder->fmt_in.video.i_frame_rate =
-        id->p_encoder->fmt_out.video.i_frame_rate;
-    id->p_encoder->fmt_in.video.i_frame_rate_base =
@@ -2172 +2176 @@
-            mtime_t i_pts;
-
-            i_pts = date_Get( &id->interpolated_pts ) + 1;
-MASTER_SYNC_MAX_DRIFT
-MASTER_SYNC_MAX_DRIFT
+p_sys->i_master_sync_drift
+p_sys->i_master_sync_drift
-            {
-                msg_Dbg( p_stream, "drift is too high, resetting master sync" );
-                date_Set( &id->interpolated_pts, p_pic->date );
@@ -2420 +2424 @@
-        if( p_sys->b_master_sync )
-        {
-            mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
-MASTER_SYNC_MAX_DRIFT
-MASTER_SYNC_MAX_DRIFT
+p_sys->i_master_sync_drift
+p_sys->i_master_sync_drift
-            {
-                msg_Dbg( p_stream, "drift is too high, resetting master sync" );
-                date_Set( &id->interpolated_pts, p_pic->date );
@@ -2433 +2437 @@
-        if( p_sys->b_master_sync && i_duplicate > 1 )
-        {
-            mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
-MASTER_SYNC_MAX_DRIFT
-MASTER_SYNC_MAX_DRIFT
+p_sys->i_master_sync_drift
+p_sys->i_master_sync_drift
-            {
-                msg_Dbg( p_stream, "drift is too high, resetting master sync" );
-                date_Set( &id->interpolated_pts, p_pic->date );