Menu
▾
▴
[OMPT-svn-commit] OpenMPT r21587 - trunk/OpenMPT/src/openmpt/streamencoder
|
From: <sv...@op...> - 2024-09-13 13:01:15
|
Author: manx Date: Fri Sep 13 15:01:06 2024 New Revision: 21587 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21587 Log: [Var] Run clang-format. Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.hpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.cpp trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.hpp Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -60,7 +60,7 @@ std::size_t written = 0; MPT_MAYBE_CONSTANT_IF(endian == mpt::get_endian() && format.encoding != Encoder::Format::Encoding::Alaw && format.encoding != Encoder::Format::Encoding::ulaw) { - if(!mpt::IO::WriteRaw(f, reinterpret_cast<const std::byte*>(interleaved), frameCount * channels * format.GetSampleFormat().GetSampleSize())) + if(!mpt::IO::WriteRaw(f, reinterpret_cast<const std::byte *>(interleaved), frameCount * channels * format.GetSampleFormat().GetSampleSize())) { success = false; } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -30,6 +30,8 @@ +// clang-format off + inline constexpr int opus_bitrates [] = { 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 192, 224, 256, 320, 384, 448, 510 }; @@ -65,187 +67,188 @@ 48000, 44100, 32000 }; +// clang-format on + namespace Encoder { - enum Mode +enum Mode +{ + ModeCBR = 1 << 0, + ModeABR = 1 << 1, + ModeVBR = 1 << 2, + ModeQuality = 1 << 3, + ModeLossless = 1 << 4, + ModeInvalid = 0 +}; + +struct Format +{ + enum class Encoding { - ModeCBR = 1<<0, - ModeABR = 1<<1, - ModeVBR = 1<<2, - ModeQuality = 1<<3, - ModeLossless = 1<<4, - ModeInvalid = 0 + Float = 1, + Integer = 2, + Alaw = 3, + ulaw = 4, + Unsigned = 5, }; - - struct Format + Encoding encoding; + uint8 bits; + mpt::endian endian; + bool operator==(const Format &other) const { - enum class Encoding - { - Float = 1, - Integer = 2, - Alaw = 3, - ulaw = 4, - Unsigned = 5, - }; - Encoding encoding; - uint8 bits; - mpt::endian endian; - bool operator==(const Format &other) const - { - return encoding == other.encoding && bits == other.bits && endian == other.endian; - } - bool operator!=(const Format& other) const - { - return encoding != other.encoding || bits != other.bits || endian != other.endian; - } - int32 AsInt() const - { - return (static_cast<int32>(endian == mpt::endian::little) << 16) | (static_cast<int32>(encoding) << 8) | static_cast<int32>(bits); - } - static Format FromInt(int32 val) - { - Encoder::Format f; - f.bits = val & 0xff; - f.encoding = static_cast<Encoder::Format::Encoding>((val >> 8) & 0xff); - f.endian = ((val >> 16) & 0xff) ? mpt::endian::little : mpt::endian::big; - return f; - } - SampleFormat GetSampleFormat() const + return encoding == other.encoding && bits == other.bits && endian == other.endian; + } + bool operator!=(const Format &other) const + { + return encoding != other.encoding || bits != other.bits || endian != other.endian; + } + int32 AsInt() const + { + return (static_cast<int32>(endian == mpt::endian::little) << 16) | (static_cast<int32>(encoding) << 8) | static_cast<int32>(bits); + } + static Format FromInt(int32 val) + { + Encoder::Format f; + f.bits = val & 0xff; + f.encoding = static_cast<Encoder::Format::Encoding>((val >> 8) & 0xff); + f.endian = ((val >> 16) & 0xff) ? mpt::endian::little : mpt::endian::big; + return f; + } + SampleFormat GetSampleFormat() const + { + SampleFormat result = SampleFormat::Default; + switch(encoding) { - SampleFormat result = SampleFormat::Default; - switch(encoding) - { case Encoding::Float: switch(bits) { - case 32: - result = SampleFormat::Float32; - break; - case 64: - result = SampleFormat::Float64; - break; + case 32: + result = SampleFormat::Float32; + break; + case 64: + result = SampleFormat::Float64; + break; } break; case Encoding::Integer: switch(bits) { - case 8: - result = SampleFormat::Int8; - break; - case 16: - result = SampleFormat::Int16; - break; - case 24: - result = SampleFormat::Int24; - break; - case 32: - result = SampleFormat::Int32; - break; + case 8: + result = SampleFormat::Int8; + break; + case 16: + result = SampleFormat::Int16; + break; + case 24: + result = SampleFormat::Int24; + break; + case 32: + result = SampleFormat::Int32; + break; } break; case Encoding::Alaw: - switch (bits) + switch(bits) { - case 16: - result = SampleFormat::Int16; - break; + case 16: + result = SampleFormat::Int16; + break; } break; case Encoding::ulaw: - switch (bits) + switch(bits) { - case 16: - result = SampleFormat::Int16; - break; + case 16: + result = SampleFormat::Int16; + break; } break; case Encoding::Unsigned: - switch (bits) + switch(bits) { - case 8: - result = SampleFormat::Unsigned8; - break; + case 8: + result = SampleFormat::Unsigned8; + break; } break; - } - return result; } - }; + return result; + } +}; - struct Traits - { - - mpt::native_path fileExtension; - mpt::ustring fileShortDescription; - mpt::ustring encoderSettingsName; - - mpt::ustring fileDescription; - - bool canTags = false; - std::vector<mpt::ustring> genres; - int modesWithFixedGenres = 0; - - bool canCues = false; - - int maxChannels = 0; - std::vector<uint32> samplerates; - - int modes = Encoder::ModeInvalid; - std::vector<int> bitrates; - std::vector<Format> formats; - - uint32 defaultSamplerate = 48000; - uint16 defaultChannels = 2; - - Encoder::Mode defaultMode = Encoder::ModeInvalid; - int defaultBitrate = 0; - float defaultQuality = 0.0f; - Format defaultFormat = { Encoder::Format::Encoding::Float, 32, mpt::endian::little }; - int defaultDitherType = 1; - }; +struct Traits +{ - struct StreamSettings - { - int32 FLACCompressionLevel = 5; // 8 - uint32 AUPaddingAlignHint = 4096; - uint32 MP3ID3v2MinPadding = 1024; - uint32 MP3ID3v2PaddingAlignHint = 4096; - bool MP3ID3v2WriteReplayGainTXXX = true; - int32 MP3LameQuality = 3; // 0 - bool MP3LameID3v2UseLame = false; - bool MP3LameCalculateReplayGain = true; - bool MP3LameCalculatePeakSample = true; - int32 OpusComplexity = -1; // 10 - }; + mpt::native_path fileExtension; + mpt::ustring fileShortDescription; + mpt::ustring encoderSettingsName; - struct Settings - { + mpt::ustring fileDescription; - bool Cues; - bool Tags; + bool canTags = false; + std::vector<mpt::ustring> genres; + int modesWithFixedGenres = 0; - uint32 Samplerate; - uint16 Channels; + bool canCues = false; - Encoder::Mode Mode; - int Bitrate; - float Quality; - Encoder::Format Format; - int Dither; + int maxChannels = 0; + std::vector<uint32> samplerates; - StreamSettings Details; + int modes = Encoder::ModeInvalid; + std::vector<int> bitrates; + std::vector<Format> formats; - }; + uint32 defaultSamplerate = 48000; + uint16 defaultChannels = 2; + + Encoder::Mode defaultMode = Encoder::ModeInvalid; + int defaultBitrate = 0; + float defaultQuality = 0.0f; + Format defaultFormat = {Encoder::Format::Encoding::Float, 32, mpt::endian::little}; + int defaultDitherType = 1; +}; -} // namespace Encoder +struct StreamSettings +{ + int32 FLACCompressionLevel = 5; // 8 + uint32 AUPaddingAlignHint = 4096; + uint32 MP3ID3v2MinPadding = 1024; + uint32 MP3ID3v2PaddingAlignHint = 4096; + bool MP3ID3v2WriteReplayGainTXXX = true; + int32 MP3LameQuality = 3; // 0 + bool MP3LameID3v2UseLame = false; + bool MP3LameCalculateReplayGain = true; + bool MP3LameCalculatePeakSample = true; + int32 OpusComplexity = -1; // 10 +}; + +struct Settings +{ + + bool Cues; + bool Tags; + + uint32 Samplerate; + uint16 Channels; + + Encoder::Mode Mode; + int Bitrate; + float Quality; + Encoder::Format Format; + int Dither; + + StreamSettings Details; +}; + +} // namespace Encoder class IAudioStreamEncoder { protected: - IAudioStreamEncoder() { } + IAudioStreamEncoder() {} public: virtual ~IAudioStreamEncoder() = default; public: @@ -257,7 +260,7 @@ virtual void WriteInterleaved(std::size_t frameCount, const int16 *interleaved) = 0; virtual void WriteInterleaved(std::size_t frameCount, const int8 *interleaved) = 0; virtual void WriteInterleaved(std::size_t frameCount, const uint8 *interleaved) = 0; - virtual void WriteCues(const std::vector<uint64> &cues) = 0; // optional + virtual void WriteCues(const std::vector<uint64> &cues) = 0; // optional virtual void WriteFinalize() = 0; }; @@ -284,7 +287,7 @@ class StreamWriterBase : public IAudioStreamEncoder { -protected: +protected: std::ostream &f; mpt::IO::Offset fStart; std::vector<std::byte> buf; @@ -312,7 +315,7 @@ private: Encoder::Traits m_Traits; protected: - EncoderFactoryBase() { } + EncoderFactoryBase() {} virtual ~EncoderFactoryBase() = default; void SetTraits(const Encoder::Traits &traits); public: Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -47,13 +47,13 @@ Encoder::Settings settings; private: - static std::string TagToAnnotation(const std::string & field, const mpt::ustring & tag) + static std::string TagToAnnotation(const std::string &field, const mpt::ustring &tag) { if(tag.empty()) { return std::string(); } - return MPT_AFORMAT_MESSAGE("{}={}\n")(field, mpt::transcode<std::string>(mpt::common_encoding::utf8, mpt::replace(tag, MPT_USTRING("="), MPT_UTF8_STRING("\xEF\xBF\xBD")))); // U+FFFD + return MPT_AFORMAT_MESSAGE("{}={}\n")(field, mpt::transcode<std::string>(mpt::common_encoding::utf8, mpt::replace(tag, MPT_USTRING("="), MPT_UTF8_STRING("\xEF\xBF\xBD")))); // U+FFFD } public: @@ -97,22 +97,22 @@ { switch(settings.Format.bits) { - case 32: encoding = 6; break; - case 64: encoding = 7; break; + case 32: encoding = 6; break; + case 64: encoding = 7; break; } } else if(settings.Format.encoding == Encoder::Format::Encoding::Integer) { switch(settings.Format.bits) { - case 8: encoding = 2; break; - case 16: encoding = 3; break; - case 24: encoding = 4; break; - case 32: encoding = 5; break; + case 8: encoding = 2; break; + case 16: encoding = 3; break; + case 24: encoding = 4; break; + case 32: encoding = 5; break; } } else if(settings.Format.encoding == Encoder::Format::Encoding::Alaw) { encoding = 27; - } else if (settings.Format.encoding == Encoder::Format::Encoding::ulaw) + } else if(settings.Format.encoding == Encoder::Format::Encoding::ulaw) { encoding = 1; } @@ -128,7 +128,6 @@ { mpt::IO::WriteIntBE<uint8>(f, '\0'); } - } SampleFormat GetSampleFormat() const override @@ -193,18 +192,18 @@ traits.maxChannels = 4; traits.samplerates = {}; traits.modes = Encoder::ModeLossless; - traits.formats.push_back({ Encoder::Format::Encoding::Float, 64, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Float, 32, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 32, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 24, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 16, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 8, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Alaw, 16, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::ulaw, 16, mpt::endian::big }); + traits.formats.push_back({Encoder::Format::Encoding::Float, 64, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Float, 32, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 32, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 24, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 16, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 8, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Alaw, 16, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::ulaw, 16, mpt::endian::big}); traits.defaultSamplerate = 48000; traits.defaultChannels = 2; traits.defaultMode = Encoder::ModeLossless; - traits.defaultFormat = { Encoder::Format::Encoding::Float, 32, mpt::endian::big }; + traits.defaultFormat = {Encoder::Format::Encoding::Float, 32, mpt::endian::big}; SetTraits(traits); } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -18,7 +18,7 @@ OPENMPT_NAMESPACE_BEGIN - + class AUtreamWriter; @@ -35,7 +35,6 @@ public: AUEncoder(); - }; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -36,7 +36,7 @@ #include <FLAC/metadata.h> #include <FLAC/format.h> #include <FLAC/stream_encoder.h> -#endif // MPT_WITH_FLAC +#endif // MPT_WITH_FLAC @@ -122,26 +122,25 @@ int compressionLevel = settings.Details.FLACCompressionLevel; FLAC__stream_encoder_set_compression_level(encoder, compressionLevel); - + if(settings.Tags) { flac_metadata[0] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT); - AddCommentField("ENCODER", tags.encoder); + AddCommentField("ENCODER", tags.encoder); AddCommentField("SOURCEMEDIA", MPT_USTRING("tracked music file")); - AddCommentField("TITLE", tags.title ); - AddCommentField("ARTIST", tags.artist ); - AddCommentField("ALBUM", tags.album ); - AddCommentField("DATE", tags.year ); - AddCommentField("COMMENT", tags.comments ); - AddCommentField("GENRE", tags.genre ); - AddCommentField("CONTACT", tags.url ); - AddCommentField("BPM", tags.bpm ); // non-standard - AddCommentField("TRACKNUMBER", tags.trackno ); + AddCommentField("TITLE", tags.title); + AddCommentField("ARTIST", tags.artist); + AddCommentField("ALBUM", tags.album); + AddCommentField("DATE", tags.year); + AddCommentField("COMMENT", tags.comments); + AddCommentField("GENRE", tags.genre); + AddCommentField("CONTACT", tags.url); + AddCommentField("BPM", tags.bpm); // non-standard + AddCommentField("TRACKNUMBER", tags.trackno); FLAC__stream_encoder_set_metadata(encoder, flac_metadata, 1); } FLAC__stream_encoder_init_stream(encoder, FLACWriteCallback, FLACSeekCallback, FLACTellCallback, nullptr, this); - } SampleFormat GetSampleFormat() const override { @@ -200,7 +199,7 @@ } }; -#endif // MPT_WITH_FLAC +#endif // MPT_WITH_FLAC @@ -216,17 +215,17 @@ traits.maxChannels = 4; traits.samplerates = {}; traits.modes = Encoder::ModeLossless; -#if (FLAC_API_VERSION_CURRENT >= 12) - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 32, mpt::get_endian() }); +#if(FLAC_API_VERSION_CURRENT >= 12) + traits.formats.push_back({Encoder::Format::Encoding::Integer, 32, mpt::get_endian()}); #endif - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 24, mpt::get_endian() }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 16, mpt::get_endian() }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 8, mpt::get_endian() }); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 24, mpt::get_endian()}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 16, mpt::get_endian()}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 8, mpt::get_endian()}); traits.defaultSamplerate = 48000; traits.defaultChannels = 2; traits.defaultMode = Encoder::ModeLossless; - traits.defaultFormat = { Encoder::Format::Encoding::Integer, 24, mpt::get_endian() }; -#endif // MPT_WITH_FLAC + traits.defaultFormat = {Encoder::Format::Encoding::Integer, 24, mpt::get_endian()}; +#endif // MPT_WITH_FLAC SetTraits(traits); } @@ -235,9 +234,9 @@ { #if defined(MPT_WITH_FLAC) return true; -#else // !MPT_WITH_FLAC +#else // !MPT_WITH_FLAC return false; -#endif // MPT_WITH_FLAC +#endif // MPT_WITH_FLAC } @@ -251,12 +250,12 @@ #ifdef MPT_WITH_FLAC result = std::make_unique<FLACStreamWriter>(*this, file, settings, tags); MPT_UNUSED(prng); -#else // !MPT_WITH_FLAC +#else // !MPT_WITH_FLAC MPT_UNUSED(file); MPT_UNUSED(settings); MPT_UNUSED(tags); MPT_UNUSED(prng); -#endif // MPT_WITH_FLAC +#endif // MPT_WITH_FLAC return result; } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -18,7 +18,7 @@ OPENMPT_NAMESPACE_BEGIN - + class FLACEncoder : public EncoderFactoryBase { @@ -30,7 +30,6 @@ public: FLACEncoder(); - }; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -43,7 +43,7 @@ #else #include <lame/lame.h> #endif -#endif // MPT_WITH_LAME +#endif // MPT_WITH_LAME @@ -56,9 +56,9 @@ struct ID3v2Header { - uint8 signature[3]; - uint8 version[2]; - uint8be flags; + uint8 signature[3]; + uint8 version[2]; + uint8be flags; uint32be size; }; @@ -66,7 +66,7 @@ struct ID3v2Frame { - char frameid[4]; + char frameid[4]; uint32be size; uint16be flags; }; @@ -79,7 +79,7 @@ // $01 = UTF-16 with BOM. Terminated with $00 00. // $02 = UTF-16BE without BOM. Terminated with $00 00. // $03 = UTF-8. Terminated with $00. -#define ID3v2_CHARSET '\3' +#define ID3v2_CHARSET '\3' #define ID3v2_TEXTENDING '\0' struct ReplayGain @@ -170,7 +170,7 @@ void ID3V2Tagger::WriteID3v2Tags(std::ostream &s, const FileTags &tags, ReplayGain replayGain) { if(!s) return; - + ID3v2Header tHeader; mpt::IO::Offset fOffset = mpt::IO::TellWrite(s); uint32 paddingSize = 0; @@ -179,10 +179,10 @@ // Correct header will be written later (tag size missing) memcpy(tHeader.signature, "ID3", 3); - tHeader.version[0] = 0x04; // Version 2.4.0 - tHeader.version[1] = 0x00; // Ditto - tHeader.flags = 0; // No flags - tHeader.size = 0; // will be filled later + tHeader.version[0] = 0x04; // Version 2.4.0 + tHeader.version[1] = 0x00; // Ditto + tHeader.flags = 0; // No flags + tHeader.size = 0; // will be filled later mpt::IO::Write(s, tHeader); totalID3v2Size += sizeof(tHeader); @@ -228,17 +228,16 @@ mpt::IO::SeekAbsolute(s, fOffset); mpt::IO::Write(s, tHeader); mpt::IO::SeekRelative(s, totalID3v2Size - sizeof(tHeader)); - } uint32 ID3V2Tagger::GetMaxReplayGainTxxxTrackGainFrameSize() { - return mpt::saturate_cast<uint32>(sizeof(ID3v2Frame) + 1 + std::strlen("REPLAYGAIN_TRACK_GAIN") + 1 + std::strlen("-123.45 dB") + 1); // should be enough + return mpt::saturate_cast<uint32>(sizeof(ID3v2Frame) + 1 + std::strlen("REPLAYGAIN_TRACK_GAIN") + 1 + std::strlen("-123.45 dB") + 1); // should be enough } uint32 ID3V2Tagger::GetMaxReplayGainTxxxTrackPeakFrameSize() { - return mpt::saturate_cast<uint32>(sizeof(ID3v2Frame) + 1 + std::strlen("REPLAYGAIN_TRACK_PEAK") + 1 + std::strlen("2147483648.123456") + 1); // unrealistic worst case + return mpt::saturate_cast<uint32>(sizeof(ID3v2Frame) + 1 + std::strlen("REPLAYGAIN_TRACK_PEAK") + 1 + std::strlen("2147483648.123456") + 1); // unrealistic worst case } uint32 ID3V2Tagger::GetMaxReplayGainFramesSizes() @@ -260,7 +259,7 @@ std::string content; - content += std::string(1, 0x00); // ISO-8859-1 + content += std::string(1, 0x00); // ISO-8859-1 content += std::string("REPLAYGAIN_TRACK_GAIN"); content += std::string(1, '\0'); @@ -284,11 +283,10 @@ std::memset(&frame, 0, sizeof(ID3v2Frame)); std::memcpy(&frame.frameid, "TXXX", 4); frame.size = intToSynchsafe(static_cast<uint32>(content.size())); - frame.flags = 0x4000; // discard if audio data changed + frame.flags = 0x4000; // discard if audio data changed mpt::IO::Write(s, frame); mpt::IO::Write(s, mpt::as_span(content)); } - } @@ -297,7 +295,7 @@ std::string content; - content += std::string(1, 0x00); // ISO-8859-1 + content += std::string(1, 0x00); // ISO-8859-1 content += std::string("REPLAYGAIN_TRACK_PEAK"); content += std::string(1, '\0'); @@ -316,13 +314,11 @@ std::memset(&frame, 0, sizeof(ID3v2Frame)); std::memcpy(&frame.frameid, "TXXX", 4); frame.size = intToSynchsafe(static_cast<uint32>(content.size())); - frame.flags = 0x4000; // discard if audio data changed + frame.flags = 0x4000; // discard if audio data changed mpt::IO::Write(s, frame); mpt::IO::Write(s, mpt::as_span(content)); } - } - } // Write a ID3v2 frame @@ -348,9 +344,9 @@ { ID3v2Frame tFrame; std::memset(&tFrame, 0, sizeof(ID3v2Frame)); - std::memcpy(&tFrame.frameid, cFrameID, 4); // ID - tFrame.size = intToSynchsafe(static_cast<uint32>(sFramecontent.size())); // Text size - tFrame.flags = 0x0000; // No flags + std::memcpy(&tFrame.frameid, cFrameID, 4); // ID + tFrame.size = intToSynchsafe(static_cast<uint32>(sFramecontent.size())); // Text size + tFrame.flags = 0x0000; // No flags mpt::IO::Write(s, tFrame); mpt::IO::Write(s, mpt::as_span(sFramecontent)); @@ -390,15 +386,9 @@ id3tag_genre_list(&GenreEnumCallback, &traits); traits.modesWithFixedGenres = (compatible ? Encoder::ModeCBR : Encoder::ModeInvalid); traits.maxChannels = 2; - traits.samplerates = (compatible - ? mpt::make_vector(mpeg1layer3_samplerates) - : mpt::make_vector(layer3_samplerates) - ); + traits.samplerates = (compatible ? mpt::make_vector(mpeg1layer3_samplerates) : mpt::make_vector(layer3_samplerates)); traits.modes = (compatible ? Encoder::ModeCBR : (Encoder::ModeABR | Encoder::ModeQuality)); - traits.bitrates = (compatible - ? mpt::make_vector(mpeg1layer3_bitrates) - : mpt::make_vector(layer3_bitrates) - ); + traits.bitrates = (compatible ? mpt::make_vector(mpeg1layer3_bitrates) : mpt::make_vector(layer3_bitrates)); traits.defaultSamplerate = 44100; traits.defaultChannels = 2; traits.defaultMode = (compatible ? Encoder::ModeCBR : Encoder::ModeQuality); @@ -528,30 +518,29 @@ lame_set_VBR(gfp, vbr_default); lame_set_bWriteVbrTag(gfp, 1); - } - lame_set_decode_on_the_fly(gfp, settings.Details.MP3LameCalculatePeakSample ? 1 : 0); // see LAME docs for why + lame_set_decode_on_the_fly(gfp, settings.Details.MP3LameCalculatePeakSample ? 1 : 0); // see LAME docs for why lame_set_findReplayGain(gfp, settings.Details.MP3LameCalculateReplayGain ? 1 : 0); switch(id3type) { - case ID3None: - lame_set_write_id3tag_automatic(gfp, 0); - break; - case ID3v1: - id3tag_init(gfp); - id3tag_v1_only(gfp); - break; - case ID3v2Lame: - id3tag_init(gfp); - id3tag_add_v2(gfp); - id3tag_v2_only(gfp); - id3tag_set_pad(gfp, settings.Details.MP3ID3v2MinPadding); - break; - case ID3v2OpenMPT: - lame_set_write_id3tag_automatic(gfp, 0); - break; + case ID3None: + lame_set_write_id3tag_automatic(gfp, 0); + break; + case ID3v1: + id3tag_init(gfp); + id3tag_v1_only(gfp); + break; + case ID3v2Lame: + id3tag_init(gfp); + id3tag_add_v2(gfp); + id3tag_v2_only(gfp); + id3tag_set_pad(gfp, settings.Details.MP3ID3v2MinPadding); + break; + case ID3v2OpenMPT: + lame_set_write_id3tag_automatic(gfp, 0); + break; } Mode = settings.Mode; @@ -561,13 +550,13 @@ if(id3type == ID3v2Lame || id3type == ID3v1) { // Lame API expects Latin1, which is sad, but we cannot change that. - if(!tags.title.empty()) id3tag_set_title( gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.title ).c_str()); - if(!tags.artist.empty()) id3tag_set_artist( gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.artist ).c_str()); - if(!tags.album.empty()) id3tag_set_album( gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.album ).c_str()); - if(!tags.year.empty()) id3tag_set_year( gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.year ).c_str()); + if(!tags.title.empty()) id3tag_set_title(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.title).c_str()); + if(!tags.artist.empty()) id3tag_set_artist(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.artist).c_str()); + if(!tags.album.empty()) id3tag_set_album(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.album).c_str()); + if(!tags.year.empty()) id3tag_set_year(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.year).c_str()); if(!tags.comments.empty()) id3tag_set_comment(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.comments).c_str()); - if(!tags.trackno.empty()) id3tag_set_track( gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.trackno ).c_str()); - if(!tags.genre.empty()) id3tag_set_genre( gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.genre ).c_str()); + if(!tags.trackno.empty()) id3tag_set_track(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.trackno).c_str()); + if(!tags.genre.empty()) id3tag_set_genre(gfp, mpt::transcode<std::string>(mpt::common_encoding::iso8859_1, tags.genre).c_str()); } else if(id3type == ID3v2OpenMPT) { Tags = tags; @@ -583,7 +572,6 @@ id3v2Size = id3end - id3beg; } } - } void WriteInterleaved(std::size_t count, const float *interleaved) override { @@ -596,15 +584,15 @@ while(count > 0) { int count_chunk = std::clamp(mpt::saturate_cast<int>(count), int(0), count_max); - buf.resize(count_chunk + (count_chunk+3)/4 + 7200); + buf.resize(count_chunk + (count_chunk + 3) / 4 + 7200); int result = 0; if(lame_get_num_channels(gfp) == 1) { // lame always assumes stereo input with interleaved interface, so use non-interleaved for mono - result = lame_encode_buffer_ieee_float(gfp, interleaved, nullptr, count_chunk, mpt::byte_cast<unsigned char*>(buf.data()), mpt::saturate_cast<int>(buf.size())); + result = lame_encode_buffer_ieee_float(gfp, interleaved, nullptr, count_chunk, mpt::byte_cast<unsigned char *>(buf.data()), mpt::saturate_cast<int>(buf.size())); } else { - result = lame_encode_buffer_interleaved_ieee_float(gfp, interleaved, count_chunk, mpt::byte_cast<unsigned char*>(buf.data()), mpt::saturate_cast<int>(buf.size())); + result = lame_encode_buffer_interleaved_ieee_float(gfp, interleaved, count_chunk, mpt::byte_cast<unsigned char *>(buf.data()), mpt::saturate_cast<int>(buf.size())); } buf.resize((result >= 0) ? result : 0); if(result == -2) @@ -623,7 +611,7 @@ gfp_inited = true; } buf.resize(7200); - buf.resize(lame_encode_flush(gfp, mpt::byte_cast<unsigned char*>(buf.data()), mpt::saturate_cast<int>(buf.size()))); + buf.resize(lame_encode_flush(gfp, mpt::byte_cast<unsigned char *>(buf.data()), mpt::saturate_cast<int>(buf.size()))); WriteBuffer(); ReplayGain replayGain; if(settings.Details.MP3LameCalculatePeakSample) @@ -637,12 +625,12 @@ replayGain.TrackGaindBValid = true; } if(id3type == ID3v2OpenMPT && (settings.Details.MP3LameCalculatePeakSample || settings.Details.MP3LameCalculateReplayGain)) - { // update ID3v2 tag with replay gain information + { // update ID3v2 tag with replay gain information replayGain.Tag = ReplayGain::TagWrite; mpt::IO::Offset endPos = mpt::IO::TellWrite(f); mpt::IO::SeekAbsolute(f, fStart); std::string tagdata(static_cast<std::size_t>(id3v2Size), '\0'); - mpt::IO::Write(f, mpt::as_span(tagdata.data(), mpt::saturate_cast<std::size_t>(id3v2Size))); // clear out the old tag + mpt::IO::Write(f, mpt::as_span(tagdata.data(), mpt::saturate_cast<std::size_t>(id3v2Size))); // clear out the old tag mpt::IO::SeekAbsolute(f, fStart); ID3V2Tagger tagger(settings.Details); tagger.WriteID3v2Tags(f, Tags, replayGain); @@ -660,7 +648,7 @@ mpt::IO::Offset endPos = mpt::IO::TellWrite(f); mpt::IO::SeekAbsolute(f, fStart + id3v2Size); buf.resize(lame_get_lametag_frame(gfp, nullptr, 0)); - buf.resize(lame_get_lametag_frame(gfp, mpt::byte_cast<unsigned char*>(buf.data()), buf.size())); + buf.resize(lame_get_lametag_frame(gfp, mpt::byte_cast<unsigned char *>(buf.data()), buf.size())); WriteBuffer(); mpt::IO::SeekAbsolute(f, endPos); } @@ -677,7 +665,7 @@ } }; -#endif // MPT_WITH_LAME +#endif // MPT_WITH_LAME @@ -697,7 +685,7 @@ SetTraits(BuildTraits(true)); return; } -#endif // MPT_WITH_LAME +#endif // MPT_WITH_LAME } @@ -707,7 +695,7 @@ #ifdef MPT_WITH_LAME || (m_Type == MP3EncoderLame) || (m_Type == MP3EncoderLameCompatible) -#endif // MPT_WITH_LAME +#endif // MPT_WITH_LAME ; } @@ -723,12 +711,12 @@ { result = std::make_unique<MP3LameStreamWriter>(file, (m_Type == MP3EncoderLameCompatible), settings, tags); MPT_UNUSED(prng); -#else // !MPT_WITH_LAME +#else // !MPT_WITH_LAME MPT_UNUSED(file); MPT_UNUSED(settings); MPT_UNUSED(tags); MPT_UNUSED(prng); -#endif // MPT_WITH_LAME +#endif // MPT_WITH_LAME } return result; } @@ -739,7 +727,7 @@ #ifdef MPT_WITH_LAME if(m_Type == MP3EncoderLame) { - static constexpr int q_table[11] = { 240, 220, 190, 170, 160, 130, 120, 100, 80, 70, 50 }; // http://wiki.hydrogenaud.io/index.php?title=LAME + static constexpr int q_table[11] = {240, 220, 190, 170, 160, 130, 120, 100, 80, 70, 50}; // http://wiki.hydrogenaud.io/index.php?title=LAME int q = mpt::saturate_round<int>((1.0f - quality) * 10.0f); if(q < 0) q = 0; if(q >= 10) @@ -750,7 +738,7 @@ return MPT_UFORMAT_MESSAGE("VBR -V{} (~{} kbit)")(q, q_table[q]); } } -#endif // MPT_WITH_LAME +#endif // MPT_WITH_LAME return EncoderFactoryBase::DescribeQuality(quality); } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -43,7 +43,6 @@ public: MP3Encoder(MP3EncoderType type); - }; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -71,7 +71,7 @@ OpusEncCallbacks ope_callbacks; OggOpusComments *ope_comments; OggOpusEnc *ope_encoder; - std::vector<std::pair<std::string, std::string> > opus_comments; + std::vector<std::pair<std::string, std::string>> opus_comments; private: static int CallbackWrite(void *user_data, const unsigned char *ptr, opus_int32 len) { @@ -91,7 +91,7 @@ { return 1; } - const std::byte *pb = mpt::byte_cast<const std::byte*>(ptr); + const std::byte *pb = mpt::byte_cast<const std::byte *>(ptr); buf.assign(pb, pb + len); WriteBuffer(); return 0; @@ -121,17 +121,17 @@ if(settings.Tags) { - AddCommentField("ENCODER", tags.encoder); + AddCommentField("ENCODER", tags.encoder); AddCommentField("SOURCEMEDIA", MPT_USTRING("tracked music file")); - AddCommentField("TITLE", tags.title ); - AddCommentField("ARTIST", tags.artist ); - AddCommentField("ALBUM", tags.album ); - AddCommentField("DATE", tags.year ); - AddCommentField("COMMENT", tags.comments ); - AddCommentField("GENRE", tags.genre ); - AddCommentField("CONTACT", tags.url ); - AddCommentField("BPM", tags.bpm ); // non-standard - AddCommentField("TRACKNUMBER", tags.trackno ); + AddCommentField("TITLE", tags.title); + AddCommentField("ARTIST", tags.artist); + AddCommentField("ALBUM", tags.album); + AddCommentField("DATE", tags.year); + AddCommentField("COMMENT", tags.comments); + AddCommentField("GENRE", tags.genre); + AddCommentField("CONTACT", tags.url); + AddCommentField("BPM", tags.bpm); // non-standard + AddCommentField("TRACKNUMBER", tags.trackno); } int ope_error = 0; @@ -139,14 +139,14 @@ ope_comments = ope_comments_create(); if(settings.Tags && ope_comments) { - for(const auto & comment : opus_comments) + for(const auto &comment : opus_comments) { ope_comments_add(ope_comments, comment.first.c_str(), comment.second.c_str()); } } ope_encoder = ope_encoder_create_callbacks(&ope_callbacks, this, ope_comments, settings.Samplerate, settings.Channels, settings.Channels > 2 ? 1 : 0, &ope_error); - + opus_int32 ctl_serial = mpt::random<uint32>(prng); ope_encoder_ctl(ope_encoder, OPE_SET_SERIALNO(ctl_serial)); @@ -172,7 +172,6 @@ } ope_encoder_flush_header(ope_encoder); - } void WriteInterleaved(std::size_t count, const float *interleaved) override { @@ -196,7 +195,7 @@ } }; -#endif // MPT_WITH_OGG +#endif // MPT_WITH_OGG Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -30,7 +30,6 @@ public: OggOpusEncoder(); - }; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -150,24 +150,24 @@ traits.maxChannels = 4; traits.samplerates = {}; traits.modes = Encoder::ModeLossless; - traits.formats.push_back({ Encoder::Format::Encoding::Float, 64, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Float, 64, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Float, 32, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Float, 32, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 32, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 32, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 24, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 24, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 16, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 16, mpt::endian::big }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 8, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Unsigned, 8, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Alaw, 16, mpt::get_endian() }); - traits.formats.push_back({ Encoder::Format::Encoding::ulaw, 16, mpt::get_endian() }); + traits.formats.push_back({Encoder::Format::Encoding::Float, 64, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Float, 64, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Float, 32, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Float, 32, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 32, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 32, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 24, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 24, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 16, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 16, mpt::endian::big}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 8, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Unsigned, 8, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Alaw, 16, mpt::get_endian()}); + traits.formats.push_back({Encoder::Format::Encoding::ulaw, 16, mpt::get_endian()}); traits.defaultSamplerate = 48000; traits.defaultChannels = 2; traits.defaultMode = Encoder::ModeLossless; - traits.defaultFormat = { Encoder::Format::Encoding::Float, 32, mpt::endian::little }; + traits.defaultFormat = {Encoder::Format::Encoding::Float, 32, mpt::endian::little}; SetTraits(traits); } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -18,7 +18,7 @@ OPENMPT_NAMESPACE_BEGIN - + class RawStreamWriter; @@ -35,7 +35,6 @@ public: RAWEncoder(); - }; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -70,13 +70,13 @@ class VorbisStreamWriter : public StreamWriterBase { private: - ogg_stream_state os; - ogg_page og; - ogg_packet op; - vorbis_info vi; - vorbis_comment vc; - vorbis_dsp_state vd; - vorbis_block vb; + ogg_stream_state os; + ogg_page og; + ogg_packet op; + vorbis_info vi; + vorbis_comment vc; + vorbis_dsp_state vd; + vorbis_block vb; int vorbis_channels; private: void WritePage() @@ -120,17 +120,17 @@ if(settings.Tags) { - AddCommentField("ENCODER", tags.encoder); + AddCommentField("ENCODER", tags.encoder); AddCommentField("SOURCEMEDIA", MPT_USTRING("tracked music file")); - AddCommentField("TITLE", tags.title ); - AddCommentField("ARTIST", tags.artist ); - AddCommentField("ALBUM", tags.album ); - AddCommentField("DATE", tags.year ); - AddCommentField("COMMENT", tags.comments ); - AddCommentField("GENRE", tags.genre ); - AddCommentField("CONTACT", tags.url ); - AddCommentField("BPM", tags.bpm ); // non-standard - AddCommentField("TRACKNUMBER", tags.trackno ); + AddCommentField("TITLE", tags.title); + AddCommentField("ARTIST", tags.artist); + AddCommentField("ALBUM", tags.album); + AddCommentField("DATE", tags.year); + AddCommentField("COMMENT", tags.comments); + AddCommentField("GENRE", tags.genre); + AddCommentField("CONTACT", tags.url); + AddCommentField("BPM", tags.bpm); // non-standard + AddCommentField("TRACKNUMBER", tags.trackno); } ogg_packet header; @@ -148,7 +148,6 @@ { WritePage(); } - } void WriteInterleaved(std::size_t count, const float *interleaved) override { @@ -162,7 +161,7 @@ { for(int channel = 0; channel < vorbis_channels; ++channel) { - buffer[channel][frame] = interleaved[frame*vorbis_channels+channel]; + buffer[channel][frame] = interleaved[frame * vorbis_channels + channel]; } } vorbis_analysis_wrote(&vd, countChunk); @@ -179,7 +178,7 @@ } } } - } + } } void WriteFinalize() override { @@ -212,7 +211,7 @@ } }; -#endif // MPT_WITH_OGG && MPT_WITH_VORBIS && MPT_WITH_VORBISENC +#endif // MPT_WITH_OGG && MPT_WITH_VORBIS && MPT_WITH_VORBISENC @@ -266,7 +265,7 @@ mpt::ustring VorbisEncoder::DescribeQuality(float quality) const { - static constexpr int q_table[11] = { 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 500 }; // http://wiki.hydrogenaud.io/index.php?title=Recommended_Ogg_Vorbis + static constexpr int q_table[11] = {64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 500}; // http://wiki.hydrogenaud.io/index.php?title=Recommended_Ogg_Vorbis int q = Clamp(mpt::saturate_round<int>(quality * 10.0f), 0, 10); return MPT_UFORMAT("Q{} (~{} kbit)")(mpt::ufmt::fix(quality * 10.0f, 1), q_table[q]); } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -33,7 +33,6 @@ public: VorbisEncoder(); - }; Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.cpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.cpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.cpp Fri Sep 13 15:01:06 2024 (r21587) @@ -63,7 +63,6 @@ } fileWAV->StartChunk(RIFFChunk::iddata); - } SampleFormat GetSampleFormat() const override { @@ -115,8 +114,8 @@ cuePoint.id = index++; cuePoint.position = static_cast<uint32>(cue); cuePoint.riffChunkID = static_cast<uint32>(RIFFChunk::iddata); - cuePoint.chunkStart = 0; // we use no Wave List Chunk (wavl) as we have only one data block, so this should be 0. - cuePoint.blockStart = 0; // ditto + cuePoint.chunkStart = 0; // we use no Wave List Chunk (wavl) as we have only one data block, so this should be 0. + cuePoint.blockStart = 0; // ditto cuePoint.offset = cuePoint.position; mpt::IO::Write(f, cuePoint); } @@ -146,16 +145,16 @@ traits.maxChannels = 4; traits.samplerates = {}; traits.modes = Encoder::ModeLossless; - traits.formats.push_back({ Encoder::Format::Encoding::Float, 64, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Float, 32, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 32, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 24, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Integer, 16, mpt::endian::little }); - traits.formats.push_back({ Encoder::Format::Encoding::Unsigned, 8, mpt::endian::little }); + traits.formats.push_back({Encoder::Format::Encoding::Float, 64, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Float, 32, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 32, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 24, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Integer, 16, mpt::endian::little}); + traits.formats.push_back({Encoder::Format::Encoding::Unsigned, 8, mpt::endian::little}); traits.defaultSamplerate = 48000; traits.defaultChannels = 2; traits.defaultMode = Encoder::ModeLossless; - traits.defaultFormat = { Encoder::Format::Encoding::Float, 32, mpt::endian::little }; + traits.defaultFormat = {Encoder::Format::Encoding::Float, 32, mpt::endian::little}; SetTraits(traits); } Modified: trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.hpp ============================================================================== --- trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.hpp Fri Sep 13 14:40:10 2024 (r21586) +++ trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.hpp Fri Sep 13 15:01:06 2024 (r21587) @@ -18,7 +18,7 @@ OPENMPT_NAMESPACE_BEGIN - + class WavStreamWriter; @@ -35,7 +35,6 @@ public: WAVEncoder(); - }; |
