Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3871] trunk/OpenMPT
|
From: <sag...@us...> - 2014-03-11 17:52:11
|
Revision: 3871
http://sourceforge.net/p/modplug/code/3871
Author: saga-games
Date: 2014-03-11 17:52:03 +0000 (Tue, 11 Mar 2014)
Log Message:
-----------
[Reg] Remove simple noise reduction DSP. Noone is going to miss this.
[Mod] OpenMPT: Version is now 1.22.07.29
Modified Paths:
--------------
trunk/OpenMPT/common/BuildSettings.h
trunk/OpenMPT/common/versionNumber.h
trunk/OpenMPT/mptrack/Mpdlgs.cpp
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/sounddsp/DSP.cpp
trunk/OpenMPT/sounddsp/DSP.h
trunk/OpenMPT/soundlib/Snd_defs.h
trunk/OpenMPT/soundlib/Sndmix.cpp
Modified: trunk/OpenMPT/common/BuildSettings.h
===================================================================
--- trunk/OpenMPT/common/BuildSettings.h 2014-03-11 17:16:55 UTC (rev 3870)
+++ trunk/OpenMPT/common/BuildSettings.h 2014-03-11 17:52:03 UTC (rev 3871)
@@ -108,7 +108,7 @@
// Disable the built-in reverb effect
//#define NO_REVERB
-// Disable built-in miscellaneous DSP effects (surround, mega bass, noise reduction)
+// Disable built-in miscellaneous DSP effects (surround, mega bass)
//#define NO_DSP
// Disable the built-in equalizer.
Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h 2014-03-11 17:16:55 UTC (rev 3870)
+++ trunk/OpenMPT/common/versionNumber.h 2014-03-11 17:52:03 UTC (rev 3871)
@@ -17,7 +17,7 @@
#define VER_MAJORMAJOR 1
#define VER_MAJOR 22
#define VER_MINOR 07
-#define VER_MINORMINOR 28
+#define VER_MINORMINOR 29
//Version string. For example "1.17.02.28"
#define MPT_VERSION_STR VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)
Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2014-03-11 17:16:55 UTC (rev 3870)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2014-03-11 17:52:03 UTC (rev 3871)
@@ -1140,7 +1140,6 @@
ON_COMMAND(IDC_CHECK2, OnSettingsChanged)
ON_COMMAND(IDC_CHECK3, OnSettingsChanged)
ON_COMMAND(IDC_CHECK4, OnSettingsChanged)
- ON_COMMAND(IDC_CHECK5, OnSettingsChanged)
ON_COMMAND(IDC_CHECK6, OnSettingsChanged)
ON_COMMAND(IDC_CHECK7, OnSettingsChanged)
END_MESSAGE_MAP()
@@ -1189,7 +1188,6 @@
#endif
#ifndef NO_DSP
if (dwQuality & SNDDSP_SURROUND) CheckDlgButton(IDC_CHECK4, MF_CHECKED);
- if (dwQuality & SNDDSP_NOISEREDUCTION) CheckDlgButton(IDC_CHECK5, MF_CHECKED);
#else
GetDlgItem(IDC_CHECK4)->ShowWindow(SW_HIDE);
GetDlgItem(IDC_CHECK5)->ShowWindow(SW_HIDE);
@@ -1320,9 +1318,7 @@
#endif
#ifndef NO_DSP
dwQualityMask |= SNDDSP_SURROUND;
- dwQualityMask |= SNDDSP_NOISEREDUCTION;
if (IsDlgButtonChecked(IDC_CHECK4)) dwQuality |= SNDDSP_SURROUND;
- if (IsDlgButtonChecked(IDC_CHECK5)) dwQuality |= SNDDSP_NOISEREDUCTION;
#endif
#ifndef NO_REVERB
dwQualityMask |= SNDDSP_REVERB;
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2014-03-11 17:16:55 UTC (rev 3870)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2014-03-11 17:52:03 UTC (rev 3871)
@@ -499,7 +499,6 @@
LTEXT "EQ Warning Message",IDC_EQ_WARNING,12,114,264,36,0,WS_EX_TRANSPARENT
GROUPBOX "",IDC_STATIC,6,156,276,120
CONTROL "Automatic Gain Control",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,164,97,10
- CONTROL "Noise reduction",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,132,164,82,10
CONTROL "Bass Expansion",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,178,81,10
CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,33,191,62,15
LTEXT "Low",IDC_STATIC,17,193,14,8
Modified: trunk/OpenMPT/sounddsp/DSP.cpp
===================================================================
--- trunk/OpenMPT/sounddsp/DSP.cpp 2014-03-11 17:16:55 UTC (rev 3870)
+++ trunk/OpenMPT/sounddsp/DSP.cpp 2014-03-11 17:52:03 UTC (rev 3871)
@@ -52,14 +52,14 @@
float gainFT2, gainDC2, gainPI2;
float alpha, beta0, beta1, rho;
float wT, quad;
-
+
_asm {
// wT = PI*Fc/Fs
fild F_c
fldpi
fmulp ST(1), ST(0)
fild F_s
- fdivp ST(1), ST(0)
+ fdivp ST(1), ST(0)
fstp wT
// gain^2
fld gainDC
@@ -76,19 +76,19 @@
quad = gainPI2 + gainDC2 - (gainFT2*2);
alpha = 0;
-
+
if (quad != 0)
{
float lambda = (gainPI2 - gainDC2) / quad;
alpha = (float)(lambda - Sgn(lambda)*sqrt(lambda*lambda - 1.0f));
}
-
+
beta0 = 0.5f * ((gainDC + gainPI) + (gainDC - gainPI) * alpha);
beta1 = 0.5f * ((gainDC - gainPI) + (gainDC + gainPI) * alpha);
rho = (float)((sin((wT*0.5f) - (PI/4.0f))) / (sin((wT*0.5f) + (PI/4.0f))));
-
+
quad = 1.0f / (1.0f + rho*alpha);
-
+
b0 = ((beta0 + rho*beta1) * quad);
b1 = ((beta1 + rho*beta0) * quad);
a1 = - ((rho + alpha) * quad);
@@ -121,10 +121,6 @@
CDSP::CDSP()
{
- // Noise Reduction: simple low-pass filter
- nLeftNR = 0;
- nRightNR = 0;
-
// Surround Encoding: 1 delay line + low-pass filter + high-pass filter
nSurroundSize = 0;
nSurroundPos = 0;
@@ -162,11 +158,7 @@
//-----------------------------------------------------------------
{
if (!m_Settings.m_nProLogicDelay) m_Settings.m_nProLogicDelay = 20;
- if (bReset)
- {
- // Noise Reduction
- nLeftNR = nRightNR = 0;
- }
+
// Pro-Logic Surround
nSurroundPos = nSurroundSize = 0;
if (DSPMask & SNDDSP_SURROUND)
@@ -317,26 +309,8 @@
nXBassFlt_X1 = x1;
nXBassFlt_Y1 = y1;
}
- // Noise Reduction
- if (DSPMask & SNDDSP_NOISEREDUCTION)
- {
- int n1 = nLeftNR, n2 = nRightNR;
- int *pnr = MixSoundBuffer;
- for (int nr=count; nr; nr--)
- {
- int vnr = pnr[0] >> 1;
- pnr[0] = vnr + n1;
- n1 = vnr;
- vnr = pnr[1] >> 1;
- pnr[1] = vnr + n2;
- n2 = vnr;
- pnr += 2;
- }
- nLeftNR = n1;
- nRightNR = n2;
- }
-
+
} else
{
@@ -361,19 +335,6 @@
nXBassFlt_X1 = x1;
nXBassFlt_Y1 = y1;
}
- // Noise Reduction
- if (DSPMask & SNDDSP_NOISEREDUCTION)
- {
- int n = nLeftNR;
- int *pnr = MixSoundBuffer;
- for (int nr=count; nr; pnr++, nr--)
- {
- int vnr = *pnr >> 1;
- *pnr = vnr + n;
- n = vnr;
- }
- nLeftNR = n;
- }
}
@@ -507,4 +468,3 @@
#endif // NO_DSP
-
Modified: trunk/OpenMPT/sounddsp/DSP.h
===================================================================
--- trunk/OpenMPT/sounddsp/DSP.h 2014-03-11 17:16:55 UTC (rev 3870)
+++ trunk/OpenMPT/sounddsp/DSP.h 2014-03-11 17:52:03 UTC (rev 3871)
@@ -40,15 +40,11 @@
CDSPSettings m_Settings;
private:
- // Noise Reduction: simple low-pass filter
- LONG nLeftNR;
- LONG nRightNR;
-
// Surround Encoding: 1 delay line + low-pass filter + high-pass filter
LONG nSurroundSize;
LONG nSurroundPos;
LONG nDolbyDepth;
-
+
// Surround Biquads
LONG nDolbyHP_Y1;
LONG nDolbyHP_X1;
@@ -90,4 +86,4 @@
void ProcessQuadSurround(int * MixSoundBuffer, int * MixRearBuffer, int count);
};
-#endif // NO_DSP
+#endif // NO_DSP
\ No newline at end of file
Modified: trunk/OpenMPT/soundlib/Snd_defs.h
===================================================================
--- trunk/OpenMPT/soundlib/Snd_defs.h 2014-03-11 17:16:55 UTC (rev 3870)
+++ trunk/OpenMPT/soundlib/Snd_defs.h 2014-03-11 17:52:03 UTC (rev 3871)
@@ -288,9 +288,6 @@
#define SONG_PLAY_FLAGS (~SONG_FILE_FLAGS)
// Global Options (Renderer)
-#ifndef NO_DSP
-#define SNDDSP_NOISEREDUCTION 0x01 // reduce hiss (do not use, it's just a simple low-pass filter)
-#endif // NO_DSP
#ifndef NO_AGC
#define SNDDSP_AGC 0x40 // automatic gain control
#endif // ~NO_AGC
Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp 2014-03-11 17:16:55 UTC (rev 3870)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp 2014-03-11 17:52:03 UTC (rev 3871)
@@ -286,7 +286,7 @@
//-------------------------------------------------
{
#ifndef NO_DSP
- if(m_MixerSettings.DSPMask & (SNDDSP_SURROUND|SNDDSP_MEGABASS|SNDDSP_NOISEREDUCTION))
+ if(m_MixerSettings.DSPMask & (SNDDSP_SURROUND|SNDDSP_MEGABASS))
{
m_DSP.Process(MixSoundBuffer, MixRearBuffer, countChunk, m_MixerSettings.gnChannels, m_MixerSettings.DSPMask);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
