Add some cdrdao image reading support from Svend S. Sorensen's

cuetools

cdio.c: remove some complicated and extraneous code for auto-driver
detection.
This commit is contained in:
rocky
2004-05-04 02:06:48 +00:00
parent 8c0d08b480
commit f04f14c312
13 changed files with 1432 additions and 54 deletions

View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.18 2004/02/29 15:04:27 rocky Exp $
# $Id: Makefile.am,v 1.19 2004/05/04 02:06:48 rocky Exp $
#
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
#
@@ -41,8 +41,8 @@ check_PROGRAMS = $(hack)
check_DATA = vcd_demo.right \
videocd.right videocd.nrg \
cdda.right cdda.cue cdda.bin \
isofs-m1.right isofs-m1.cue isofs-m1.bin \
cdda.right cdda.toc cdda.cue cdda.bin \
isofs-m1.right isfs-m1.toc isofs-m1.cue isofs-m1.bin \
check_opts0.right check_opts1.right check_opts2.right \
check_opts3.right check_opts4.right check_opts5.right \
check_opts6.right check_opts7.right \

View File

@@ -1,6 +1,8 @@
#!/bin/sh
#$Id: check_cue.sh.in,v 1.15 2003/10/06 04:04:05 rocky Exp $
# Tests to see that BIN/CUE file iamge reading is correct (via cd-info).
#$Id: check_cue.sh.in,v 1.16 2004/05/04 02:06:49 rocky Exp $
# Tests to see that BIN/CUE and BIN/TOC file iamge reading is correct
# (via cd-info).
if test -n "@VCDINFO_LIBS@" ; then
vcd_opt='--no-vcd'
fi
@@ -29,15 +31,30 @@ test_cdinfo "--quiet --bin-file ${srcdir}/${fname}.bin --no-cddb" \
RC=$?
check_result $RC "cd-info BIN test $testnum"
test_cdinfo "--quiet --toc-file ${srcdir}/${fname}.toc --no-cddb" \
${fname}.dump ${srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info TOC test $testnum"
fname=isofs-m1
testnum='ISO 9660 mode1'
testnum='ISO 9660 mode1 CUE'
if test -f ${srcdir}/${fname}.bin ; then
test_cdinfo "-q --cue-file ${srcdir}/${fname}.cue --iso9660" \
${fname}.dump ${srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info CUE test $testnum"
else
echo "Don't see CUE file ${srcdir}/${fname}.bin. Test $testum skipped."
echo "Don't see CUE file ${srcdir}/${fname}.bin. Test $testnum skipped."
fi
testnum='ISO 9660 mode1 TOC'
if test -f ${srcdir}/${fname}.bin ; then
test_cdinfo "-q --toc-file ${srcdir}/${fname}.toc --iso9660" \
${fname}.dump ${srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info TOC test $testnum"
else
echo "Don't see TOC file ${srcdir}/${fname}.bin. Test $testnum skipped."
fi
fname=vcd_demo
@@ -53,7 +70,16 @@ if test -f ${srcdir}/${fname}.cue ; then
RC=$?
check_result $RC "cd-info CUE test $testnum"
else
echo "Don't see CUE file ${srcdir}/${fname}.cue. Test $testum skipped."
echo "Don't see CUE file ${srcdir}/${fname}.cue. Test $testnum skipped."
fi
if test -f ${srcdir}/${fname}.toc ; then
test_cdinfo "-q -t ${srcdir}/vcd_demo.toc --iso9660" \
${fname}.dump $right
RC=$?
check_result $RC "cd-info TOC test $testnum"
else
echo "Don't see TOC file ${srcdir}/${fname}.toc. Test $testnum skipped."
fi
fname=svcd_ogt_test_ntsc

5
test/isofs-m1.toc Normal file
View File

@@ -0,0 +1,5 @@
CATALOG "0000010271955"
CD_DA
TRACK MODE1_RAW
FILE "isofs-m1.bin" 00:00:00 00:00:00

15
test/vcd_demo.toc Normal file
View File

@@ -0,0 +1,15 @@
CD_DA
TRACK MODE2_RAW
COPY
FILE "vcd_demo.bin" 00:00:00 00:13:57
TRACK MODE2_RAW
COPY
FILE "vcd_demo.bin" 00:13:57 00:07:14
START 00:02:00
TRACK MODE2_RAW
COPY
FILE "vcd_demo.bin" 00:20:71 00:00:00
START 00:02:00