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

Code cleanup; Reader classes renamed to Decoders, Writers to Encoders, every Decoder must have a corresponding Settings class now just like Encoders. UserDefinedEncoders renamed to CommandLineEncoders, etc.

Browse Source
This commit is contained in:
Grigory Chudov
2018-03-23 19:26:26 -04:00
parent 8a5946ae89
commit 16fccfe5c9
71 changed files with 4530 additions and 4576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CUETools/CUETools.TestCodecs/ALACWriterTest.cs
View File

@@ -76,12 +76,12 @@ namespace CUETools.TestCodecs
[TestMethod()]
public void ConstructorTest()
{
AudioBuffer buff = WAVReader.ReadAllSamples("test.wav", null);
ALACWriter target;
ALACWriter.Vendor = "CUETools";
AudioBuffer buff = Codecs.WAV.AudioDecoder.ReadAllSamples(new Codecs.WAV.DecoderSettings(), "test.wav");
AudioEncoder target;
target = new ALACWriter("alacwriter1.m4a", null, new ALACWriterSettings() { PCM = buff.PCM });
AudioEncoder.Vendor = "CUETools";
target = new Codecs.ALAC.AudioEncoder("alacwriter1.m4a", null, new Codecs.ALAC.EncoderSettings() { PCM = buff.PCM });
target.Settings.Padding = 1;
target.CreationTime = DateTime.Parse("15 Aug 1976");
target.FinalSampleCount = buff.Length;
@@ -89,7 +89,7 @@ namespace CUETools.TestCodecs
target.Close();
CollectionAssert.AreEqual(File.ReadAllBytes("alac.m4a"), File.ReadAllBytes("alacwriter1.m4a"), "alacwriter1.m4a doesn't match.");
target = new ALACWriter("alacwriter0.m4a", null, new ALACWriterSettings() { PCM = buff.PCM });
target = new Codecs.ALAC.AudioEncoder("alacwriter0.m4a", null, new Codecs.ALAC.EncoderSettings() { PCM = buff.PCM });
target.Settings.Padding = 1;
target.CreationTime = DateTime.Parse("15 Aug 1976");
target.Write(buff);
@@ -100,7 +100,7 @@ namespace CUETools.TestCodecs
[TestMethod()]
public void SeekTest()
{
var r = new ALACReader("alac.m4a", null);
var r = new AudioDecoder(new DecoderSettings(), "alac.m4a");
var buff1 = new AudioBuffer(r, 16536);
var buff2 = new AudioBuffer(r, 16536);
Assert.AreEqual(0, r.Position);

18
CUETools/CUETools.TestCodecs/CodecsTest.cs
View File

@@ -123,8 +123,8 @@ namespace CUETools.TestCodecs
private TestContext testContextInstance;
private WAVReader pipe = null;
private WAVReader wave = null;
private Codecs.WAV.AudioDecoder pipe = null;
private Codecs.WAV.AudioDecoder wave = null;
public readonly static int[,] pipeSamples = new int[,] { { -1, 1 }, { 0, -1 }, { -1, 0 }, { 0, -1 }, { -1, -1 }, { -1, -1 }, { 1, 0 }, { -3, -2 }, { 3, 1 }, { -4, -3 }, { 3, 2 }, { -4, -3 }, { 3, 1 }, { -3, -1 }, { 1, -1 }, { -1, 1 }, { -1, -3 }, { 0, 3 }, { -2, -4 }, { 0, 3 }, { -1, -4 }, { -1, 3 }, { 0, -3 }, { -2, 1 }, { 1, -1 }, { -2, -1 }, { 0, 1 }, { -1, -2 }, { -1, 1 }, { 1, -2 }, { -3, 1 }, { 3, -2 }, { -4, 0 }, { 3, -1 }, { -4, -1 }, { 3, -1 }, { -3, 0 }, { 1, -1 }, { -1, 1 }, { -1, -2 }, { 0, 2 }, { -1, -3 }, { 0, 2 }, { 0, -3 }, { -1, 1 }, { 1, -1 }, { -2, -1 }, { 2, 1 }, { -2, -3 }, { 1, 3 }, { -1, -4 }, { -1, 3 }, { 1, -4 }, { 0, 0 } };
public readonly static int[,] testSamples = new int[,] { { -1, 1 }, { 0, -1 }, { -1, 0 }, { 0, -1 }, { -1, -1 }, { -1, -1 }, { 1, 0 }, { -3, -2 }, { 3, 1 }, { -4, -3 }, { 3, 2 }, { -4, -3 }, { 3, 1 }, { -3, -1 }, { 1, -1 }, { -1, 1 }, { -1, -3 }, { 0, 3 }, { -2, -4 }, { 0, 3 }, { -1, -4 }, { -1, 3 }, { 0, -3 }, { -2, 1 }, { 1, -1 }, { -2, -1 }, { 0, 1 }, { -1, -2 }, { -1, 1 }, { 1, -2 }, { -3, 1 }, { 3, -2 }, { -4, 0 }, { 3, -1 }, { -4, -1 }, { 3, -1 }, { -3, 0 }, { 1, -1 }, { -1, 1 }, { -1, -2 }, { 0, 2 }, { -1, -3 }, { 0, 2 }, { 0, -3 }, { -1, 1 }, { 1, -1 }, { -2, -1 }, { 2, 1 }, { -2, -3 }, { 1, 3 }, { -1, -4 }, { -1, 3 }, { 1, -4 }};
@@ -168,8 +168,8 @@ namespace CUETools.TestCodecs
[TestInitialize()]
public void MyTestInitialize()
{
pipe = new WAVReader("pipe.wav", null);
wave = new WAVReader("test.wav", null);
pipe = new Codecs.WAV.AudioDecoder(new Codecs.WAV.DecoderSettings(), "pipe.wav");
wave = new Codecs.WAV.AudioDecoder(new Codecs.WAV.DecoderSettings(), "test.wav");
}
//
//Use TestCleanup to run code after each test has run
@@ -262,7 +262,7 @@ namespace CUETools.TestCodecs
[TestMethod()]
public void ReadAllSamplesTest()
{
AudioBuffer buff = WAVReader.ReadAllSamples("test.wav", null);
AudioBuffer buff = Codecs.WAV.AudioDecoder.ReadAllSamples(new Codecs.WAV.DecoderSettings(), "test.wav");
CollectionAssert.AreEqual(testSamples, buff.Samples, "AudioBuffer.Samples was not set correctly.");
}
}
@@ -333,16 +333,16 @@ namespace CUETools.TestCodecs
[TestMethod()]
public void ConstructorTest()
{
AudioBuffer buff = WAVReader.ReadAllSamples("test.wav", null);
WAVWriter target;
AudioBuffer buff = Codecs.WAV.AudioDecoder.ReadAllSamples(new Codecs.WAV.DecoderSettings(), "test.wav");
Codecs.WAV.AudioEncoder target;
target = new WAVWriter("wavwriter0.wav", null, new WAVWriterSettings(buff.PCM));
target = new Codecs.WAV.AudioEncoder(new Codecs.WAV.EncoderSettings(buff.PCM), "wavwriter0.wav");
//target.FinalSampleCount = buff.Length;
target.Write(buff);
target.Close();
CollectionAssert.AreEqual(File.ReadAllBytes("test.wav"), File.ReadAllBytes("wavwriter0.wav"), "wavwriter0.wav doesn't match.");
target = new WAVWriter("wavwriter1.wav", null, new WAVWriterSettings(buff.PCM));
target = new Codecs.WAV.AudioEncoder(new Codecs.WAV.EncoderSettings(buff.PCM), "wavwriter1.wav");
target.FinalSampleCount = buff.Length;
target.Write(buff);
target.Close();

6
CUETools/CUETools.TestCodecs/FlacWriterTest.cs
View File

@@ -32,10 +32,10 @@ namespace CUETools.TestCodecs
[DeploymentItem("../ThirdParty/x64/libFLAC_dynamic.dll", "")]
public void ConstructorTest()
{
AudioBuffer buff = WAVReader.ReadAllSamples("test.wav", null);
CUETools.Codecs.libFLAC.Writer target;
AudioBuffer buff = Codecs.WAV.AudioDecoder.ReadAllSamples(new Codecs.WAV.DecoderSettings(), "test.wav");
CUETools.Codecs.libFLAC.Encoder target;
target = new CUETools.Codecs.libFLAC.Writer("flacwriter2.flac", new CUETools.Codecs.libFLAC.WriterSettings() { PCM = buff.PCM, EncoderMode = "7" });
target = new CUETools.Codecs.libFLAC.Encoder("flacwriter2.flac", new CUETools.Codecs.libFLAC.EncoderSettings() { PCM = buff.PCM, EncoderMode = "7" });
target.Settings.Padding = 1;
target.Settings.BlockSize = 32;
//target.Vendor = "CUETools";

10
CUETools/CUETools.TestCodecs/FlakeWriterTest.cs
View File

@@ -76,10 +76,10 @@ namespace CUETools.TestCodecs
[TestMethod()]
public void ConstructorTest()
{
AudioBuffer buff = WAVReader.ReadAllSamples("test.wav", null);
FlakeWriter target;
AudioBuffer buff = Codecs.WAV.AudioDecoder.ReadAllSamples(new Codecs.WAV.DecoderSettings(), "test.wav");
AudioEncoder target;
target = new FlakeWriter("flakewriter0.flac", null, new FlakeWriterSettings() { PCM = buff.PCM, EncoderMode = "7" });
target = new AudioEncoder(new EncoderSettings() { PCM = buff.PCM, EncoderMode = "7" }, "flakewriter0.flac");
target.Settings.Padding = 1;
target.DoSeekTable = false;
//target.Vendor = "CUETools";
@@ -89,7 +89,7 @@ namespace CUETools.TestCodecs
target.Close();
CollectionAssert.AreEqual(File.ReadAllBytes("flake.flac"), File.ReadAllBytes("flakewriter0.flac"), "flakewriter0.flac doesn't match.");
target = new FlakeWriter("flakewriter1.flac", null, new FlakeWriterSettings() { PCM = buff.PCM, EncoderMode = "7" });
target = new AudioEncoder(new EncoderSettings() { PCM = buff.PCM, EncoderMode = "7" }, "flakewriter1.flac");
target.Settings.Padding = 1;
target.DoSeekTable = false;
//target.Vendor = "CUETools";
@@ -153,7 +153,7 @@ namespace CUETools.TestCodecs
[TestMethod()]
public void SeekTest()
{
var r = new FlakeReader("test.flac", null);
var r = new AudioDecoder(new DecoderSettings(), "test.flac");
var buff1 = new AudioBuffer(r, 16536);
var buff2 = new AudioBuffer(r, 16536);
Assert.AreEqual(0, r.Position);