rb_cdio 0.1.1 → 0.2.0

data/test/data/data6.toc

@@ -1,8 +1,8 @@
-// $Id: data6.toc,v 1.1 2004/05/08 20:36:02 rocky Exp $
+// $Id: data6.toc,v 1.2 2005/01/23 00:45:57 rocky Exp $
 // MODE2 track
 // 
 
 CD_ROM
 
 TRACK MODE2
-FILE "vcd_demo.bin" 00:00:00 00:13:57
+FILE "isofs-m1.bin" 00:00:00 00:13:57

data/test/data/data7.toc

@@ -1,13 +1,13 @@
-// $Id: data7.toc,v 1.1 2004/05/09 17:05:34 rocky Exp $
+// $Id: data7.toc,v 1.2 2005/01/23 00:45:57 rocky Exp $
 // Video CD
 // 
 
 CD_ROM_XA
 
 TRACK MODE1 // ISO filesystem
-FILE "vcd_demo.bin" 00:00:00 00:13:57
+FILE "isofs-m1.bin" 00:00:00 00:13:57
 
 TRACK MODE2_FORM_MIX // XA track with form 1 and form 2 sectors
 PREGAP 0:2:0
-FILE "vcd_demo.bin" 00:20:71 00:00:00
+FILE "isofs-m1.bin" 00:20:71 00:00:00
 

data/test/data/isofs-m1-no-rr.right

