Move libcdio and libvcd into contrib/

--HG--
rename : src/input/vcd/libcdio/FreeBSD/freebsd.c => contrib/libcdio/FreeBSD/freebsd.c
rename : src/input/vcd/libcdio/FreeBSD/freebsd.h => contrib/libcdio/FreeBSD/freebsd.h
rename : src/input/vcd/libcdio/FreeBSD/freebsd_cam.c => contrib/libcdio/FreeBSD/freebsd_cam.c
rename : src/input/vcd/libcdio/FreeBSD/freebsd_ioctl.c => contrib/libcdio/FreeBSD/freebsd_ioctl.c
rename : src/input/vcd/libcdio/MSWindows/Makefile.am => contrib/libcdio/MSWindows/Makefile.am
rename : src/input/vcd/libcdio/MSWindows/aspi32.c => contrib/libcdio/MSWindows/aspi32.c
rename : src/input/vcd/libcdio/MSWindows/aspi32.h => contrib/libcdio/MSWindows/aspi32.h
rename : src/input/vcd/libcdio/MSWindows/win32.c => contrib/libcdio/MSWindows/win32.c
rename : src/input/vcd/libcdio/MSWindows/win32.h => contrib/libcdio/MSWindows/win32.h
rename : src/input/vcd/libcdio/MSWindows/win32_ioctl.c => contrib/libcdio/MSWindows/win32_ioctl.c
rename : src/input/vcd/libcdio/Makefile.am => contrib/libcdio/Makefile.am
rename : src/input/vcd/libcdio/_cdio_bsdi.c => contrib/libcdio/_cdio_bsdi.c
rename : src/input/vcd/libcdio/_cdio_generic.c => contrib/libcdio/_cdio_generic.c
rename : src/input/vcd/libcdio/_cdio_linux.c => contrib/libcdio/_cdio_linux.c
rename : src/input/vcd/libcdio/_cdio_osx.c => contrib/libcdio/_cdio_osx.c
rename : src/input/vcd/libcdio/_cdio_stdio.c => contrib/libcdio/_cdio_stdio.c
rename : src/input/vcd/libcdio/_cdio_stdio.h => contrib/libcdio/_cdio_stdio.h
rename : src/input/vcd/libcdio/_cdio_stream.c => contrib/libcdio/_cdio_stream.c
rename : src/input/vcd/libcdio/_cdio_stream.h => contrib/libcdio/_cdio_stream.h
rename : src/input/vcd/libcdio/_cdio_sunos.c => contrib/libcdio/_cdio_sunos.c
rename : src/input/vcd/libcdio/cd_types.c => contrib/libcdio/cd_types.c
rename : src/input/vcd/libcdio/cdio.c => contrib/libcdio/cdio.c
rename : src/input/vcd/libcdio/cdio/Makefile.am => contrib/libcdio/cdio/Makefile.am
rename : src/input/vcd/libcdio/cdio/bytesex.h => contrib/libcdio/cdio/bytesex.h
rename : src/input/vcd/libcdio/cdio/bytesex_asm.h => contrib/libcdio/cdio/bytesex_asm.h
rename : src/input/vcd/libcdio/cdio/cd_types.h => contrib/libcdio/cdio/cd_types.h
rename : src/input/vcd/libcdio/cdio/cdio.h => contrib/libcdio/cdio/cdio.h
rename : src/input/vcd/libcdio/cdio/cdtext.h => contrib/libcdio/cdio/cdtext.h
rename : src/input/vcd/libcdio/cdio/ds.h => contrib/libcdio/cdio/ds.h
rename : src/input/vcd/libcdio/cdio/dvd.h => contrib/libcdio/cdio/dvd.h
rename : src/input/vcd/libcdio/cdio/iso9660.h => contrib/libcdio/cdio/iso9660.h
rename : src/input/vcd/libcdio/cdio/logging.h => contrib/libcdio/cdio/logging.h
rename : src/input/vcd/libcdio/cdio/scsi_mmc.h => contrib/libcdio/cdio/scsi_mmc.h
rename : src/input/vcd/libcdio/cdio/sector.h => contrib/libcdio/cdio/sector.h
rename : src/input/vcd/libcdio/cdio/types.h => contrib/libcdio/cdio/types.h
rename : src/input/vcd/libcdio/cdio/util.h => contrib/libcdio/cdio/util.h
rename : src/input/vcd/libcdio/cdio/version.h => contrib/libcdio/cdio/version.h
rename : src/input/vcd/libcdio/cdio/xa.h => contrib/libcdio/cdio/xa.h
rename : src/input/vcd/libcdio/cdio_assert.h => contrib/libcdio/cdio_assert.h
rename : src/input/vcd/libcdio/cdio_private.h => contrib/libcdio/cdio_private.h
rename : src/input/vcd/libcdio/cdtext.c => contrib/libcdio/cdtext.c
rename : src/input/vcd/libcdio/cdtext_private.h => contrib/libcdio/cdtext_private.h
rename : src/input/vcd/libcdio/ds.c => contrib/libcdio/ds.c
rename : src/input/vcd/libcdio/generic.h => contrib/libcdio/generic.h
rename : src/input/vcd/libcdio/image.h => contrib/libcdio/image.h
rename : src/input/vcd/libcdio/image/Makefile.am => contrib/libcdio/image/Makefile.am
rename : src/input/vcd/libcdio/image/bincue.c => contrib/libcdio/image/bincue.c
rename : src/input/vcd/libcdio/image/cdrdao.c => contrib/libcdio/image/cdrdao.c
rename : src/input/vcd/libcdio/image/nrg.c => contrib/libcdio/image/nrg.c
rename : src/input/vcd/libcdio/image/nrg.h => contrib/libcdio/image/nrg.h
rename : src/input/vcd/libcdio/image_common.h => contrib/libcdio/image_common.h
rename : src/input/vcd/libcdio/iso9660.c => contrib/libcdio/iso9660.c
rename : src/input/vcd/libcdio/iso9660_fs.c => contrib/libcdio/iso9660_fs.c
rename : src/input/vcd/libcdio/iso9660_private.h => contrib/libcdio/iso9660_private.h
rename : src/input/vcd/libcdio/logging.c => contrib/libcdio/logging.c
rename : src/input/vcd/libcdio/portable.h => contrib/libcdio/portable.h
rename : src/input/vcd/libcdio/scsi_mmc.c => contrib/libcdio/scsi_mmc.c
rename : src/input/vcd/libcdio/scsi_mmc.h => contrib/libcdio/scsi_mmc.h
rename : src/input/vcd/libcdio/scsi_mmc_private.h => contrib/libcdio/scsi_mmc_private.h
rename : src/input/vcd/libcdio/sector.c => contrib/libcdio/sector.c
rename : src/input/vcd/libcdio/util.c => contrib/libcdio/util.c
rename : src/input/vcd/libcdio/xa.c => contrib/libcdio/xa.c
rename : src/input/vcd/libvcd/Makefile.am => contrib/libvcd/Makefile.am
rename : src/input/vcd/libvcd/bitvec.h => contrib/libvcd/bitvec.h
rename : src/input/vcd/libvcd/bytesex.h => contrib/libvcd/bytesex.h
rename : src/input/vcd/libvcd/bytesex_asm.h => contrib/libvcd/bytesex_asm.h
rename : src/input/vcd/libvcd/data_structures.c => contrib/libvcd/data_structures.c
rename : src/input/vcd/libvcd/data_structures.h => contrib/libvcd/data_structures.h
rename : src/input/vcd/libvcd/dict.h => contrib/libvcd/dict.h
rename : src/input/vcd/libvcd/directory.c => contrib/libvcd/directory.c
rename : src/input/vcd/libvcd/directory.h => contrib/libvcd/directory.h
rename : src/input/vcd/libvcd/files.c => contrib/libvcd/files.c
rename : src/input/vcd/libvcd/image.c => contrib/libvcd/image.c
rename : src/input/vcd/libvcd/image_bincue.c => contrib/libvcd/image_bincue.c
rename : src/input/vcd/libvcd/image_cdrdao.c => contrib/libvcd/image_cdrdao.c
rename : src/input/vcd/libvcd/image_nrg.c => contrib/libvcd/image_nrg.c
rename : src/input/vcd/libvcd/image_sink.h => contrib/libvcd/image_sink.h
rename : src/input/vcd/libvcd/inf.c => contrib/libvcd/inf.c
rename : src/input/vcd/libvcd/info.c => contrib/libvcd/info.c
rename : src/input/vcd/libvcd/info_private.c => contrib/libvcd/info_private.c
rename : src/input/vcd/libvcd/info_private.h => contrib/libvcd/info_private.h
rename : src/input/vcd/libvcd/libvcd/Makefile.am => contrib/libvcd/libvcd/Makefile.am
rename : src/input/vcd/libvcd/libvcd/files.h => contrib/libvcd/libvcd/files.h
rename : src/input/vcd/libvcd/libvcd/files_private.h => contrib/libvcd/libvcd/files_private.h
rename : src/input/vcd/libvcd/libvcd/inf.h => contrib/libvcd/libvcd/inf.h
rename : src/input/vcd/libvcd/libvcd/info.h => contrib/libvcd/libvcd/info.h
rename : src/input/vcd/libvcd/libvcd/logging.h => contrib/libvcd/libvcd/logging.h
rename : src/input/vcd/libvcd/libvcd/sector.h => contrib/libvcd/libvcd/sector.h
rename : src/input/vcd/libvcd/libvcd/types.h => contrib/libvcd/libvcd/types.h
rename : src/input/vcd/libvcd/libvcd/version.h => contrib/libvcd/libvcd/version.h
rename : src/input/vcd/libvcd/logging.c => contrib/libvcd/logging.c
rename : src/input/vcd/libvcd/mpeg.c => contrib/libvcd/mpeg.c
rename : src/input/vcd/libvcd/mpeg.h => contrib/libvcd/mpeg.h
rename : src/input/vcd/libvcd/mpeg_stream.c => contrib/libvcd/mpeg_stream.c
rename : src/input/vcd/libvcd/mpeg_stream.h => contrib/libvcd/mpeg_stream.h
rename : src/input/vcd/libvcd/obj.h => contrib/libvcd/obj.h
rename : src/input/vcd/libvcd/pbc.c => contrib/libvcd/pbc.c
rename : src/input/vcd/libvcd/pbc.h => contrib/libvcd/pbc.h
rename : src/input/vcd/libvcd/salloc.c => contrib/libvcd/salloc.c
rename : src/input/vcd/libvcd/salloc.h => contrib/libvcd/salloc.h
rename : src/input/vcd/libvcd/sector.c => contrib/libvcd/sector.c
rename : src/input/vcd/libvcd/sector_private.h => contrib/libvcd/sector_private.h
rename : src/input/vcd/libvcd/stream.c => contrib/libvcd/stream.c
rename : src/input/vcd/libvcd/stream.h => contrib/libvcd/stream.h
rename : src/input/vcd/libvcd/stream_stdio.c => contrib/libvcd/stream_stdio.c
rename : src/input/vcd/libvcd/stream_stdio.h => contrib/libvcd/stream_stdio.h
rename : src/input/vcd/libvcd/util.c => contrib/libvcd/util.c
rename : src/input/vcd/libvcd/util.h => contrib/libvcd/util.h
rename : src/input/vcd/libvcd/vcd.c => contrib/libvcd/vcd.c
rename : src/input/vcd/libvcd/vcd.h => contrib/libvcd/vcd.h
rename : src/input/vcd/libvcd/vcd_assert.h => contrib/libvcd/vcd_assert.h
rename : src/input/vcd/libvcd/vcd_read.c => contrib/libvcd/vcd_read.c
rename : src/input/vcd/libvcd/vcd_read.h => contrib/libvcd/vcd_read.h

