Update internal (and messy) copies to libcdio 0.71 and

vcdimager 0.7.21.

CVS patchset: 7313
CVS date: 2005/01/01 02:43:56

1 files changed, 201 insertions, 23 deletions

diff --git a/src/input/vcd/libcdio/sector.c b/src/input/vcd/libcdio/sector.c
index 8ae28fc03..da49e9908 100644
--- a/src/input/vcd/libcdio/sector.c
+++ b/src/input/vcd/libcdio/sector.c
@@ -1,5 +1,5 @@
 /*
-    $Id: sector.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $
+    $Id: sector.c,v 1.3 2005/01/01 02:43:57 rockyb Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
 
@@ -24,6 +24,7 @@
 
 #include <cdio/sector.h>
 #include <cdio/util.h>
+#include <cdio/logging.h>
 #include "cdio_assert.h"
 
 #include <stdio.h>
@@ -31,76 +32,253 @@
 #include <string.h>
 #endif
 
+#include <ctype.h>
 
-static const char _rcsid[] = "$Id: sector.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $";
+static const char _rcsid[] = "$Id: sector.c,v 1.3 2005/01/01 02:43:57 rockyb Exp $";
 
 lba_t
 cdio_lba_to_lsn (lba_t lba)
 {
+  if (CDIO_INVALID_LBA     == lba) return CDIO_INVALID_LSN;
   return lba - CDIO_PREGAP_SECTORS; 
 }
 
+/* 
+   The below is adapted from cdparanoia code which claims it is
+   straight from the MMC3 spec.
+*/
+
 void
-cdio_lba_to_msf (lba_t lba, msf_t *msf)
+cdio_lsn_to_msf (lsn_t lsn, msf_t *msf)
 {
+  int m, s, f;
+  
   cdio_assert (msf != 0);
 
-  msf->m = to_bcd8 (lba / (60 * 75));
-  msf->s = to_bcd8 ((lba / 75) % 60);
-  msf->f = to_bcd8 (lba % 75);
+  if ( lsn >= -CDIO_PREGAP_SECTORS ){
+    m    = (lsn + CDIO_PREGAP_SECTORS) / CDIO_CD_FRAMES_PER_MIN;
+    lsn -= m * CDIO_CD_FRAMES_PER_MIN;
+    s    = (lsn + CDIO_PREGAP_SECTORS) / CDIO_CD_FRAMES_PER_SEC;
+    lsn -= s * CDIO_CD_FRAMES_PER_SEC;
+    f    = lsn + CDIO_PREGAP_SECTORS;
+  } else {
+    m    = (lsn + CDIO_CD_MAX_LSN)     / CDIO_CD_FRAMES_PER_MIN;
+    lsn -= m * (CDIO_CD_FRAMES_PER_MIN);
+    s    = (lsn+CDIO_CD_MAX_LSN)       / CDIO_CD_FRAMES_PER_SEC;
+    lsn -= s * CDIO_CD_FRAMES_PER_SEC;
+    f    = lsn + CDIO_CD_MAX_LSN;
+  }
+
+  if (m > 99) {
+    cdio_warn ("number of minutes (%d) truncated to 99.", m);
+    m = 99;
+  }
+  
+  msf->m = cdio_to_bcd8 (m);
+  msf->s = cdio_to_bcd8 (s);
+  msf->f = cdio_to_bcd8 (f);
 }
 
-/* warning, returns new allocated string */
+/*! 
+  Convert an LBA into a string representation of the MSF.
+  \warning cdio_lba_to_msf_str returns new allocated string */
 char *
 cdio_lba_to_msf_str (lba_t lba)
 {
-  char buf[16];
-  msf_t _msf = { .m = 0, .s = 0, .f = 0 };
-
-  cdio_lba_to_msf (lba, &_msf);
-
-  snprintf (buf, sizeof (buf), "%.2x:%.2x.%.2x", _msf.m, _msf.s, _msf.f);
 
-  return strdup (buf);
+  if (CDIO_INVALID_LBA == lba) {
+    return strdup("*INVALID");
+  } else {
+    msf_t msf;
+    msf.m = msf.s = msf.f = 0;
+    cdio_lba_to_msf (lba, &msf);
+    return cdio_msf_to_str(&msf);
+  }
 }
 
+/*! 
+  Convert an LSN into the corresponding LBA.
+  CDIO_INVALID_LBA is returned if there is an error.
+*/
 lba_t
 cdio_lsn_to_lba (lsn_t lsn)
 {
+  if (CDIO_INVALID_LSN  == lsn) return CDIO_INVALID_LBA;
   return lsn + CDIO_PREGAP_SECTORS; 
 }
 
+/*! 
+  Convert an LBA into the corresponding MSF.
+*/
 void
-cdio_lsn_to_msf (lsn_t lsn, msf_t *msf)
+cdio_lba_to_msf (lba_t lba, msf_t *msf)
 {
   cdio_assert (msf != 0);
-  cdio_lba_to_msf(cdio_lsn_to_lba(lsn), msf);
+  cdio_lsn_to_msf(cdio_lba_to_lsn(lba), msf);
 }
 
