[vlc-commits] access: dvdread: fix inverted commands on boundary / data sequence

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Aug 16 19:29:04 2019 +0200| [6a7381e5cfdb091ec83900662d0cf2d06af350d5] | committer: Francois Cartegnie

access: dvdread: fix inverted commands on boundary / data sequence

fixes broken clock/clock jump and glitch on title change

(cherry picked from commit 89070a7c3ac76580b6a655078bc6f6b5e1342168)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=6a7381e5cfdb091ec83900662d0cf2d06af350d5
---

 modules/access/dvdread.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index feced6ba6b..29b2e8b93f 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -484,6 +484,7 @@ static int Demux( demux_t *p_demux )
         /* Basic check to be sure we don't have a empty title
          * go to next title if so */
         //assert( p_buffer[41] == 0xbf && p_buffer[1027] == 0xbf );
+        DemuxBlock( p_demux, p_buffer, DVD_VIDEO_LB_LEN );
 
         /* Parse the contained dsi packet */
         DvdReadHandleDSI( p_demux, p_buffer );
@@ -509,12 +510,8 @@ static int Demux( demux_t *p_demux )
             return 0; /* EOF */
         }
 
-        /* FIXME: Ugly kludge: we send the pack block to the input for it
-         * sometimes has a zero scr and restart the sync */
         p_sys->i_cur_block++;
         p_sys->i_title_offset++;
-
-        DemuxBlock( p_demux, p_buffer, DVD_VIDEO_LB_LEN );
     }
 
     if( p_sys->i_cur_cell >= p_sys->p_cur_pgc->nr_of_cells )