Thread: [OMPT-svn-commit] SF.net SVN: modplug:[4593] trunk/OpenMPT (Page 56)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4593
          http://sourceforge.net/p/modplug/code/4593
Author:   manxorist
Date:     2014-11-11 15:38:51 +0000 (Tue, 11 Nov 2014)
Log Message:
-----------
[Ref] Rewrite ApplyStereoSeparation in mid/side form. Makes the code a tiny bit easier to follow for separation > 100%.
[Mod] Allow stereo separation values > 100% again. Support [0..200] in the mixer settings dialog.
[Doc] libopenmpt: Document the useful range for stereo separation as 0%..200%.
[Fix] foo_openmpt: Correct description of allowed samplerates in advanced settings.
[Mod] foo_openmpt Limit stereo separation to [0..200].
[Mod] xmp-openmpt / in_openmpt: Limit stereo separation to [0..200].

Modified Paths:
--------------
    trunk/OpenMPT/libopenmpt/foo_openmpt.cpp
    trunk/OpenMPT/libopenmpt/libopenmpt.hpp
    trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
    trunk/OpenMPT/libopenmpt/libopenmpt_settings.cpp
    trunk/OpenMPT/mptrack/Mpdlgs.cpp
    trunk/OpenMPT/soundlib/MixerSettings.h
    trunk/OpenMPT/soundlib/Sndmix.cpp

Modified: trunk/OpenMPT/libopenmpt/foo_openmpt.cpp
===================================================================

--- trunk/OpenMPT/libopenmpt/foo_openmpt.cpp	2014-11-11 11:26:37 UTC (rev 4592)
+++ trunk/OpenMPT/libopenmpt/foo_openmpt.cpp	2014-11-11 15:38:51 UTC (rev 4593)
@@ -63,10 +63,10 @@
 
 static advconfig_branch_factory g_advconfigBranch("OpenMPT Component", guid_openmpt_root, advconfig_branch::guid_branch_decoding, 0);
 
-static advconfig_integer_factory   cfg_samplerate("Samplerate [6000..48000] (Hz)"                                     , guid_openmpt_samplerate, guid_openmpt_root, 0, 48000, 6000, 96000);
+static advconfig_integer_factory   cfg_samplerate("Samplerate [6000..96000] (Hz)"                                     , guid_openmpt_samplerate, guid_openmpt_root, 0, 48000, 6000, 96000);
 static advconfig_integer_factory   cfg_channels  ("Channels [1=mono, 2=stereo, 4=quad]"                               , guid_openmpt_channels  , guid_openmpt_root, 0,     2,    1,     4);
 static advconfig_string_factory_MT cfg_gain      ("Gain [-12...12] (dB)"                                              , guid_openmpt_gain      , guid_openmpt_root, 0, "0.0");
-static advconfig_integer_factory   cfg_stereo    ("Stereo separation [0...400] (%)"                                   , guid_openmpt_stereo    , guid_openmpt_root, 0,   100,    0,   400);
+static advconfig_integer_factory   cfg_stereo    ("Stereo separation [0...200] (%)"                                   , guid_openmpt_stereo    , guid_openmpt_root, 0,   100,    0,   200);
 static advconfig_string_factory_MT cfg_repeat    ("Repeat [0=never, -1=forever, 1..] (#)"                             , guid_openmpt_repeat    , guid_openmpt_root, 0,   "0");
 static advconfig_integer_factory   cfg_filter    ("Interpolation filter length [1=nearest, 2=linear, 4=cubic, 8=sinc]", guid_openmpt_filter    , guid_openmpt_root, 0,     8,    1,     8);
 static advconfig_string_factory_MT cfg_ramping   ("Volume ramping [-1=default, 0=off, 1..10] (ms)"                    , guid_openmpt_ramping   , guid_openmpt_root, 0,  "-1");

