diff options
| author | Daniil Cherednik <dan.cherednik@gmail.com> | 2021-08-28 22:16:39 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dan.cherednik@gmail.com> | 2021-08-28 22:16:39 +0300 |
| commit | feb23a6ccb5c756b6497c24c4849cdda07cb35f1 (patch) | |
| tree | 39c3cd3a368bb3158a6af9f5d195690a7758333f /src/main.cpp | |
| parent | 62ced878b526d49e5ef6ad42ca2eb7efc874867a (diff) | |
| download | atracdenc-feb23a6ccb5c756b6497c24c4849cdda07cb35f1.tar.gz | |
[refactoring] Split CompressedIO interface for Read and Write part
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp index 9cd8b40..9256799 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -147,7 +147,7 @@ static void PrepareAtrac1Encoder(const string& inFile, std::cerr << "Number of input samples exceeds output format limitation," "the result will be incorrect" << std::endl; } - TCompressedIOPtr aeaIO = TCompressedIOPtr(new TAea(outFile, "test", numChannels, (uint32_t)numFrames)); + TCompressedOutputPtr aeaIO = CreateAeaOutput(outFile, "test", numChannels, (uint32_t)numFrames); pcmEngine->reset(new TPCMEngine<TFloat>(4096, numChannels, TPCMEngine<TFloat>::TReaderPtr((*wavIO)->GetPCMReader<TFloat>()))); @@ -157,7 +157,7 @@ static void PrepareAtrac1Encoder(const string& inFile, << "\n SampleRate: " << (*wavIO)->GetSampleRate() << "\n TotalSamples: " << totalSamples << endl; - atracProcessor->reset(new TAtrac1Processor(std::move(aeaIO), std::move(encoderSettings))); + atracProcessor->reset(new TAtrac1Encoder(std::move(aeaIO), std::move(encoderSettings))); } static void PrepareAtrac1Decoder(const string& inFile, @@ -168,7 +168,7 @@ static void PrepareAtrac1Decoder(const string& inFile, TPcmEnginePtr* pcmEngine, TAtracProcessorPtr* atracProcessor) { - TCompressedIOPtr aeaIO = TCompressedIOPtr(new TAea(inFile)); + TCompressedInputPtr aeaIO = CreateAeaInput(inFile); *totalSamples = aeaIO->GetLengthInSamples(); uint64_t length = aeaIO->GetLengthInSamples(); if (!noStdOut) @@ -180,7 +180,7 @@ static void PrepareAtrac1Decoder(const string& inFile, pcmEngine->reset(new TPCMEngine<TFloat>(4096, aeaIO->GetChannelNum(), TPCMEngine<TFloat>::TWriterPtr((*wavIO)->GetPCMWriter<TFloat>()))); - atracProcessor->reset(new TAtrac1Processor(std::move(aeaIO), NAtrac1::TAtrac1EncodeSettings())); + atracProcessor->reset(new TAtrac1Decoder(std::move(aeaIO))); } static void PrepareAtrac3Encoder(const string& inFile, @@ -202,7 +202,7 @@ static void PrepareAtrac3Encoder(const string& inFile, std::cerr << "Number of input samples exceeds output format limitation," "the result will be incorrect" << std::endl; } - TCompressedIOPtr omaIO = TCompressedIOPtr(new TOma(outFile, + TCompressedOutputPtr omaIO = TCompressedOutputPtr(new TOma(outFile, "test", numChannels, (int32_t)numFrames, OMAC_ID_ATRAC3, @@ -211,7 +211,7 @@ static void PrepareAtrac3Encoder(const string& inFile, pcmEngine->reset(new TPCMEngine<TFloat>(4096, numChannels, TPCMEngine<TFloat>::TReaderPtr(wavIO->GetPCMReader<TFloat>()))); - atracProcessor->reset(new TAtrac3Processor(std::move(omaIO), std::move(encoderSettings))); + atracProcessor->reset(new TAtrac3Encoder(std::move(omaIO), std::move(encoderSettings))); } int main_(int argc, char* const* argv) @@ -373,8 +373,7 @@ int main_(int argc, char* const* argv) return 1; } - auto atracLambda = (mode == E_DECODE) ? atracProcessor->GetDecodeLambda() : - atracProcessor->GetEncodeLambda(); + auto atracLambda = atracProcessor->GetLambda(); uint64_t processed = 0; try { |