@@ -0,0 +1,33 @@
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+
+CD-ROM Track List (1 - 1)
+  #: MSF       LSN    Type   Green? Copy?
+  1: 00:02:00  000000 data   false  no   
+170: 00:06:02  000302 leadout (693 KB raw, 604 KB formatted)
+Media Catalog Number (MCN): not available
+Last CD Session LSN: not supported by drive/driver
+__________________________________
+CD Analysis Report
+CD-ROM with ISO 9660 filesystem
+ISO 9660: 64 blocks, label `CDROM                           '
+Application: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+Preparer   : 
+Publisher  : 
+System     : LINUX
+Volume     : CDROM
+Volume Set : 
+ISO9660 filesystem
+/:
+  d [LSN     23]      2048 Apr 20 2003 11:26:46  .
+  d [LSN     23]      2048 Apr 20 2003 11:26:46  ..
+  - [LSN     26]     17992 Jul 29 2002 12:39:53  copying
+  d [LSN     24]      2048 Apr 20 2003 16:18:53  doc
+
+/doc/:
+  d [LSN     24]      2048 Apr 20 2003 16:18:53  .
+  d [LSN     23]      2048 Apr 20 2003 11:26:46  ..
+  - [LSN     35]       648 Apr 20 2003 16:18:53  readme.txt
+

data/test/data/isofs-m1-read.right

@@ -1,3 +1,6 @@
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
 0x0000: 0909 2020 2020 474e 5520 4745 4e45 5241   ..    GNU GENERA
 0x0010: 4c20 5055 424c 4943 204c 4943 454e 5345   L PUBLIC LICENSE
 0x0020: 0a09 0920 2020 2020 2020 5665 7273 696f   ...       Versio

data/test/data/isofs-m1.right

@@ -1,36 +1,14 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 CD-ROM Track List (1 - 1)
-  #: MSF       LSN     Type  Green?
-  1: 00:02:00  000000  data  false
-170: 00:06:02  000302  leadout
+  #: MSF       LSN    Type   Green? Copy?
+  1: 00:02:00  000000 data   false  no   
+170: 00:06:02  000302 leadout (693 KB raw, 604 KB formatted)
 Media Catalog Number (MCN): not available
+Last CD Session LSN: not supported by drive/driver
 __________________________________
 CD Analysis Report
 CD-ROM with ISO 9660 filesystem
@@ -42,16 +20,14 @@ System     : LINUX
 Volume     : CDROM
 Volume Set : 
 ISO9660 filesystem
- root dir in PVD set to lsn 23
-
 /:
- Apr 20 2003 07:26  .
- Apr 20 2003 07:26  ..
- Jul 29 2002 08:39  copying
- Apr 20 2003 12:18  doc
+  drwxrwxr-x   3 715 715 [LSN     23]      2048 Apr 20 2003 11:26:46  .
+  drwxrwxr-x   3 715 715 [LSN     23]      2048 Apr 20 2003 11:26:46  ..
+  -rw-r--r--   1 715 715 [LSN     26]     17992 Jul 29 2002 12:39:53  COPYING
+  drwxrwxr-x   2 715 715 [LSN     24]      2048 Apr 20 2003 16:18:53  doc
 
-/DOC/:
- Apr 20 2003 12:18  .
- Apr 20 2003 07:26  ..
- Apr 20 2003 12:18  readme.txt
+/doc/:
+  drwxrwxr-x   2 715 715 [LSN     24]      2048 Apr 20 2003 16:18:53  .
+  drwxrwxr-x   3 715 715 [LSN     23]      2048 Apr 20 2003 11:26:46  ..
+  -rw-rw-r--   1 715 715 [LSN     35]       648 Apr 20 2003 16:18:53  readme.txt
 

data/test/data/joliet-nojoliet.right

@@ -0,0 +1,23 @@
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+ISO-9660 Information
+/:
+  d [LSN     28]      2048 Oct 22 2004 22:44:59  .
+  d [LSN     28]      2048 Oct 22 2004 22:44:59  ..
+  d [LSN     29]      2048 Oct 22 2004 22:44:59  libcdio
+
+/libcdio/:
+  d [LSN     29]      2048 Oct 22 2004 22:44:59  .
+  d [LSN     28]      2048 Oct 22 2004 22:44:59  ..
+  - [LSN     34]     17992 Mar 12 2004 07:18:03  copying
+  - [LSN     43]      2156 Jun 26 2004 10:01:09  readme
+  - [LSN     45]      2849 Aug 12 2004 09:22:23  readme.libcdio
+  d [LSN     30]      2048 Oct 22 2004 22:44:59  test
+
+/libcdio/test/:
+  d [LSN     30]      2048 Oct 22 2004 22:44:59  .
+  d [LSN     29]      2048 Oct 22 2004 22:44:59  ..
+  - [LSN     47]        74 Jul 25 2004 09:52:32  isofs_m1.cue
+

data/test/data/joliet.right

@@ -0,0 +1,23 @@
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+__________________________________
+ISO-9660 Information
+/:
+  d [LSN     31]      2048 Oct 22 2004 22:44:59  .
+  d [LSN     31]      2048 Oct 22 2004 22:44:59  ..
+  d [LSN     32]      2048 Oct 22 2004 22:44:59  libcdio
+
+/libcdio/:
+  d [LSN     32]      2048 Oct 22 2004 22:44:59  .
+  d [LSN     31]      2048 Oct 22 2004 22:44:59  ..
+  - [LSN     34]     17992 Mar 12 2004 07:18:03  COPYING
+  - [LSN     43]      2156 Jun 26 2004 10:01:09  README
+  - [LSN     45]      2849 Aug 12 2004 09:22:23  README.libcdio
+  d [LSN     33]      2048 Oct 22 2004 22:44:59  test
+
+/libcdio/test/:
+  d [LSN     33]      2048 Oct 22 2004 22:44:59  .
+  d [LSN     32]      2048 Oct 22 2004 22:44:59  ..
+  - [LSN     47]        74 Jul 25 2004 09:52:32  isofs-m1.cue
+

data/test/data/testbincue.c

@@ -1,5 +1,5 @@
 /*
-  $Id: testbincue.c,v 1.2 2004/07/10 01:18:02 rocky Exp $
+  $Id: testbincue.c,v 1.5 2004/10/26 01:21:05 rocky Exp $
 
   Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
   
@@ -38,6 +38,10 @@
 #endif
 #include <string.h>
 
+#ifndef TEST_DIR
+#define TEST_DIR "."
+#endif
+
 #define NUM_GOOD_CUES 2
 #define NUM_BAD_CUES 7
 int
@@ -59,26 +63,38 @@ main(int argc, const char *argv[])
   };
   int ret=0;
   unsigned int i;
+  char psz_cuefile[500];
 
+  psz_cuefile[sizeof(psz_cuefile)-1] = '\0';
   cdio_loglevel_default = (argc > 1) ? CDIO_LOG_DEBUG : CDIO_LOG_INFO;
   for (i=0; i<NUM_GOOD_CUES; i++) {
-    if (!cdio_is_cuefile(cue_file[i])) {
+    char *psz_binfile;
+    snprintf(psz_cuefile, sizeof(psz_cuefile)-1,
+	     "%s/%s", TEST_DIR, cue_file[i]);
+    psz_binfile = cdio_is_cuefile(psz_cuefile);
+    if (!psz_binfile) {
       printf("Incorrect: %s doesn't parse as a CDRWin CUE file.\n", 
 	     cue_file[i]);
       ret=i+1;
     } else {
       printf("Correct: %s parses as a CDRWin CUE file.\n", 
 	     cue_file[i]);
+      free(psz_binfile);
     }
   }
 
   for (i=0; i<NUM_BAD_CUES; i++) {
-    if (!cdio_is_cuefile(badcue_file[i])) {
+    char *psz_binfile;
+    snprintf(psz_cuefile, sizeof(psz_cuefile)-1,
+	     "%s/%s", TEST_DIR, badcue_file[i]);
+    psz_binfile=cdio_is_cuefile(psz_cuefile);
+    if (!psz_binfile) {
       printf("Correct: %s doesn't parse as a CDRWin CUE file.\n", 
 	     badcue_file[i]);
     } else {
       printf("Incorrect: %s parses as a CDRWin CUE file.\n", 
 	     badcue_file[i]);
+      free(psz_binfile);
       ret+=50*i+1;
       break;
     }

data/test/data/testdefault.c

@@ -1,7 +1,7 @@
 /*
-  $Id: testdefault.c,v 1.5 2004/05/07 10:57:50 rocky Exp $
+  $Id: testdefault.c,v 1.6 2005/01/23 05:51:44 rocky Exp $
 
-  Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+  Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
   
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -93,6 +93,8 @@ main(int argc, const char *argv[])
   }
 
   if (!is_in(nrg_images, nrg_files[0])) {
+    cdio_free_device_list(nrg_images);
+    free(nrg_images);
     return 10;
   }
       
@@ -188,6 +190,10 @@ main(int argc, const char *argv[])
     return 15;
   }
     
+  cdio_free_device_list(nrg_images);
+  free(nrg_images);
+  cdio_free_device_list(bincue_images);
+  free(bincue_images);
   cdio_free_device_list(imgs);
   free(imgs);
 

data/test/data/testiso9660.c

@@ -1,5 +1,5 @@
 /*
-    $Id: testiso9660.c,v 1.2 2003/09/21 01:14:30 rocky Exp $
+    $Id: testiso9660.c,v 1.4 2005/03/03 10:33:26 rocky Exp $
 
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
 
@@ -24,6 +24,9 @@
 #endif
 
 #include <ctype.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -121,8 +124,10 @@ main (int argc, const char *argv[])
   dst_p = iso9660_pathname_isofy ("this/file.ext", 1);
   if ( 0 != strncmp(dst_p, "this/file.ext;1", 16) ) {
     printf("Failed iso9660_pathname_isofy\n");
+    free(dst_p);
     return 10;
   }
+  free(dst_p);
 
   /* Test get/set date */
   {
@@ -135,16 +140,16 @@ main (int argc, const char *argv[])
     iso9660_set_dtime(p_tm, &dtime);
     iso9660_get_dtime(&dtime, true, &tm);
     if ( memcmp(p_tm, &tm, sizeof(tm)) != 0 ) {
-      printf("Time retrieved with iso0660_get_dtime not same as that set with "
-             "iso9660_set_dtime.\n");
+      printf("Local time retrieved with iso9660_get_dtime not same as\n");
+      printf("that set with iso9660_set_dtime().\n");
       return 11;
     }
     p_tm = gmtime(&now);
     iso9660_set_dtime(p_tm, &dtime);
     iso9660_get_dtime(&dtime, false, &tm);
     if ( memcmp(p_tm, &tm, sizeof(tm)) != 0 ) {
-      printf("Time retrieved with iso0660_get_dtime not same as that set with "
-             "iso9660_set_dtime.\n");
+      printf("GMT time retrieved with iso9660_get_dtime() not same as that\n");
+      printf("set with iso9660_set_dtime().\n");
       return 12;
     }
   }

data/test/data/testparanoia.c

@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2, 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
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+/* Simple program to show using libcdio's version of cdparanoia. */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <cdio/cdda.h>
+#include <cdio/cd_types.h>
+#include <stdio.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef WORDS_BIGENDIAN
+#define BIGENDIAN 1
+#else
+#define BIGENDIAN 0
+#endif
+ 
+#define SKIP_TEST_RC 77
+
+#define MAX_SECTORS 50
+uint8_t audio_buf[MAX_SECTORS][CDIO_CD_FRAMESIZE_RAW] = { {0}, };
+paranoia_cb_mode_t audio_status[MAX_SECTORS];
+unsigned int i = 0;
+
+static void 
+callback(long int inpos, paranoia_cb_mode_t function)
+{
+  audio_status[i] = function;
+}
+
+int
+main(int argc, const char *argv[])
+{
+  cdrom_drive_t *d = NULL; /* Place to store handle given by cd-parapnioa. */
+  driver_id_t driver_id;
+  char **ppsz_cd_drives;  /* List of all drives with a loaded CDDA in it. */
+  int i_rc=0;
+
+  /* See if we can find a device with a loaded CD-DA in it. If successful
+     drive_id will be set.  */
+  ppsz_cd_drives = cdio_get_devices_with_cap_ret(NULL, CDIO_FS_AUDIO, false,
+						 &driver_id);
+
+  if (ppsz_cd_drives && *ppsz_cd_drives) {
+    /* Found such a CD-ROM with a CD-DA loaded. Use the first drive in
+       the list. */
+    d=cdda_identify(*ppsz_cd_drives, 1, NULL);
+  } else {
+    printf("Unable find or access a CD-ROM drive with an audio CD in it.\n");
+    exit(SKIP_TEST_RC);
+  }
+
+  /* Don't need a list of CD's with CD-DA's any more. */
+  cdio_free_device_list(ppsz_cd_drives);
+
+  /* We'll set for verbose paranoia messages. */
+  cdda_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT);
+
+  if ( 0 != cdio_cddap_open(d) ) {
+    printf("Unable to open disc.\n");
+    exit(SKIP_TEST_RC);
+  }
+
+  /* Okay now set up to read up to the first 300 frames of the first
+     audio track of the Audio CD. */
+  { 
+    cdrom_paranoia_t *p = paranoia_init(d);
+    lsn_t i_first_lsn = cdda_disc_firstsector(d);
+
+    if ( -1 == i_first_lsn ) {
+      printf("Trouble getting starting LSN\n");
+    } else {
+      lsn_t   i_lsn; /* Current LSN to read */
+      lsn_t   i_last_lsn = cdda_disc_lastsector(d);
+      unsigned int i_sectors = i_last_lsn - i_first_lsn + 1;
+      unsigned int j;
+      unsigned int i_good = 0;
+      unsigned int i_bad  = 0;
+      
+      /* Set reading mode for full paranoia, but allow skipping sectors. */
+      paranoia_modeset(p, PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP);
+
+      for ( j=0; j<10; j++ ) {
+	
+	/* Pick a place to start reading. */
+	i_lsn = i_first_lsn + (rand() % i_sectors);
+	paranoia_seek(p, i_lsn, SEEK_SET);
+
+	printf("Testing %d sectors starting at %ld\n",
+	       MAX_SECTORS, (long int) i_lsn);
+	for ( i = 0; 
+	      i < MAX_SECTORS && i_lsn <= i_last_lsn; 
+	      i++, i_lsn++ ) {
+	  /* read a sector */
+	  int16_t *p_readbuf = paranoia_read(p, callback);
+	  char *psz_err=cdio_cddap_errors(d);
+	  char *psz_mes=cdio_cddap_messages(d);
+
+	  memcpy(audio_buf[i], p_readbuf, CDIO_CD_FRAMESIZE_RAW);
+	  
+	  if (psz_mes || psz_err)
+	    printf("%s%s\n", psz_mes ? psz_mes: "", psz_err ? psz_err: "");
+	  
+	  if (psz_err) free(psz_err);
+	  if (psz_mes) free(psz_mes);
+	  if( !p_readbuf ) {
+	    printf("paranoia read error. Stopping.\n");
+	    goto out;
+	  }
+	}
+
+	/* Compare with the sectors from paranoia. */
+	i_lsn -= MAX_SECTORS;
+	for ( i = 0; i < MAX_SECTORS; i++, i_lsn++ ) {
+	  uint8_t readbuf[CDIO_CD_FRAMESIZE_RAW] = {0,};
+	  if ( PARANOIA_CB_READ == audio_status[i] || 
+	       PARANOIA_CB_VERIFY == audio_status[i] ) {
+	    /* We read the block via paranoia without an error. */
+
+	    if ( 0 == cdio_read_audio_sector(d->p_cdio, readbuf, i_lsn) ) {
+	      if ( BIGENDIAN != d->bigendianp ) {
+		/* We will compare in the slow, pedantic way*/
+		int j;
+		for (j=0; j < CDIO_CD_FRAMESIZE_RAW ; j +=2) {
+		  if (audio_buf[i][j]   != readbuf[j+1] && 
+		      audio_buf[i][j+1] != readbuf[j] ) {
+		    printf("LSN %ld doesn't match\n", (long int) i_lsn);
+		    i_bad++;
+		  } else {
+		    i_good++;
+		  }
+		}
+	      } else {
+		if ( 0 != memcmp(audio_buf[i], readbuf, 
+				 CDIO_CD_FRAMESIZE_RAW) ) {
+		  printf("LSN %ld doesn't match\n", (long int) i_lsn);
+		  i_bad++;
+		} else {
+		  i_good++;
+		}
+	      }
+	    }
+	  } else {
+	    printf("Skipping LSN %ld because of status: %s\n", 
+		   (long int) i_lsn, paranoia_cb_mode2str[audio_status[i]]);
+	  }
+	}
+      }
+      printf("%u sectors compared okay %u sectors were different\n",
+	     i_good, i_bad);
+      if (i_bad > i_good) i_rc = 1;
+    }
+  out: paranoia_free(p);
+  }
+  
+  cdio_cddap_close(d);
+
+  exit(i_rc);
+}
+