Modified: trunk/OpenMPT/libopenmpt/libopenmpt.hpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.hpp	2014-11-11 11:26:37 UTC (rev 4592)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.hpp	2014-11-11 15:38:51 UTC (rev 4593)
@@ -169,7 +169,7 @@
 		/*!
 		  The related value represents the stereo separation generated by the libopenmpt mixer in percent.\n
 		  The default value is 100.\n
-		  The supported value range is [0,400].\n
+		  The supported value range is [0,200].\n
 		*/
 		RENDER_STEREOSEPARATION_PERCENT   = 2,
 		//! Interpolation Filter

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	2014-11-11 11:26:37 UTC (rev 4592)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	2014-11-11 15:38:51 UTC (rev 4593)
@@ -574,7 +574,7 @@
 			return static_cast<std::int32_t>( 1000.0f * 2.0f * std::log10( m_Gain ) );
 		} break;
 		case module::RENDER_STEREOSEPARATION_PERCENT: {
-			return m_sndFile->m_MixerSettings.m_nStereoSeparation * 100 / 128;
+			return m_sndFile->m_MixerSettings.m_nStereoSeparation * 100 / MixerSettings::StereoSeparationScale;
 		} break;
 		case module::RENDER_INTERPOLATIONFILTER_LENGTH: {
 			return resamplingmode_to_filterlength( m_sndFile->m_Resampler.m_Settings.SrcMode );
@@ -594,7 +594,7 @@
 			m_Gain = static_cast<float>( std::pow( 10.0f, value * 0.001f * 0.5f ) );
 		} break;
 		case module::RENDER_STEREOSEPARATION_PERCENT: {
-			std::int32_t newvalue = value * 128 / 100;
+			std::int32_t newvalue = value * MixerSettings::StereoSeparationScale / 100;
 			if ( newvalue != static_cast<std::int32_t>( m_sndFile->m_MixerSettings.m_nStereoSeparation ) ) {
 				MixerSettings settings = m_sndFile->m_MixerSettings;
 				settings.m_nStereoSeparation = newvalue;

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_settings.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_settings.cpp	2014-11-11 11:26:37 UTC (rev 4592)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_settings.cpp	2014-11-11 15:38:51 UTC (rev 4593)
@@ -190,7 +190,7 @@
 			m_ComboBoxRepeat.SelectString( 0, L"never" );
 		}
 
-		m_SliderCtrlStereoSeparation.SetRange( 0, 100 );
+		m_SliderCtrlStereoSeparation.SetRange( 0, 200 );
 		m_SliderCtrlStereoSeparation.SetTicFreq( 100 );
 		m_SliderCtrlStereoSeparation.SetPageSize( 25 );
 		m_SliderCtrlStereoSeparation.SetLineSize( 5 );

Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp	2014-11-11 11:26:37 UTC (rev 4592)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp	2014-11-11 15:38:51 UTC (rev 4593)
@@ -1010,9 +1010,9 @@
 
 	// Stereo Separation
 	{
-		m_SliderStereoSep.SetRange(0, 16);
+		m_SliderStereoSep.SetRange(0, 32);
 		m_SliderStereoSep.SetPos(16);
-		for (int n = 0; n <= 16; n++)
+		for (int n = 0; n <= 32; n++)
 		{
 			if ((int)TrackerSettings::Instance().MixerStereoSeparation <= 8 * n)
 			{

Modified: trunk/OpenMPT/soundlib/MixerSettings.h
===================================================================
--- trunk/OpenMPT/soundlib/MixerSettings.h	2014-11-11 11:26:37 UTC (rev 4592)
+++ trunk/OpenMPT/soundlib/MixerSettings.h	2014-11-11 15:38:51 UTC (rev 4593)
@@ -17,6 +17,8 @@
 {
 
 	int32 m_nStereoSeparation;
+	static const int32 StereoSeparationScale = 128;
+	
 	UINT m_nMaxMixChannels;
 	DWORD DSPMask;
 	DWORD MixerFlags;

Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp	2014-11-11 11:26:37 UTC (rev 4592)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp	2014-11-11 15:38:51 UTC (rev 4593)
@@ -129,21 +129,40 @@
 
 // Apply stereo separation factor on an interleaved stereo/quad stream.
 // count = Number of stereo sample pairs to process
-// separation = -128...128 (negative values = swap L/R, 0 = mono)
+// separation = -256...256 (negative values = swap L/R, 0 = mono, 128 = normal)
 static void ApplyStereoSeparation(mixsample_t *mixBuf, CSoundFile::samplecount_t count, int32 separation)
 //-------------------------------------------------------------------------------------------------------
 {
-	const mixsample_t fac1 = static_cast<mixsample_t>(64 + separation / 2), fac2 = static_cast<mixsample_t>(64 - separation / 2);
+#ifdef MPT_INTMIXER
+	const mixsample_t factor_num = separation; // 128 =^= 1.0f
+	const mixsample_t factor_den = MixerSettings::StereoSeparationScale; // 128
+	const mixsample_t normalize_den = 2; // mid/side pre/post normalization
+	const mixsample_t mid_den = normalize_den;
+	const mixsample_t side_num = factor_num;
+	const mixsample_t side_den = factor_den * normalize_den;
+#else
+	const float normalize_factor = 0.5f; // cumulative mid/side normalization factor (1/sqrt(2))*(1/sqrt(2))
+	const float factor = static_cast<float>(separation) / static_cast<float>(MixerSettings::StereoSeparationScale); // sep / 128
+	const float mid_factor = normalize_factor;
+	const float side_factor = factor * normalize_factor;
+#endif
 	for(CSoundFile::samplecount_t i = 0; i < count; i++)
 	{
-		const mixsample_t l = mixBuf[0], r = mixBuf[1];
+		mixsample_t l = mixBuf[0];
+		mixsample_t r = mixBuf[1];
+		mixsample_t m = l + r;
+		mixsample_t s = l - r;
 #ifdef MPT_INTMIXER
-		mixBuf[0] = static_cast<mixsample_t>((Util::mul32to64(l, fac1) + Util::mul32to64(r, fac2)) >> 7);
-		mixBuf[1] = static_cast<mixsample_t>((Util::mul32to64(l, fac2) + Util::mul32to64(r, fac1)) >> 7);
+		m /= mid_den;
+		s = Util::muldiv(s, side_num, side_den);
 #else
-		mixBuf[0] = (l * fac1 + r * fac2) / mixsample_t(128);
-		mixBuf[1] = (l * fac2 + r * fac1) / mixsample_t(128);
+		m *= mid_factor;
+		s *= side_factor;
 #endif
+		l = m + s;
+		r = m - s;
+		mixBuf[0] = l;
+		mixBuf[1] = r;
 		mixBuf += 2;
 	}
 }
@@ -152,7 +171,7 @@
 static void ApplyStereoSeparation(mixsample_t *SoundFrontBuffer, mixsample_t *SoundRearBuffer, std::size_t channels, std::size_t countChunk, int32 separation)
 //------------------------------------------------------------------------------------------------------------------------------------------------------------
 {
-	if(separation == 128)
+	if(separation == MixerSettings::StereoSeparationScale)
 	{ // identity
 		return;
 	}
@@ -260,7 +279,7 @@
 			ApplyGlobalVolume(MixSoundBuffer, MixRearBuffer, countChunk);
 		}
 
-		if(m_MixerSettings.m_nStereoSeparation >= -128 && m_MixerSettings.m_nStereoSeparation < 128 && m_MixerSettings.gnChannels >= 2)
+		if(m_MixerSettings.m_nStereoSeparation != MixerSettings::StereoSeparationScale)
 		{
 			ApplyStereoSeparation(MixSoundBuffer, MixRearBuffer, m_MixerSettings.gnChannels, countChunk, m_MixerSettings.m_nStereoSeparation);
 		}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [OMPT-svn-commit] SF.net SVN: modplug:[4593] trunk/OpenMPT (Page 56)

A music tracker software for Windows.

modplug-svn-commit