From 7ca5d0bfc714c254c374af9cbc2e024a8b439725 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 18 May 2015 04:48:18 +0000 Subject: splitfx: remove support for encoding opus Lossy file encoding has too many tunable variables and it is not a good fit for an audio production tool such as dtas-splitfx. This was becoming a maintenance burden for me and is a sign of featuritis. --- lib/dtas/splitfx.rb | 15 --------------- test/test_splitfx.rb | 29 ----------------------------- 2 files changed, 44 deletions(-) diff --git a/lib/dtas/splitfx.rb b/lib/dtas/splitfx.rb index 9420faf..6bac27f 100644 --- a/lib/dtas/splitfx.rb +++ b/lib/dtas/splitfx.rb @@ -77,21 +77,6 @@ class DTAS::SplitFX # :nodoc: "channels" => 2, }, }, - "opusenc" => { - "command" => 'sox "$INFILE" $COMMENTS $OUTFMT - ' \ - '$TRIMFX $FX $RATEFX $DITHERFX | opusenc --music ' \ - '--raw-bits $BITS_PER_SAMPLE ' \ - '$OPUSENC_BITRATE --raw-rate $RATE --raw-chan $CHANNELS ' \ - '--raw-endianness $ENDIAN_OPUSENC ' \ - '$OPUSENC_COMMENTS ' \ - '- $OUTDIR$TRACKNUMBER.opus', - "format" => { - "bits" => 16, - "rate" => 48000, - "type" => "s16", - "channels" => 2, - }, - }, } @tracks = [] @infmt = nil # wait until input is assigned diff --git a/test/test_splitfx.rb b/test/test_splitfx.rb index adb3508..49df49d 100644 --- a/test/test_splitfx.rb +++ b/test/test_splitfx.rb @@ -70,35 +70,6 @@ class TestSplitfx < Testcase cmp = "cmp result.s32 expect.s32" assert system(cmp), cmp - - # try Ogg Opus, use opusenc/opusdec for now since that's available - # in Debian 7.0 (sox.git currently has opusfile support, but that - # hasn't made it into Debian, yet) - if `which opusenc 2>/dev/null`.size > 0 && - `which opusdec 2>/dev/null`.size > 0 - WAIT_ALL_MTX.synchronize do - tmp_err('opus.err.txt') { sfx.run("opusenc", opts) } - end - assert_contains_stats('opus.err.txt') - - # ensure opus lengths match flac ones, we decode using opusdec - # since sox does not yet have opus support in Debian 7.0 - %w(1 2).each do |nr| - cmd = "opusdec #{nr}.opus #{nr}.wav 2>/dev/null" - assert system(cmd), cmd - assert_equal `soxi -D #{nr}.flac`, `soxi -D #{nr}.wav` - end - - # ensure 16/44.1kHz FLAC works (CDDA-like) - File.unlink('1.flac', '2.flac') - WAIT_ALL_MTX.synchronize do - tmp_err('flac-cdda.err.txt') { sfx.run("flac-cdda", opts) } - end - assert_contains_stats('flac-cdda.err.txt') - %w(1 2).each do |nr| - assert_equal `soxi -D #{nr}.flac`, `soxi -D #{nr}.wav` - end - end end end end -- cgit v1.2.3-24-ge0c7