-uint32_t
+/*! 
+  Convert a MSF into the corresponding LBA.
+  CDIO_INVALID_LBA is returned if there is an error.
+*/
+lba_t
 cdio_msf_to_lba (const msf_t *msf)
 {
   uint32_t lba = 0;
 
   cdio_assert (msf != 0);
 
-  lba = from_bcd8 (msf->m);
-  lba *= 60;
+  lba = cdio_from_bcd8 (msf->m);
+  lba *= CDIO_CD_SECS_PER_MIN;
 
-  lba += from_bcd8 (msf->s);
-  lba *= 75;
+  lba += cdio_from_bcd8 (msf->s);
+  lba *= CDIO_CD_FRAMES_PER_SEC;
   
-  lba += from_bcd8 (msf->f);
+  lba += cdio_from_bcd8 (msf->f);
 
   return lba;
 }
 
-uint32_t
+/*! 
+  Convert a MSF into the corresponding LSN.
+  CDIO_INVALID_LSN is returned if there is an error.
+*/
+lba_t
 cdio_msf_to_lsn (const msf_t *msf)
 {
   return cdio_lba_to_lsn(cdio_msf_to_lba (msf));
 }
 
+/*! 
+  Convert an LBA into a string representation of the MSF.
+  \warning cdio_lba_to_msf_str returns new allocated string */
+char *
+cdio_msf_to_str (const msf_t *msf)
+{
+  char buf[16];
+  
+  snprintf (buf, sizeof (buf), "%2.2x:%2.2x:%2.2x", msf->m, msf->s, msf->f);
+  return strdup (buf);
+}
+
+/*!  
+  Convert a MSF - broken out as 3 integer components into the
+  corresponding LBA.  
+  CDIO_INVALID_LBA is returned if there is an error.
+*/
+lba_t
+cdio_msf3_to_lba (unsigned int minutes, unsigned int seconds, 
+                  unsigned int frames)
+{
+  return ((minutes * CDIO_CD_SECS_PER_MIN + seconds) * CDIO_CD_FRAMES_PER_SEC 
+	  + frames);
+}
+
+/*! 
+  Convert a string of the form MM:SS:FF into the corresponding LBA.
+  CDIO_INVALID_LBA is returned if there is an error.
+*/
+lba_t
+cdio_mmssff_to_lba (const char *psz_mmssff)
+{
+  int psz_field;
+  lba_t ret;
+  char c;
+  
+  if (0 == strcmp (psz_mmssff, "0"))
+    return 0;
+  
+  c = *psz_mmssff++;
+  if(c >= '0' && c <= '9')
+    psz_field = (c - '0');
+  else
+    return CDIO_INVALID_LBA;
+  while(':' != (c = *psz_mmssff++)) {
+    if(c >= '0' && c <= '9')
+      psz_field = psz_field * 10 + (c - '0');
+    else
+      return CDIO_INVALID_LBA;
+  }
+  
+  ret = cdio_msf3_to_lba (psz_field, 0, 0);
+  
+  c = *psz_mmssff++;
+  if(c >= '0' && c <= '9')
+    psz_field = (c - '0');
+  else
+    return CDIO_INVALID_LBA;
+  if(':' != (c = *psz_mmssff++)) {
+    if(c >= '0' && c <= '9') {
+      psz_field = psz_field * 10 + (c - '0');
+      c = *psz_mmssff++;
+      if(c != ':')
+	return CDIO_INVALID_LBA;
+    }
+    else
+      return CDIO_INVALID_LBA;
+  }
+  
+  if(psz_field >= CDIO_CD_SECS_PER_MIN)
+    return CDIO_INVALID_LBA;
+  
+  ret += cdio_msf3_to_lba (0, psz_field, 0);
+  
+  c = *psz_mmssff++;
+  if (isdigit(c))
+    psz_field = (c - '0');
+  else
+    return -1;
+  if('\0' != (c = *psz_mmssff++)) {
+    if (isdigit(c)) {
+      psz_field = psz_field * 10 + (c - '0');
+      c = *psz_mmssff++;
+    }
+    else
+      return CDIO_INVALID_LBA;
+  }
+  
+  if('\0' != c)
+    return CDIO_INVALID_LBA;
+  
+  if(psz_field >= CDIO_CD_FRAMES_PER_SEC)
+    return CDIO_INVALID_LBA;
+  
+  ret += psz_field;
+  
+  return ret;
+}
+
+bool
+cdio_is_discmode_cdrom(discmode_t discmode) 
+{
+  switch (discmode) {
+  case CDIO_DISC_MODE_CD_DA:
+  case CDIO_DISC_MODE_CD_DATA:
+  case CDIO_DISC_MODE_CD_XA:
+  case CDIO_DISC_MODE_CD_MIXED:
+  case CDIO_DISC_MODE_NO_INFO:
+    return true;
+  default:
+    return false;
+  }
+}
+
+bool
+cdio_is_discmode_dvd(discmode_t discmode) 
+{
+  switch (discmode) {
+  case CDIO_DISC_MODE_DVD_ROM:
+  case CDIO_DISC_MODE_DVD_RAM:
+  case CDIO_DISC_MODE_DVD_R:
+  case CDIO_DISC_MODE_DVD_RW:
+  case CDIO_DISC_MODE_DVD_PR:
+  case CDIO_DISC_MODE_DVD_PRW:
+    return true;
+  default:
+    return false;
+  }
+}
+
 
 /* 
  * Local variables: