claunia/cuetools.net
1
0
Fork 0
mirror of https://github.com/claunia/cuetools.net.git synced 2025-12-16 18:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

CUETools.Flake/FLACCL: --lax command line setting

Browse Source
This commit is contained in:
Grigory Chudov
2013-06-04 20:44:13 -04:00
parent 1e502ab0b9
commit dd57626b4e
4 changed files with 685 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CUETools.Codecs.FLACCL/FLACCLWriter.cs
View File

@@ -373,9 +373,6 @@ namespace CUETools.Codecs.FLACCL
task.Dispose(); task.Dispose();
openCLProgram.Dispose(); openCLProgram.Dispose();
OCLMan.Dispose(); OCLMan.Dispose();
// For some reason, if i move _IO.Close before OCLMan.Dispose,
// interrupting conversion takes many seconds - Delete() just
// hangs somewhere in the vicinity of File.Delete().
_IO.Close(); _IO.Close();
inited = false; inited = false;
} }

11
CUETools.FLACCL.cmd/Program.cs
View File

@@ -35,11 +35,12 @@ namespace CUETools.FLACCL.cmd
Console.WriteLine(); Console.WriteLine();
Console.WriteLine("Options:"); Console.WriteLine("Options:");
Console.WriteLine(); Console.WriteLine();
Console.WriteLine(" -0 .. -11 Compression level, default 7; 9..11 are non-subset"); Console.WriteLine(" -0 .. -11 Compression level, default 8; 9..11 require --lax");
Console.WriteLine(" -o <file> Output filename, or \"-\" for stdout, or nul"); Console.WriteLine(" -o <file> Output filename, or \"-\" for stdout, or nul");
Console.WriteLine(" -p # Padding bytes"); Console.WriteLine(" -p # Padding bytes");
Console.WriteLine(" -q --quiet Quiet mode"); Console.WriteLine(" -q --quiet Quiet mode");
Console.WriteLine(" --verify Verify during encoding"); Console.WriteLine(" --lax Allow non-subset modes");
Console.WriteLine(" --verify Verify during encoding");
Console.WriteLine(" --no-md5 Don't compute MD5 hash"); Console.WriteLine(" --no-md5 Don't compute MD5 hash");
Console.WriteLine(" --no-seektable Don't generate a seektable"); Console.WriteLine(" --no-seektable Don't generate a seektable");
Console.WriteLine(" --cpu-threads Use additional CPU threads"); Console.WriteLine(" --cpu-threads Use additional CPU threads");
@@ -92,6 +93,7 @@ namespace CUETools.FLACCL.cmd
bool estimate_window = false; bool estimate_window = false;
bool buffered = false; bool buffered = false;
bool ok = true; bool ok = true;
bool allowNonSubset = false;
int intarg; int intarg;
for (int arg = 0; arg < args.Length; arg++) for (int arg = 0; arg < args.Length; arg++)
@@ -112,7 +114,9 @@ namespace CUETools.FLACCL.cmd
settings.DoRice = true; settings.DoRice = true;
else if (args[arg] == "--no-md5") else if (args[arg] == "--no-md5")
settings.DoMD5 = false; settings.DoMD5 = false;
else if (args[arg] == "--buffered") else if (args[arg] == "--lax")
allowNonSubset = true;
else if (args[arg] == "--buffered")
buffered = true; buffered = true;
else if (args[arg] == "--cpu-threads") else if (args[arg] == "--cpu-threads")
{ {
@@ -248,6 +252,7 @@ namespace CUETools.FLACCL.cmd
if (output_file == null) if (output_file == null)
output_file = Path.ChangeExtension(input_file, "flac"); output_file = Path.ChangeExtension(input_file, "flac");
settings.PCM = audioSource.PCM; settings.PCM = audioSource.PCM;
settings.AllowNonSubset = allowNonSubset;
FLACCLWriter encoder = new FLACCLWriter((output_file == "-" || output_file == "nul") ? "" : output_file, FLACCLWriter encoder = new FLACCLWriter((output_file == "-" || output_file == "nul") ? "" : output_file,
output_file == "-" ? Console.OpenStandardOutput() : output_file == "-" ? Console.OpenStandardOutput() :
output_file == "nul" ? new NullStream() : null, output_file == "nul" ? new NullStream() : null,

19
CUETools.Flake/Program.cs
View File

@@ -92,10 +92,11 @@ namespace CUETools.FlakeExe
Console.WriteLine(); Console.WriteLine();
Console.WriteLine("Options:"); Console.WriteLine("Options:");
Console.WriteLine(); Console.WriteLine();
Console.WriteLine(" -0 .. -11 Compression level, default 7."); Console.WriteLine(" -0 .. -11 Compression level, default 7; 9..11 require --lax");
Console.WriteLine(" -o <file> Output filename, or \"-\" for stdout, or nul."); Console.WriteLine(" -o <file> Output filename, or \"-\" for stdout, or nul.");
Console.WriteLine(" -p # Padding bytes."); Console.WriteLine(" -p # Padding bytes.");
Console.WriteLine(" -q --quiet Quiet mode."); Console.WriteLine(" -q --quiet Quiet mode.");
Console.WriteLine(" --lax Allow non-subset modes");
Console.WriteLine(" --verify Verify during encoding."); Console.WriteLine(" --verify Verify during encoding.");
Console.WriteLine(" --no-md5 Don't compute MD5 hash."); Console.WriteLine(" --no-md5 Don't compute MD5 hash.");
Console.WriteLine(" --no-seektable Don't generate a seektable."); Console.WriteLine(" --no-seektable Don't generate a seektable.");
@@ -148,6 +149,7 @@ namespace CUETools.FlakeExe
bool buffered = false; bool buffered = false;
string coeffs = null; string coeffs = null;
var settings = new FlakeWriterSettings() { AllowNonSubset = true }; var settings = new FlakeWriterSettings() { AllowNonSubset = true };
bool allowNonSubset = false;
#if FINETUNE #if FINETUNE
int finetune_depth = -1; int finetune_depth = -1;
#endif #endif
@@ -167,6 +169,8 @@ namespace CUETools.FlakeExe
do_seektable = false; do_seektable = false;
else if (args[arg] == "--no-md5") else if (args[arg] == "--no-md5")
settings.DoMD5 = false; settings.DoMD5 = false;
else if (args[arg] == "--lax")
allowNonSubset = true;
else if (args[arg] == "--buffered") else if (args[arg] == "--buffered")
buffered = true; buffered = true;
else if ((args[arg] == "-o" || args[arg] == "--output") && ++arg < args.Length) else if ((args[arg] == "-o" || args[arg] == "--output") && ++arg < args.Length)
@@ -324,6 +328,7 @@ namespace CUETools.FlakeExe
if (output_file == null) if (output_file == null)
output_file = Path.ChangeExtension(input_file, "flac"); output_file = Path.ChangeExtension(input_file, "flac");
settings.PCM = audioSource.PCM; settings.PCM = audioSource.PCM;
settings.AllowNonSubset = allowNonSubset;
FlakeWriter flake = new FlakeWriter((output_file == "-" || output_file == "nul") ? "" : output_file, FlakeWriter flake = new FlakeWriter((output_file == "-" || output_file == "nul") ? "" : output_file,
output_file == "-" ? Console.OpenStandardOutput() : output_file == "-" ? Console.OpenStandardOutput() :
output_file == "nul" ? new NullStream() : null, output_file == "nul" ? new NullStream() : null,
@@ -383,6 +388,16 @@ namespace CUETools.FlakeExe
Console.WriteLine("File Info : {0}kHz; {1} channel; {2} bit; {3}", audioSource.PCM.SampleRate, audioSource.PCM.ChannelCount, audioSource.PCM.BitsPerSample, TimeSpan.FromSeconds(audioSource.Length * 1.0 / audioSource.PCM.SampleRate)); Console.WriteLine("File Info : {0}kHz; {1} channel; {2} bit; {3}", audioSource.PCM.SampleRate, audioSource.PCM.ChannelCount, audioSource.PCM.BitsPerSample, TimeSpan.FromSeconds(audioSource.Length * 1.0 / audioSource.PCM.SampleRate));
} }
bool keepRunning = true;
Console.CancelKeyPress += delegate(object sender, ConsoleCancelEventArgs e)
{
keepRunning = false;
if (e.SpecialKey == ConsoleSpecialKey.ControlC)
e.Cancel = true;
else
audioDest.Delete();
};
start = DateTime.Now; start = DateTime.Now;
#if !DEBUG #if !DEBUG
@@ -407,6 +422,8 @@ namespace CUETools.FlakeExe
lastPrint = elapsed; lastPrint = elapsed;
} }
} }
if (!keepRunning)
throw new Exception("Aborted");
} }
audioDest.Close(); audioDest.Close();
} }

1294
CUETools/frmCUETools.resx
View File

File diff suppressed because it is too large Load Diff