Changeset 418edc0d35fd428561a2019652ffc2f606baa7b0

Timestamp:

06/09/04 06:38:46 (4 years ago)

Author:

Rocky Bernstein <rocky@videolan.org>

git-committer:

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

git-parent:

[08997aa08c3f05c4fa2c1e0e803b93efdeda3ddf]

git-author:

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

Message:

2nd attempt to get libcdio cdda working.

mtime.h: define constant for second-to-millisecond conversions.

Files:

• include/mtime.h (modified) (1 diff)
• modules/access/cdda/Modules.am (modified) (1 diff)
• modules/access/cdda/access.c (modified) (42 diffs)
• modules/access/cdda/cdda.h (modified) (2 diffs)

include/mtime.h

@@ -48 +48 @@
-#define MSTRTIME_MAX_SIZE 22
-
+/* Well, Duh? But it does clue us in that we are converting from
+   millisecond quantity to a second quantity or vice versa.
+*/
+#define MILLISECONDS_PER_SEC 1000
+
-#define msecstotimestr(psz_buffer, msecs) \
-1000
+MILLISECONDS_PER_SEC
-
-/*****************************************************************************

modules/access/cdda/Modules.am

@@ -1 +1 @@
-SOURCES_cddax = \
-        ../vcdx/cdrom.c \
-        ../vcdx/cdrom.h \
-    access.c \
-    cdda.c \

modules/access/cdda/access.c

@@ -32 +32 @@
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_playlist.h>
-
-#include <sys/types.h>
-#include <cdio/cdio.h>
+#include <cdio/logging.h>
-#include <cdio/cd_types.h>
-
@@ -52 +54 @@
-#include "cdda.h"
-
-
+
+
+
+
+
-#define CDDA_BLOCKS_ONCE 20
-#define CDDA_DATA_ONCE   (CDDA_BLOCKS_ONCE * CDIO_CD_FRAMESIZE_RAW)
-
-
+
+
-
-/* FIXME: This variable is a hack. Would be nice to eliminate. */
@@ -69 +76 @@
-                 va_list args );
-static void     CDDAMetaInfo( access_t *p_access  );
+static int      CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda, 
+                   const char *psz_source, 
+                   vlc_bool_t b_single_track );
+static void     CDDACreatePlaylistItem(const access_t *p_access, 
+                       cdda_data_t *p_cdda,
+                       playlist_t *p_playlist, 
+                       track_t i_track,
+                       char *psz_mrl, int psz_mrl_max,
+                       const char *psz_source, 
+                       int playlist_operation,
+                       int i_pos);
+
+static int      GetCDInfo( access_t *p_access, cdda_data_t *p_cdda ) ;
+
+
+
-
-/****************************************************************************
@@ -127 +150 @@
-uninit_log_handler (cdio_log_level_t level, const char message[])
-{
-
+
+
+
+
+
-  switch (level) {
-  case CDIO_LOG_DEBUG:
-  case CDIO_LOG_INFO:
-
+p_cdda || !
-      return;
-    /* Fall through if to warn case */
@@ -167 +194 @@
-
-    dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_LSN), "called %d", 
-sector
+lsn
-
-    /* Check end of file */
@@ -182 +209 @@
-
-    /* Check end of track */
-sector >= p_cdda->p_sector
+lsn >= p_cdda->p_lsn
-    {
-        if( p_access->info.i_title + 1 >= p_cdda->i_tracks )
@@ -195 +222 @@
-      p_cdda->p_title[p_access->info.i_title]->i_size;
-        p_access->info.i_pos = 0;
+    p_cdda->i_track++;
-    }
-
-    /* Don't read after the end of a title */
-sector
-sector
+lsn
+lsn
-    {
-sector
-sector
+lsn
+lsn
-    }
-
@@ -214 +242 @@
-    }
-
-dev->cd
-sector
+
+lsn
-        {
-            msg_Err( p_access, "could not read sector %lu", 
-sector
+lsn
-            block_Release( p_block );
-
@@ -225 +253 @@
-           the future libcdio may have cdparanoia support.
-         */
-sector
+lsn
-        p_access->info.i_pos += CDIO_CD_FRAMESIZE_RAW;
-        return NULL;
-        }
-
-sector
+lsn
-    p_access->info.i_pos += p_block->i_buffer;
-
@@ -245 +273 @@
-    cdda_data_t *p_cdda = (cdda_data_t *) p_access->p_sys;
-
-sector = p_cdda->p_sector
+lsn = p_cdda->p_lsn
-                       + i_pos / CDIO_CD_FRAMESIZE_RAW;
-    p_access->info.i_pos = i_pos;
-
-    dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_SEEK),
-sector
-sector
+lsn
+lsn
-    return VLC_SUCCESS;
-}
@@ -271 +299 @@
-    int i, i_matches;
-    cddb_conn_t  *conn = cddb_new();
-dev->cd
+
-
-
@@ -277 +305 @@
-
-    if (!conn) {
-"unable to initialize libcddb"
+_("Unable to initialize libcddb")
-      goto cddb_destroy;
-    }
@@ -314 +342 @@
-    p_cdda->cddb.disc = cddb_disc_new();
-    if (!p_cdda->cddb.disc) {
-"Unable to create CDDB disc structure."
+_("Unable to create CDDB disc structure.")
-      goto cddb_end;
-    }
@@ -331 +359 @@
-
-    if (!cddb_disc_calc_discid(p_cdda->cddb.disc)) {
-"CDDB disc calc failed"
+_("CDDB disc ID calculation failed")
-      goto cddb_destroy;
-    }
@@ -338 +366 @@
-    if (i_matches > 0) {
-      if (i_matches > 1)
-"Found %d matches in CDDB. Using first one."
+_("Found %d matches in CDDB. Using first one.")
-                  i_matches);
-      cddb_read(conn, p_cdda->cddb.disc);
@@ -346 +374 @@
-
-    } else {
-"CDDB error: %s"
+_("CDDB error: %s")
-    }
-
@@ -357 +385 @@
-
-#define add_meta_val(FIELD, VLC_META, VAL)              \
-
+&& VAL
-    vlc_meta_Add( p_cdda->p_meta, VLC_META, VAL );          \
-    dbg_print( INPUT_DBG_META, "field %s: %s\n", VLC_META, VAL );   \
@@ -410 +438 @@
-    char psz_buffer[MSTRTIME_MAX_SIZE];
-    mtime_t i_duration =
-sectors[i_track] - p_cdda->p_sector
+lsns[i_track] - p_cdda->p_lsn
-      / CDIO_CD_FRAMES_PER_SEC;
-
@@ -420 +448 @@
-      char track_str[TITLE_MAX];
-      mtime_t i_duration =
-sectors[i_track+1] - p_cdda->p_sector
+lsns[i_track+1] - p_cdda->p_lsn
-        / CDIO_CD_FRAMES_PER_SEC;
-      snprintf(track_str, TITLE_MAX, "%s %02d", _("Track"), i_track+1);
@@ -507 +535 @@
-  size_t i;
-  char * tp = temp_str;
-bool
+vlc_bool_t
-  size_t format_len = strlen(format_str);
-
@@ -600 +628 @@
-        char psz_buffer[MSTRTIME_MAX_SIZE];
-        mtime_t i_duration =
-sectors[i_track] - p_cdda->p_sector
+lsns[i_track] - p_cdda->p_lsn
-          / CDIO_CD_FRAMES_PER_SEC;
-        add_format_str_info(secstotimestr( psz_buffer, i_duration ) );
@@ -621 +649 @@
-}
-
-#ifdef TRACK_META_INFORMATION_FINISHED
-static void
-ListItem(const input_thread
-unsigned in
+listItem(const access
+track_
-                       char *psz_mrl, int psz_mrl_max,
-                       const char *psz_source, int playlist_operation,
@@ -630 +657 @@
-{
-  mtime_t i_duration =
-sectors[i_track] - p_cdda->p_sector
+lsns[i_track] - p_cdda->p_lsn
-    * (1000000 / CDIO_CD_FRAMES_PER_SEC) ;
-  char *p_author;
@@ -712 +739 @@
-
-static int
-List( access_t *p_access, cdda_data_t *p_cdda,
-                   const char *psz_source, track_t i_track
+list( access_t *p_access, cdda_data_t *p_cdda, 
+          const char *psz_source, vlc_bool_t b_single_track 
-{
-  int i;
+  playlist_t * p_playlist;
-  char       * psz_mrl;
-  unsigned int psz_mrl_max = strlen(CDDA_MRL_PREFIX) + strlen(psz_source) +
-    strlen("@T") + strlen("100") + 1;
-
+#ifdef HAVE_LIBCDDB
+  p_cdda->i_cddb_enabled =
+    config_GetInt( p_access, MODULE_STRING "-cddb-enabled" );
+  if( b_single_track && !p_cdda->i_cddb_enabled ) return 0;
+#else
+  if( b_single_track ) return VLC_SUCCESS;
+#endif
+
-  psz_mrl = malloc( psz_mrl_max );
-
@@ -725 +761 @@
-    {
-      msg_Warn( p_access, "out of memory" );
-
+
+
+
+
+
+
+
+
+
+
-    }
-
-  CDDAMetaInfo(p_access);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/****************************************************************************
@@ -797 +851 @@
-E_(CDDAOpen)( vlc_object_t *p_this )
-{
-
-
-
-
-
+
+
+
+
+
+
+
-
-    /* Set where to log errors messages from libcdio. */
-    p_cdda_input = p_access;
-
-
+
+
+
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if( !p_this->b_force ) return VLC_EGENERIC;
-
@@ -817 +898 @@
-        char **cd_drives =
-          cdio_get_devices_with_cap(NULL,  CDIO_FS_AUDIO, false);
-
-
-
-
-
+
+
+
+
+
+
+
+
-        psz_source = strdup(cd_drives[0]);
-        cdio_free_device_list(cd_drives);
-      }
-    }
-    else 
-      psz_source = strdup( p_access->psz_path );
-
-    cdio_log_set_handler ( cdio_log_handler );
-
-    /* Open CDDA */
-dev = ioctl_Open( p_this, psz_source
+io = cdio_open( psz_source, DRIVER_UNKNOWN
-    {
-        msg_Warn( p_access, "could not open %s", psz_source );
@@ -845 +927 @@
-        return VLC_ENOMEM;
-    }
+    memset( p_cdda, 0, sizeof(cdda_data_t) );
-
-#ifdef HAVE_LIBCDDB
@@ -854 +937 @@
-
-    p_cdda->b_header = VLC_FALSE;
-
+
+
-    p_cdda->i_debug  = config_GetInt( p_this, MODULE_STRING "-debug" );
-
-    printf("+++debug: %d\n", p_cdda->i_debug);
-
-    dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT), "%s", psz_source );
-
-    /* We read the Table Of Content information */
-    p_cdda->i_tracks = ioctl_GetTracksMap( VLC_OBJECT(p_access),
-                              p_cdda->p_cddev->cdio, &p_cdda->p_sectors );
-    if( p_cdda->i_tracks < 0 ) {
-        msg_Err( p_access, "unable to count tracks" );
-        goto error;
-    } else if( p_cdda->i_tracks <= 0 ) {
-        msg_Err( p_access, "no audio tracks found" );
-        goto error;
-    }
-
-    /* Set up p_access */
@@ -887 +958 @@
-    p_access->p_sys     = (access_sys_t *) p_cdda;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    
-    /* Build a WAV header to put in front of the output data. 
@@ -937 +976 @@
-    SetDWLE( &p_cdda->waveheader.SubChunkLength, 16);
-    SetWLE( &p_cdda->waveheader.Modus, 2);
-44100
+CDDA_FREQUENCY_SAMPLE
-    SetWLE( &p_cdda->waveheader.BytesPerSample,
-            2 /*Modus*/ * 16 /*BitsPerSample*/ / 8 );
-    SetDWLE( &p_cdda->waveheader.BytesPerSec,
-44100 /*SampleFreq*/
+CDDA_FREQUENCY_SAMPLE
-    p_cdda->waveheader.DataChunkID = VLC_FOURCC('d', 'a', 't', 'a');
-    p_cdda->waveheader.DataLength  = 0;    /* we just don't know */
@@ -951 +990 @@
-
- error:
-ioctl_Close( p_cdda->p_cddev
+cdio_destroy( p_cdda->p_cdio
-    free( p_cdda );
- error2:
-    free( psz_source );
-VLC_EGENERIC
+i_rc
-
-}
@@ -977 +1016 @@
-    }
-
-ioctl_Close( p_cdda->p_cddev
+cdio_destroy( p_cdda->p_cdio
-
-    cdio_log_set_handler (uninit_log_handler);
@@ -987 +1026 @@
-#endif
-
-sector
+lsn
-    if (p_cdda->psz_mcn) free( p_cdda->psz_mcn );
-    free( p_cdda );
@@ -1001 +1040 @@
-{
-    cdda_data_t  *p_cdda = (cdda_data_t *) p_access->p_sys;
-    vlc_bool_t   *pb_bool;
-    int          *pi_int;
-    int i;
@@ -1015 +1053 @@
-        case ACCESS_GET_META:
-      { 
-
-
-
-
+
+
+
+
+
+
+
-        return VLC_SUCCESS;
-      }
@@ -1026 +1067 @@
-        case ACCESS_CAN_FASTSEEK:
-        case ACCESS_CAN_PAUSE:
-
-
+
+
+
-            *pb_bool = VLC_TRUE;
-            break;
+      }
-
-        /* */
@@ -1039 +1082 @@
-        case ACCESS_GET_PTS_DELAY:
-      { 
-
-
-
-
+
+
+
-            break;
-      }
@@ -1059 +1101 @@
-            *pi_int = p_cdda->i_tracks;
-            *ppp_title = malloc(sizeof( input_title_t **) * p_cdda->i_tracks );
+
+        if (!*ppp_title) return VLC_ENOMEM;
+
-            for( i = 0; i < p_cdda->i_tracks; i++ )
-            {
+          if ( p_cdda->p_title[i] )
-                (*ppp_title)[i] = 
-          vlc_input_title_Duplicate( p_cdda->p_title[i] );
@@ -1079 +1125 @@
-
-                /* Next sector to read */
-sector = p_cdda->p_sector
+lsn = p_cdda->p_lsn
-            }
-            break;
@@ -1087 +1133 @@
-            return VLC_EGENERIC;
-        default:
-            msg_Warn( p_access, "unimplemented query in control"
+     msg_Warn( p_access, _("unimplemented query in control")
-            return VLC_EGENERIC;
-
@@ -1093 +1139 @@
-    return VLC_SUCCESS;
-}
+
+/*****************************************************************************
+  GetCDInfo: 
+
+ Initialize information pertaining to the CD: the number of tracks,
+ first track number, LSNs for each track and the leadout. The leadout
+ information is stored after the last track. The LSN array is
+ 0-origin, same as p_access->info.  Add first_track to get what track
+ number this is on the CD. Note: libcdio uses the real track number.
+
+ We return the VLC-type status, e.g. VLC_SUCCESS, VLC_ENOMEM, etc.
+ *****************************************************************************/
+static int
+GetCDInfo( access_t *p_access, cdda_data_t *p_cdda ) 
+{
+    track_t i;
+    discmode_t  discmode = CDIO_DISC_MODE_NO_INFO;
+
+    p_cdda->i_tracks       = cdio_get_num_tracks(p_cdda->p_cdio);
+    p_cdda->i_first_track  = cdio_get_first_track_num(p_cdda->p_cdio);
+
+    discmode = cdio_get_discmode(p_cdda->p_cdio);
+    switch(discmode) {
+    case CDIO_DISC_MODE_CD_DA:
+    case CDIO_DISC_MODE_CD_MIXED:
+      /* These are possible for CD-DA */
+      break;
+    default:
+      /* These are not possible for CD-DA */
+      msg_Err( p_access, 
+           _("Disc seems not to be CD-DA. libcdio reports it is %s"),
+           discmode2str[discmode]
+           );
+      return VLC_EGENERIC;
+    }
+    
+    p_cdda->p_lsns = malloc( (p_cdda->i_tracks + 1) * sizeof(lsn_t) );
+
+    if( p_cdda->p_lsns == NULL )
+      {
+        msg_Err( p_access, "out of memory" );
+        return VLC_ENOMEM;
+      }
+
+    
+
+    /* Fill the p_lsns structure with the track/sector matches.
+       Note cdio_get_track_lsn when given num_tracks + 1 will return
+       the leadout LSN.
+     */
+    for( i = 0 ; i <= p_cdda->i_tracks ; i++ )
+      {
+        (p_cdda->p_lsns)[ i ] = 
+      cdio_get_track_lsn(p_cdda->p_cdio, p_cdda->i_first_track+i);
+      }
+    
+    return VLC_SUCCESS;
+}

modules/access/cdda/cdda.h

@@ -23 +23 @@
- *****************************************************************************/
-
-"../vcdx/cdrom.h"
+<cdio/cdio.h>
-#include "vlc_meta.h"
-
@@ -57 +57 @@
-typedef struct cdda_data_s
-{
-cddev_t     *p_cddev;                 /* CD device descriptor
+CdIo       *p_cdio;                   /* libcdio CD device
-    int         i_tracks;                 /* # of tracks (titles) */
+    int         i_first_track;            /* # of first track */
-
-    /* Current position */
-    int         i_track;                  /* Current track */
-sector;                 /* Current Secto
-sectors;                /* Track sector
+lsn;                    /* Current Logical Sector Numbe
+lsns;                   /* Track LSN
-
-    int         i_debug;                  /* Debugging mask */