From: Antoine Cellerier <dionoea@videolan.org>
Date: Sun, 13 Nov 2005 18:31:39 +0000 (+0000)
Subject: revert 13221 (feature/"big change" freeze)
X-Git-Tag: 0.8.4~53
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e7377ab3f33da53c6d58022f055322d1af549c39;p=vlc

revert 13221 (feature/"big change" freeze)
---

diff --git a/modules/demux/mpeg/mpga.c b/modules/demux/mpeg/mpga.c
index f7bcbf9127..fefc4299a7 100644
--- a/modules/demux/mpeg/mpga.c
+++ b/modules/demux/mpeg/mpga.c
@@ -32,7 +32,7 @@
 #include "vlc_codec.h"
 #include "vlc_meta.h"
 
-#define MPGA_PACKET_SIZE 1024
+#define MPGA_PACKET_SIZE 4096
 
 /*****************************************************************************
  * Module descriptor
diff --git a/src/input/clock.c b/src/input/clock.c
index 017a181079..6afca87a61 100644
--- a/src/input/clock.c
+++ b/src/input/clock.c
@@ -133,7 +133,6 @@ void input_ClockInit( input_clock_t *cl, vlc_bool_t b_master, int i_cr_average )
 
     cl->last_cr = 0;
     cl->last_pts = 0;
-    cl->last_sysdate = 0;
     cl->cr_ref = 0;
     cl->sysdate_ref = 0;
     cl->delta_cr = 0;
@@ -265,17 +264,15 @@ void input_ClockSetPCR( input_thread_t *p_input,
         else
         {
             cl->last_cr = 0;
-            cl->last_sysdate = 0;
             cl->delta_cr = 0;
             cl->i_delta_cr_residue = 0;
         }
     }
     else
     {
-        mtime_t clock_max_gap = CR_MAX_GAP * 90 / p_input->i_rate;
         if ( cl->last_cr != 0 &&
-               (    (cl->last_cr - i_clock) > clock_max_gap
-                 || (cl->last_cr - i_clock) < - clock_max_gap ) )
+               (    (cl->last_cr - i_clock) > CR_MAX_GAP
+                 || (cl->last_cr - i_clock) < - CR_MAX_GAP ) )
         {
             /* Stream discontinuity, for which we haven't received a
              * warning from the stream control facilities (dd-edited
@@ -311,7 +308,7 @@ void input_ClockSetPCR( input_thread_t *p_input,
             input_ClockManageControl( p_input, cl, i_clock );
 #endif
         }
-        else if ( mdate() - cl->last_sysdate > 200000 )
+        else
         {
             /* Smooth clock reference variations. */
             mtime_t i_extrapoled_clock = ClockCurrent( p_input, cl );
@@ -327,7 +324,6 @@ void input_ClockSetPCR( input_thread_t *p_input,
                                        + cl->i_delta_cr_residue )
                                     % cl->i_cr_average;
             cl->delta_cr = delta_cr;
-            cl->last_sysdate = mdate();
         }
     }
 }
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index c0daa4d8d5..a9a0b3fe78 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -133,7 +133,6 @@ typedef struct
     /* Synchronization information */
     mtime_t                 delta_cr;
     mtime_t                 cr_ref, sysdate_ref;
-    mtime_t                 last_sysdate;
     mtime_t                 last_cr; /* reference to detect unexpected stream
                                       * discontinuities                      */
     mtime_t                 last_pts;