change default extension for ogg flac from .ogg to .oga (SF#1762492: http://sourceforge.net/tracker/index.php?func=detail&aid=1762492&group_id=13478&atid=113478)

This commit is contained in:
Josh Coalson
2007-08-01 03:02:00 +00:00
parent 05f710f4e0
commit 12d3a41896
16 changed files with 39 additions and 30 deletions

View File

@@ -46,6 +46,7 @@ EXTRA_DIST = \
CLEANFILES = \
$(wildcard *.raw) \
$(wildcard *.flac) \
$(wildcard *.oga) \
$(wildcard *.ogg) \
$(wildcard *.cmp) \
$(wildcard *.aiff) \

View File

@@ -52,4 +52,4 @@ valgrind: all
release : all
clean:
rm -f *.raw *.flac *.ogg *.cmp *.aiff *.wav *.diff *.log *.cue core flac-to-flac-metadata-test-files/out.* metaflac-test-files/out.*
rm -f *.raw *.flac *.oga *.ogg *.cmp *.aiff *.wav *.diff *.log *.cue core flac-to-flac-metadata-test-files/out.* metaflac-test-files/out.*

View File

@@ -242,15 +242,15 @@ rt_test_ogg_flac ()
{
f="$1"
echo -n "round-trip test ($f->oggflac->oggflac->wav) encode... "
run_flac $SILENT --force --verify --channel-map=none --no-padding --lax -o rt.ogg --ogg $f || die "ERROR"
run_flac $SILENT --force --verify --channel-map=none --no-padding --lax -o rt.oga --ogg $f || die "ERROR"
echo -n "re-encode... "
run_flac $SILENT --force --verify --lax -o rt2.ogg --ogg rt.ogg || die "ERROR"
run_flac $SILENT --force --verify --lax -o rt2.oga --ogg rt.oga || die "ERROR"
echo -n "decode... "
run_flac $SILENT --force --decode --channel-map=none -o rt.wav rt2.ogg || die "ERROR"
run_flac $SILENT --force --decode --channel-map=none -o rt.wav rt2.oga || die "ERROR"
echo -n "compare... "
cmp $f rt.wav || die "ERROR: file mismatch"
echo "OK"
rm -f rt.wav rt.ogg rt2.ogg
rm -f rt.wav rt.oga rt2.oga
}
for f in rt-*.raw ; do
@@ -1040,7 +1040,7 @@ test_multifile ()
fi
if [ $streamtype = ogg ] ; then
suffix=ogg
suffix=oga
encode_options="$encode_options --ogg"
else
suffix=flac

View File

@@ -136,20 +136,20 @@ done
if [ $has_ogg = "yes" ] ; then
echo "generating Ogg FLAC files for seeking:"
run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=8 --channels=1 --blocksize=576 --output-name=tiny.ogg --ogg noise8m32.raw || die "ERROR generating Ogg FLAC file"
run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=16 --channels=2 --blocksize=576 --output-name=small.ogg --ogg noise.raw || die "ERROR generating Ogg FLAC file"
run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=8 --channels=1 --blocksize=576 --output-name=tiny.oga --ogg noise8m32.raw || die "ERROR generating Ogg FLAC file"
run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=16 --channels=2 --blocksize=576 --output-name=small.oga --ogg noise.raw || die "ERROR generating Ogg FLAC file"
# seek tables are not used in Ogg FLAC
echo "testing tiny.ogg:"
if run_test_seeking tiny.ogg $tiny_seek_count $tiny_samples noise8m32.raw ; then : ; else
echo "testing tiny.oga:"
if run_test_seeking tiny.oga $tiny_seek_count $tiny_samples noise8m32.raw ; then : ; else
die "ERROR: during test_seeking"
fi
echo "testing small.ogg:"
if run_test_seeking small.ogg $small_seek_count $small_samples noise.raw ; then : ; else
echo "testing small.oga:"
if run_test_seeking small.oga $small_seek_count $small_samples noise.raw ; then : ; else
die "ERROR: during test_seeking"
fi
fi
rm -f tiny.flac tiny.ogg small.flac small.ogg tiny-s.flac small-s.flac
rm -f tiny.flac tiny.oga small.flac small.oga tiny-s.flac small-s.flac