1 files changed, 313 insertions, 0 deletions

diff --git a/contrib/libvcd/image_cdrdao.c b/contrib/libvcd/image_cdrdao.c
new file mode 100644
index 000000000..5e00c14ee
--- /dev/null
+++ b/contrib/libvcd/image_cdrdao.c
@@ -0,0 +1,313 @@
+/*
+    $Id: image_cdrdao.c,v 1.3 2005/01/01 02:43:59 rockyb Exp $
+
+    Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
+
+    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 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
+    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* Public headers */
+#include <cdio/iso9660.h>
+#include <cdio/bytesex.h>
+#include <libvcd/sector.h>
+#include <libvcd/logging.h>
+
+/* Private headers */
+#include "vcd_assert.h"
+#include "image_sink.h"
+#include "stream_stdio.h"
+#include "util.h"
+#include "vcd.h"
+
+static const char _rcsid[] = "$Id: image_cdrdao.c,v 1.3 2005/01/01 02:43:59 rockyb Exp $";
+
+/* reader */
+
+/****************************************************************************
+ * writer
+ */
+
+typedef struct {
+  bool sector_2336_flag;
+  char *toc_fname;
+  char *img_base;
+
+  VcdDataSink *last_bin_snk;
+  int last_snk_idx;
+  bool last_pause;
+
+  CdioList *vcd_cue_list;
+} _img_cdrdao_snk_t;
+
+static void
+_sink_free (void *user_data)
+{
+  _img_cdrdao_snk_t *_obj = user_data;
+
+  /* fixme -- destroy cue list */
+
+  vcd_data_sink_destroy (_obj->last_bin_snk);
+  free (_obj->toc_fname);
+  free (_obj->img_base);
+  free (_obj);
+}
+
+static int
+_set_cuesheet (void *user_data, const CdioList *vcd_cue_list)
+{
+  _img_cdrdao_snk_t *_obj = user_data;
+  VcdDataSink *toc_snk = vcd_data_sink_new_stdio (_obj->toc_fname);
+
+  CdioListNode *node;
+
+  int track_no, index_no;
+  const vcd_cue_t *_last_cue = 0;
+  unsigned last_track_lsn = 0;
+
+  vcd_data_sink_printf (toc_snk, 
+			"// CDRDAO TOC\n"
+			"//  generated by %s\n\n"
+			"CD_ROM_XA\n", vcd_version_string (false));
+
+  _obj->vcd_cue_list = _cdio_list_new ();
+
+  index_no = track_no = 0;
+  _CDIO_LIST_FOREACH (node, (CdioList *) vcd_cue_list)
+    {
+      const vcd_cue_t *_cue = _cdio_list_node_data (node);
+
+      /* copy cue list while traversing */
+      {
+	vcd_cue_t *_cue2 = _vcd_malloc (sizeof (vcd_cue_t));
+	*_cue2 = *_cue;
+	_cdio_list_append (_obj->vcd_cue_list, _cue2);
+      }
+      
+      switch (_cue->type)
+	{
+	case VCD_CUE_TRACK_START:
+	  track_no++;
+	  index_no = 0;
+
+	  last_track_lsn = _cue->lsn;
+
+	  vcd_data_sink_printf (toc_snk, 
+				"\n// Track %d\n"
+				"TRACK %s\n COPY\n",
+				track_no,
+				(_obj->sector_2336_flag ? "MODE2_FORM_MIX" : "MODE2_RAW"));
+
+	  if (_last_cue && _last_cue->type == VCD_CUE_PREGAP_START)
+	    vcd_data_sink_printf (toc_snk, 
+				  " DATAFILE \"%s_%.2d_pregap.img\"\n"
+				  " START\n",
+				  _obj->img_base, track_no);
+
+	  index_no++;
+
+	  vcd_data_sink_printf (toc_snk, 
+				" DATAFILE \"%s_%.2d.img\"\n",
+				_obj->img_base, track_no);
+	  break;
+
+	case VCD_CUE_PREGAP_START:
+	  /* handled in next iteration */
+	  break;
+
+	case VCD_CUE_SUBINDEX:
+	  index_no++;
+
+	  {
+	    msf_t _msf = { 0, 0, 0 };
+	    char *psz_msf;
+
+	    cdio_lba_to_msf (_cue->lsn - last_track_lsn, &_msf);
+	    psz_msf = cdio_msf_to_str(&_msf);
+
+	    vcd_data_sink_printf (toc_snk, " INDEX %s\n", psz_msf);
+	    free(psz_msf);
+	  }
+	  break;
+
+	case VCD_CUE_LEADIN:
+          break;
+
+	case VCD_CUE_END:
+	  vcd_data_sink_printf (toc_snk, "\n// EOF\n");
+
+	  vcd_data_sink_close (toc_snk);
+	  vcd_data_sink_destroy (toc_snk);
+
+	  return 0;
+	  break;
+	}
+
+      _last_cue = _cue;
+    }
+
+  vcd_assert_not_reached ();
+
+  return -1;
+}
+ 
+static int
+_vcd_image_cdrdao_write (void *user_data, const void *data, lsn_t lsn)
+{
+  const char *buf = data;
+  _img_cdrdao_snk_t *_obj = user_data;
+  long offset;
+
+  {
+    CdioListNode *node;
+    uint32_t _last = 0;
+    uint32_t _ofs = 0;
+    bool _lpregap = false;
+    bool _pregap = false;
+
+    int num = 0, in_track = 0;
+    _CDIO_LIST_FOREACH (node, _obj->vcd_cue_list)
+      {
+	const vcd_cue_t *_cue = _cdio_list_node_data (node);
+    
+	switch (_cue->type) 
+	  {
+	  case VCD_CUE_PREGAP_START:
+	  case VCD_CUE_END:
+	  case VCD_CUE_TRACK_START:
+	    if (_cue->lsn && IN (lsn, _last, _cue->lsn - 1))
+	      {
+		vcd_assert (in_track == 0);
+		in_track = num;
+		_ofs = _last;
+		_pregap = _lpregap;
+	      }
+
+	    _last = _cue->lsn;  
+	    _lpregap = (_cue->type == VCD_CUE_PREGAP_START);
+
+	    if (_cue->type == VCD_CUE_TRACK_START)
+	      num++;
+	    break;
+
+	  default:
+	    /* noop */
+	    break;
+	  }
+      }
+
+    vcd_assert (in_track != 0);
+    vcd_assert (_obj->last_snk_idx <= in_track);
+
+    if (_obj->last_snk_idx != in_track
+	|| _obj->last_pause != _pregap)
+      {
+	char buf[4096] = { 0, };
+
+	if (_obj->last_bin_snk)
+	  vcd_data_sink_destroy (_obj->last_bin_snk);
+
+	snprintf (buf, sizeof (buf),
+		  "%s_%.2d%s.img",
+		  _obj->img_base,
+		  (_pregap ? in_track + 1 : in_track), 
+		  (_pregap ? "_pregap" : ""));
+	
+	_obj->last_bin_snk = vcd_data_sink_new_stdio (buf);
+	_obj->last_snk_idx = in_track;
+	_obj->last_pause = _pregap;
+      }
+
+    vcd_assert (lsn >= _ofs);
+    offset = lsn - _ofs;
+  }
+
+  offset *= _obj->sector_2336_flag ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE_RAW;
+
+  vcd_data_sink_seek(_obj->last_bin_snk, offset);
+  
+  if (_obj->sector_2336_flag)
+    vcd_data_sink_write(_obj->last_bin_snk, buf + 12 + 4, M2RAW_SECTOR_SIZE, 1);
+  else
+    vcd_data_sink_write(_obj->last_bin_snk, buf, CDIO_CD_FRAMESIZE_RAW, 1);
+  
+  return 0;
+}
+
+static int
+_sink_set_arg (void *user_data, const char key[], const char value[])
+{
+  _img_cdrdao_snk_t *_obj = user_data;
+
+  if (!strcmp (key, "toc"))
+    {
+      free (_obj->toc_fname);
+
+      if (!value)
+	return -2;
+
+      _obj->toc_fname = strdup (value);
+    }
+  else if (!strcmp (key, "img_base"))
+    {
+      free (_obj->img_base);
+
+      if (!value)
+	return -2;
+
+      _obj->img_base = strdup (value);
+    }
+  else if (!strcmp (key, "sector"))
+    {
+      if (!strcmp (value, "2336"))
+	_obj->sector_2336_flag = true;
+      else if (!strcmp (value, "2352"))
+	_obj->sector_2336_flag = false;
+      else
+	return -2;
+    }
+  else
+    return -1;
+
+  return 0;
+}
+
+VcdImageSink *
+vcd_image_sink_new_cdrdao (void)
+{
+  _img_cdrdao_snk_t *_data;
+  
+  vcd_image_sink_funcs _funcs = {
+    .set_cuesheet = _set_cuesheet,
+    .write        = _vcd_image_cdrdao_write,
+    .free         = _sink_free,
+    .set_arg      = _sink_set_arg
+  };
+
+  _data = _vcd_malloc (sizeof (_img_cdrdao_snk_t));
+
+  _data->toc_fname = strdup ("videocd.toc");
+  _data->img_base = strdup ("videocd");
+
+  return vcd_image_sink_new (_data, &_funcs);
+}
+