Changeset 6ba6c14fd5e810734e4170bbb95b1a731525212c

Timestamp:

20/12/04 05:52:29 (4 years ago)

Author:

Rocky Bernstein <rocky@videolan.org>

git-committer:

Rocky Bernstein <rocky@videolan.org> 1103518349 +0000

git-parent:

[cf38ae4672f190d66fac78709f6019b1cb484cad]

git-author:

Rocky Bernstein <rocky@videolan.org> 1103518349 +0000

Message:

Fix bad bug with was causing discontinuous video playback.
Some entry navigation improved.

Files:

• modules/access/vcdx/access.c (modified) (9 diffs)
• modules/access/vcdx/info.c (modified) (2 diffs)
• modules/access/vcdx/info.h (modified) (2 diffs)

modules/access/vcdx/access.c

@@ -35 +35 @@
-
-#include "vcd.h"
-vcdplayer
+info
-#include "intf.h"
-#include "info.h"
-#include "vlc_keys.h"
-
@@ -224 +223 @@
-      if ( VCDReadSector( VLC_OBJECT(p_access), p_vcd->vcd,
-                          p_vcd->i_lsn,
-
-
+
+
+
-          LOG_ERR ("could not read sector %lu", 
-           (long unsigned int) p_vcd->i_lsn );
+        /* Try to skip one sector (in case of bad sectors) */
+      p_vcd->i_lsn ++;
+      p_access->info.i_pos += M2F2_SECTOR_SIZE;
-          return NULL;
+      }
+
+      p_vcd->i_lsn ++;
+      p_access->info.i_pos += M2F2_SECTOR_SIZE;
+
+      /* Update seekpoint */
+      if ( VCDINFO_ITEM_TYPE_ENTRY == p_vcd->play_item.type )
+      {
+        const input_title_t *t = p_vcd->p_title[p_access->info.i_title];
+    
+        if( t->i_seekpoint > 0 &&
+            p_access->info.i_seekpoint + 1 < t->i_seekpoint &&
+            p_access->info.i_pos + i_read * M2F2_SECTOR_SIZE >=
+            t->seekpoint[p_access->info.i_seekpoint+1]->i_byte_offset )
+        {
+        const track_t i_track = p_vcd->i_track;
+        const unsigned int i_entry = ++p_vcd->play_item.num;
+            msg_Dbg( p_access, "seekpoint change" );
+        VCDSetOrigin( p_access, 
+              vcdinfo_get_track_lsn(p_vcd->vcd, i_track),
+              vcdinfo_get_entry_lsn(p_vcd->vcd, i_entry),
+              vcdinfo_get_track_lsn(p_vcd->vcd, i_track+1),
+              i_track, &(p_vcd->play_item) );
-        }
-
-
-
+
-    }
-
@@ -244 +268 @@
-        }
-    
+    p_vcd->i_lsn ++;
-    return NULL;
-    }
-
-    /* Update seekpoints */
-    for( i_read = 0; i_read < i_blocks; i_read++ )
-    {
-        input_title_t *t = p_vcd->p_title[p_access->info.i_title];
-
-        if( t->i_seekpoint > 0 &&
-            p_access->info.i_seekpoint + 1 < t->i_seekpoint &&
-            p_access->info.i_pos + i_read * M2F2_SECTOR_SIZE >=
-            t->seekpoint[p_access->info.i_seekpoint+1]->i_byte_offset )
-        {
-            msg_Dbg( p_access, "seekpoint change" );
-            p_access->info.i_update |= INPUT_UPDATE_SEEKPOINT;
-            p_access->info.i_seekpoint++;
-        }
-    }
-
-    /* Update a few values */
-    p_vcd->i_lsn += i_blocks;
-    p_access->info.i_pos += p_block->i_buffer;
-
-    return p_block;
@@ -845 +850 @@
-  p_access->info.i_size      = p_vcd->p_title[i_title]->i_size;
-  p_access->info.i_pos       = ( i_lsn - origin_lsn ) * M2F2_SECTOR_SIZE;
-
+
+
-
-  dbg_print( (INPUT_DBG_CALL|INPUT_DBG_LSN),
@@ -853 +859 @@
-         (long unsigned int) end_lsn, i_track );
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1061 +1091 @@
-    }
-
-#if 1
-    b_play_ok = (VLC_SUCCESS == VCDPlay( p_access, itemid ));
-
@@ -1068 +1097 @@
-      goto err_exit;
-    }
-#else 
-    /* We assume playing CD track 2 (1st MPEG data) for now  */
-      
-    p_vcd->origin_lsn = p_vcd->i_lsn = p_vcd->p_sectors[1];
-    p_access->info.i_title = 0;
-    p_access->info.i_seekpoint = 0;
-    p_access->info.i_size = p_vcd->p_title[0]->i_size;
-    p_access->info.i_pos = 0;
-    
-#endif
-
-    p_access->psz_demux = strdup( "ps" );
@@ -1280 +1299 @@
-            input_title_t *t = p_vcd->p_title[p_access->info.i_title];
-            i = (int)va_arg( args, int );
+
+        dbg_print( INPUT_DBG_EVENT, "set seekpoint" );
-            if( t->i_seekpoint > 0 )
-            {
@@ -1301 +1322 @@
-
-        case ACCESS_SET_PRIVATE_ID_STATE:
-seekpoint/set 
+
-            return VLC_EGENERIC;
-

modules/access/vcdx/info.c

@@ -27 +27 @@
-#include "vcd.h"
-#include <vlc_playlist.h> 
-#include "vcdplayer.h"
-#include "vlc_keys.h"
+#include "info.h"
-
-#include <cdio/cdio.h>
@@ -36 +36 @@
-#include <libvcd/info.h>
-#include <libvcd/logging.h>
-
-static char *VCDFormatStr(const access_t *p_access, access_vcd_data_t *p_vcd,
-              const char format_str[], const char *mrl,
-              const vcdinfo_itemid_t *itemid);
-
-static inline void

modules/access/vcdx/info.h

@@ -22 +22 @@
- *****************************************************************************/
-
+#ifndef VCD_INFO_H
+#define VCD_INFO_H
+
+#include "vcdplayer.h"
+
-/*
- Fills out playlist information.
@@ -38 +43 @@
-            const char format_str[], const char *mrl,
-            const vcdinfo_itemid_t *itemid);
+
+#endif /* VCD_INFO_H */