Changeset 12077fd171905b6c9c958986d69d071a302d83b8

Timestamp:

20/12/04 08:44:39 (4 years ago)

Author:

Rocky Bernstein <rocky@videolan.org>

git-committer:

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

git-parent:

[6ba6c14fd5e810734e4170bbb95b1a731525212c]

git-author:

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

Message:

Improve entry navigation and title update.

Next/Prev chapter don't work yet, nor does entry detection when random
seeking.

Files:

• modules/access/vcdx/access.c (modified) (18 diffs)
• modules/access/vcdx/info.c (modified) (1 diff)

modules/access/vcdx/access.c

@@ -1 +1 @@
-/*****************************************************************************
-
-
-
+
+
- *****************************************************************************
- * Copyright (C) 2000, 2003, 2004 VideoLAN
@@ -9 +8 @@
- * Authors: Rocky Bernstein <rocky@panix.com>
- *   Some code is based on the non-libcdio VCD plugin (as there really
-
+
+
- *
- * This program is free software; you can redistribute it and/or modify
@@ -155 +155 @@
-    block_t                *p_block;
-    int                     i_blocks = VCD_BLOCKS_ONCE;
-    int                     i_index;
-    int                     i_read;
-    byte_t                  p_last_sector[ M2F2_SECTOR_SIZE ];
@@ -177 +176 @@
-    }
-
-index = 0 ; i_index < i_blocks ; i_index
+read = 0 ; i_read < i_blocks ; i_read
-    {
-
@@ -204 +203 @@
-            byte_t * p_buf = (byte_t *) p_block->p_buffer;
-
-index
+read
-            memset(p_buf, 0, M2F2_SECTOR_SIZE);
-            p_buf += 2;
@@ -224 +223 @@
-                          p_vcd->i_lsn,
-                          (byte_t *) p_block->p_buffer 
-index
+read
-      {
-          LOG_ERR ("could not read sector %lu", 
@@ -240 +239 @@
-      if ( VCDINFO_ITEM_TYPE_ENTRY == p_vcd->play_item.type )
-      {
-
-
-
-
-
-
+
+
+
-        {
-        const track_t i_track = p_vcd->i_track;
-const unsigned int i_entry = ++p_vcd->play_item.num
-            msg_Dbg( p_access, "seekpoint
+p_vcd->play_item.num = i_entry
+       dbg_print( (INPUT_DBG_LSN|INPUT_DBG_PBC), "entry
-        VCDSetOrigin( p_access, 
-sn
-sn
-sn
+ba
+ba
+ba
-              i_track, &(p_vcd->play_item) );
-        }
@@ -259 +255 @@
-    }
-
-index
+read
-    {
-        if ( VCDReadSector( VLC_OBJECT(p_access), p_vcd->vcd,
@@ -312 +308 @@
-    }
-      
+      dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_SEEK),
+         "orig %lu, cur: %lu, offset: %lld, entry %d",
+         (long unsigned int) p_vcd->origin_lsn, 
+         (long unsigned int) p_vcd->i_lsn, i_pos,
+         i_entry );
+      
-      /* Find seekpoint */
-      for( i_seekpoint = 0; i_seekpoint < t->i_seekpoint; i_seekpoint++ )
@@ -322 +324 @@
-      if( i_seekpoint != p_access->info.i_seekpoint )
-    {
-
+
+
-      p_access->info.i_update |= INPUT_UPDATE_SEEKPOINT;
-      p_access->info.i_seekpoint = i_seekpoint;
-    }
-
-      dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_SEEK),
-         "orig %lu, cur: %lu, offset: %lld, entry %d",
-         (long unsigned int) p_vcd->origin_lsn, 
-         (long unsigned int) p_vcd->i_lsn, i_pos,
-         i_entry );
-      
-    }
-    return VLC_SUCCESS;
@@ -368 +365 @@
-        vcdinfo_track_get_entry( p_vcd->vcd, i_track);
-      
-
-
+
-    
-=
+
-        LOG_ERR ("Invalid track number %d", i_track );
-        return VLC_EGENERIC;
@@ -377 +373 @@
-      p_vcd->in_still  = VLC_FALSE;
-      VCDSetOrigin( p_access, 
-sn
-sn
-sn
+ba
+ba
+ba
-            i_track, &itemid );
-      break;
@@ -473 +469 @@
-        p_vcd->in_still = VLC_FALSE;
-        VCDSetOrigin( p_access, 
-sn
-sn
-sn
+ba
+ba
+ba
-              i_track, &itemid );
-      }
@@ -536 +532 @@
-      snprintf(psz_entry, sizeof(psz_entry), "%s%02d", _("Entry "), i );
-
-sn
+ba
-      
-      s->psz_name      = strdup(psz_entry);
-      s->i_byte_offset = 
-sn
+ba
-        * M2F2_SECTOR_SIZE;
-      
+      dbg_print( INPUT_DBG_MRL, 
+             "%s, lsn %d,  byte_offset %ld\n",
+             s->psz_name, p_vcd->p_entries[i], 
+             (unsigned long int) s->i_byte_offset);
-      TAB_APPEND( p_vcd->p_title[i_track-1]->i_seekpoint,
-              p_vcd->p_title[i_track-1]->seekpoint, s );
+
-    } else 
-      msg_Warn( p_access, "wrong track number found in entry points" );
@@ -847 +848 @@
-
-  p_access->info.i_title     = i_track-1;
-  p_access->info.i_seekpoint = p_itemid->num;
-  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;
@@ -1265 +1265 @@
-            vlc_input_title_Duplicate( p_vcd->p_title[i] );
-        }
-
-
-        return VLC_SUCCESS;
-      }
-      break;
@@ -1288 +1285 @@
-        
-        VCDSetOrigin(p_access, 
-sn
-sn
-sn
+ba
+ba
+ba
-                 i_track, &itemid );
-        }
@@ -1304 +1301 @@
-            {
-        track_t i_track = p_access->info.i_title+1;
-        lsn_t   track_lsn = vcdinfo_get_track_lsn(p_vcd->vcd, i_track);
-
-                p_access->info.i_update |= INPUT_UPDATE_SEEKPOINT;
-                p_access->info.i_seekpoint = i;
-
-        /* FIXME! For now we are assuming titles are only 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            return VLC_SUCCESS;

modules/access/vcdx/info.c

@@ -342 +342 @@
-  }
-
-
+3
-           c_type, itemid->num);
-