[OMPT-svn-commit] OpenMPT r23458 - in branches/OpenMPT-1.32: . src/openmpt/streamencoder

[<sv...@op...>]

Author: manx
Date: Wed Jun 11 15:50:19 2025
New Revision: 23458
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23458

Log:
Merged revision(s) 23457 from trunk/OpenMPT:
[Fix] openmpt/streamencoder: Remove unwanted dependencies on common/.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoder.cpp
   branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderMP3.cpp
   branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderOpus.cpp
   branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderVorbis.cpp

Modified: branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoder.cpp
==============================================================================
--- branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoder.cpp	Wed Jun 11 15:49:58 2025	(r23457)
+++ branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoder.cpp	Wed Jun 11 15:50:19 2025	(r23458)
@@ -7,6 +7,7 @@
 
 #include "openmpt/streamencoder/StreamEncoder.hpp"
 
+#include "mpt/base/alloc.hpp"
 #include "mpt/base/bit.hpp"
 #include "mpt/base/macros.hpp"
 #include "mpt/base/span.hpp"

Modified: branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderMP3.cpp
==============================================================================
--- branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderMP3.cpp	Wed Jun 11 15:49:58 2025	(r23457)
+++ branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderMP3.cpp	Wed Jun 11 15:50:19 2025	(r23458)
@@ -8,9 +8,12 @@
 #include "openmpt/streamencoder/StreamEncoderMP3.hpp"
 
 #include "mpt/base/alloc.hpp"
+#include "mpt/base/integer.hpp"
 #include "mpt/base/macros.hpp"
 #include "mpt/base/memory.hpp"
+#include "mpt/base/numeric.hpp"
 #include "mpt/base/saturate_cast.hpp"
+#include "mpt/base/saturate_round.hpp"
 #include "mpt/base/span.hpp"
 #include "mpt/format/message_macros.hpp"
 #include "mpt/format/simple.hpp"
@@ -27,6 +30,7 @@
 #include "openmpt/soundfile_data/tags.hpp"
 #include "openmpt/streamencoder/StreamEncoder.hpp"
 
+#include <algorithm>
 #include <memory>
 #include <ostream>
 #include <string>
@@ -513,7 +517,7 @@
 		{
 
 			float lame_quality = 10.0f - (settings.Quality * 10.0f);
-			Limit(lame_quality, 0.0f, 9.999f);
+			lame_quality = std::clamp(lame_quality, 0.0f, 9.999f);
 			lame_set_VBR_quality(gfp, lame_quality);
 			lame_set_VBR(gfp, vbr_default);
 

Modified: branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderOpus.cpp
==============================================================================
--- branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderOpus.cpp	Wed Jun 11 15:49:58 2025	(r23457)
+++ branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderOpus.cpp	Wed Jun 11 15:50:19 2025	(r23458)
@@ -9,6 +9,7 @@
 
 #include "mpt/base/alloc.hpp"
 #include "mpt/base/memory.hpp"
+#include "mpt/base/pointer.hpp"
 #include "mpt/base/saturate_cast.hpp"
 #include "mpt/io/io.hpp"
 #include "mpt/io/io_stdstream.hpp"
@@ -32,6 +33,7 @@
 #include <cstddef>
 
 #if defined(MPT_WITH_OPUS) && defined(MPT_WITH_OPUSENC)
+#include <opus.h>
 #include <opusenc.h>
 #endif
 

Modified: branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderVorbis.cpp
==============================================================================
--- branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderVorbis.cpp	Wed Jun 11 15:49:58 2025	(r23457)
+++ branches/OpenMPT-1.32/src/openmpt/streamencoder/StreamEncoderVorbis.cpp	Wed Jun 11 15:50:19 2025	(r23458)
@@ -9,6 +9,10 @@
 
 #include "mpt/base/alloc.hpp"
 #include "mpt/base/saturate_cast.hpp"
+#include "mpt/base/saturate_round.hpp"
+#include "mpt/format/message.hpp"
+#include "mpt/format/message_macros.hpp"
+#include "mpt/format/simple.hpp"
 #include "mpt/io/io.hpp"
 #include "mpt/io/io_stdstream.hpp"
 #include "mpt/path/native_path.hpp"
@@ -21,6 +25,7 @@
 #include "openmpt/soundfile_data/tags.hpp"
 #include "openmpt/streamencoder/StreamEncoder.hpp"
 
+#include <algorithm>
 #include <memory>
 #include <ostream>
 
@@ -266,8 +271,8 @@
 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
-	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]);
+	int q = std::clamp(mpt::saturate_round<int>(quality * 10.0f), 0, 10);
+	return MPT_UFORMAT_MESSAGE("Q{} (~{} kbit)")(mpt::format<mpt::ustring>::fix(quality * 10.0f, 1), q_table[q]);
 }