Changeset 2401b66298e2d714223c9d5f32aa23376a0afc4c

Timestamp:

06/11/02 16:41:29 (6 years ago)

Author:

Johan Bilien <jobi@videolan.org>

git-committer:

Johan Bilien <jobi@videolan.org> 1036597289 +0000

git-parent:

[93160b29203c6adc490121f5b9f7282386e243da]

git-author:

Johan Bilien <jobi@videolan.org> 1036597289 +0000

Message:

• modules/access/vcd/vcd.*: added entry points support (sort of
  chapters).
  
• modules/gui/gtk/gtk_callbacks.c: added some locks to the
  navigation functions
  

Files:

• modules/access/vcd/vcd.c (modified) (17 diffs)
• modules/access/vcd/vcd.h (modified) (3 diffs)
• modules/gui/gtk/gtk_callbacks.c (modified) (10 diffs)

modules/access/vcd/vcd.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000 VideoLAN
-9 2002/10/26 15:24:19 gbazin
+10 2002/11/06 15:41:29 jobi
- *
- * Author: Johan Bilien <jobi@via.ecp.fr>
@@ -11 +11 @@
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- 
+
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -51 +51 @@
-{
-    vcddev_t    *vcddev;                            /* vcd device descriptor */
-nb_tracks;  
+i_nb_tracks;
-    int         i_track;                                    /* Current track */
-    int         i_sector;                                  /* Current Sector */
-    int *       p_sectors;                                  /* Track sectors */
+    int         i_entries_nb;                      /* Number of entry points */
+    int *       p_entries;                                   /* Entry points */
+    vlc_bool_t  b_valid_ep;                       /* Valid entry points flag */
-    vlc_bool_t  b_end_of_track;           /* If the end of track was reached */
-
@@ -68 +71 @@
-static int  VCDSetArea      ( input_thread_t *, input_area_t * );
-static int  VCDSetProgram   ( input_thread_t *, pgrm_descriptor_t * );
+static int  VCDEntryPoints  ( input_thread_t * );
-
-/*****************************************************************************
@@ -112 +116 @@
-    /* parse the options passed in command line : */
-    psz_orig = psz_parser = psz_source = strdup( p_input->psz_name );
-
+
-    if( !psz_orig )
-    {
-        return( -1 );
-    }
-
+
-    while( *psz_parser && *psz_parser != '@' )
-    {
@@ -159 +163 @@
-        return -1;
-    }
-
+
-    p_input->p_access_data = (void *)p_vcd;
-
+
-    p_input->i_mtu = VCD_DATA_ONCE;
-
+
-    vlc_mutex_lock( &p_input->stream.stream_lock );
-
@@ -183 +187 @@
-
-    /* We read the Table Of Content information */
-
+i_
-                                           p_vcd->vcddev, &p_vcd->p_sectors );
-    free( psz_source );
-
+i_
-        msg_Err( p_input, "unable to count tracks" );
-
+i_
-        msg_Err( p_input, "no movie tracks found" );
-
-
-
+
+
-        ioctl_Close( p_this, p_vcd->vcddev );
-        free( p_vcd );
@@ -198 +201 @@
-    }
-
+    /* Allocate the entry points table */
+    p_vcd->p_entries = malloc( p_vcd->i_nb_tracks * sizeof( int ) );
+
+    if( p_vcd->p_entries == NULL )
+    {
+        msg_Err( p_input, "not enough memory" );
+        ioctl_Close( p_this, p_vcd->vcddev );
+        free( p_vcd );
+    }
+
-    /* Set stream and area data */
-    vlc_mutex_lock( &p_input->stream.stream_lock );
@@ -207 +220 @@
-    p_input->stream.i_method = INPUT_METHOD_VCD;
-
+    p_input->stream.i_area_nb = 1;
+
-#define area p_input->stream.pp_areas
-
+i_
-    {
-        input_AddArea( p_input );
@@ -224 +239 @@
-        area[i]->i_part = 1;
-
-
+
+
+
-    }
-#undef area
-
-    p_area = p_input->stream.pp_areas[i_title];
+
+    p_vcd->b_valid_ep = 1;
+    if( VCDEntryPoints( p_input ) < 0 )
+    {
+        msg_Warn( p_input, "could read entry points, will not use them" );
+        p_vcd->b_valid_ep = 0;
+    }
-
-    VCDSetArea( p_input, p_area );
@@ -257 +281 @@
- * bytes.
- *****************************************************************************/
- 
+
-                     size_t i_len )
-{
@@ -274 +298 @@
-    i_blocks = i_len / VCD_DATA_SIZE;
-
- 
+
-    {
-        if ( ioctl_ReadSector( VLC_OBJECT(p_input), p_vcd->vcddev,
@@ -287 +311 @@
-        {
-            input_area_t *p_area;
-
-
+
+i_
-                return 0; /* EOF */
-
+
+
-            p_area = p_input->stream.pp_areas[
-                    p_input->stream.p_selected_area->i_id + 1 ];
-
+
-            msg_Dbg( p_input, "new title" );
-
+
-            p_area->i_part = 1;
-            VCDSetArea( p_input, p_area );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        i_read += VCD_DATA_SIZE;
-    }
-
+
-    if ( i_len % VCD_DATA_SIZE ) /* this should not happen */
- 
+
-        if ( ioctl_ReadSector( VLC_OBJECT(p_input), p_vcd->vcddev,
-                               p_vcd->i_sector, p_last_sector ) < 0 )
@@ -311 +359 @@
-            return -1;
-        }
-
+
-        p_input->p_vlc->pf_memcpy( p_buffer + i_blocks * VCD_DATA_SIZE,
-                                   p_last_sector, i_len % VCD_DATA_SIZE );
@@ -359 +407 @@
-    }
-
+    if( p_vcd->b_valid_ep )
+    {
+        int i_entry = p_area->i_plugin_data /* 1st entry point of
+                                               the track (area)*/
+                            + p_area->i_part - 1;
+        p_vcd->i_sector = p_vcd->p_entries[i_entry];
+    }
+    else
+        p_vcd->i_sector = p_vcd->p_sectors[p_vcd->i_track];
+
+    p_input->stream.p_selected_area->i_tell =
+        (off_t)p_vcd->i_sector * (off_t)VCD_DATA_SIZE
+         - p_input->stream.p_selected_area->i_start;
+
-    /* warn interface that something has changed */
-    p_input->stream.b_seekable = 1;
@@ -373 +435 @@
-{
-    thread_vcd_data_t *               p_vcd;
+    int                               i_index;
-
-    p_vcd = (thread_vcd_data_t *) p_input->p_access_data;
@@ -379 +442 @@
-                       + i_off / (off_t)VCD_DATA_SIZE;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        (off_t)p_vcd->i_sector * (off_t)VCD_DATA_SIZE
-         - p_input->stream.p_selected_area->i_start;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

modules/access/vcd/vcd.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-2 2002/10/15 19:56:59 gbazin
+3 2002/11/06 15:41:29 jobi
- *
- * Author: Johan Bilien <jobi@via.ecp.fr>
@@ -30 +30 @@
-/* size of a CD sector */
-#define CD_SECTOR_SIZE 2048
+/* sector containing the entry points */
+#define VCD_ENTRIES_SECTOR 151
+
+/*****************************************************************************
+ * Misc. Macros
+ *****************************************************************************/
+/* LBA = msf.frame + 75 * ( msf.second + 60 * msf.minute ) */
+#define MSF_TO_LBA(min, sec, frame) ((int)frame + 75 * (sec + 60 * min))
+/* LBA = msf.frame + 75 * ( msf.second - 2 + 60 * msf.minute ) */
+#define MSF_TO_LBA2(min, sec, frame) ((int)frame + 75 * (sec -2 + 60 * min))
+/* Converts BCD to Binary data */
+#define BCD_TO_BIN(i) \
+    ((uint8_t)(0xf & (uint8_t)i)+((uint8_t)10*((uint8_t)i >> 4)))
-
-#ifndef VCDDEV_T
-typedef struct vcddev_s vcddev_t;
-#endif
+
+/*****************************************************************************
+ * structure to store minute/second/frame locations
+ *****************************************************************************/
+typedef struct msf_s
+{
+    uint8_t minute;
+    uint8_t second;
+    uint8_t frame;
+} msf_t;
+
+
+/*****************************************************************************
+ * entries_sect structure: the sector containing entry points
+ *****************************************************************************/
+typedef struct entries_sect_s
+{
+    uint8_t psz_id[8];                              /* "ENTRYVCD" */
+    uint8_t i_version;                              /* 0x02 VCD2.0
+                                                       0x01 SVCD  */
+    uint8_t i_sys_prof_tag;                         /* 0x01 if VCD1.1
+                                                       0x00 else */
+    uint16_t i_entries_nb;                          /* entries number <= 500 */
+
+    struct
+    {
+        uint8_t i_track;                            /* track number */
+        msf_t   msf;                                /* msf location
+                                                       (in BCD format) */
+    } entry[500];
+    uint8_t zeros[36];                              /* should be 0x00 */
+} entries_sect_t;
-
-/*****************************************************************************
@@ -42 +87 @@
-int       ioctl_GetTracksMap ( vlc_object_t *, const vcddev_t *, int ** );
-int       ioctl_ReadSector   ( vlc_object_t *, const vcddev_t *,
-           
+                        

modules/gui/gtk/gtk_callbacks.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
-3 2002/09/30 11:05:39 sam
+4 2002/11/06 15:41:29 jobi
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -218 +218 @@
-    p_intf = GtkGetIntf( button );
-
+    vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
-    i_id = p_intf->p_sys->p_input->stream.p_selected_area->i_id - 1;
-
@@ -223 +224 @@
-    {
-        p_area = p_intf->p_sys->p_input->stream.pp_areas[i_id];
+        vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
-        input_ChangeArea( p_intf->p_sys->p_input, (input_area_t*)p_area );
-
@@ -230 +232 @@
-        vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
-        GtkSetupMenus( p_intf );
-    vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
-}
+}
+vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
-}
-
@@ -242 +244 @@
-
-    p_intf = GtkGetIntf( button );
+    vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
-    i_id = p_intf->p_sys->p_input->stream.p_selected_area->i_id + 1;
-
@@ -247 +250 @@
-    {
-        p_area = p_intf->p_sys->p_input->stream.pp_areas[i_id];   
+        vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
-        input_ChangeArea( p_intf->p_sys->p_input, (input_area_t*)p_area );
-
@@ -254 +258 @@
-        vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
-        GtkSetupMenus( p_intf );
-    vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
-}
+}
+vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
-}
-
@@ -265 +269 @@
-
-    p_intf = GtkGetIntf( button );
+    vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
-    p_area = p_intf->p_sys->p_input->stream.p_selected_area;
-
@@ -270 +275 @@
-    {
-        p_area->i_part--;
+        vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
-        input_ChangeArea( p_intf->p_sys->p_input, (input_area_t*)p_area );
+        vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
+ 
+        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
+
+        p_intf->p_sys->b_chapter_update = 1;
+        GtkSetupMenus( p_intf );
+    }
+    vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
+}
+
+
+void GtkChapterNext( GtkButton * button, gpointer user_data )
+{
+    intf_thread_t * p_intf;
+    input_area_t *  p_area;
+
+    p_intf = GtkGetIntf( button );
+    vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
+    p_area = p_intf->p_sys->p_input->stream.p_selected_area;
+
+    if( p_area->i_part < p_area->i_part_nb )
+    {
+        p_area->i_part++;
+        vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
+        input_ChangeArea( p_intf->p_sys->p_input, (input_area_t*)p_area );
+        vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
-
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
@@ -277 +309 @@
-        vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
-        GtkSetupMenus( p_intf );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-