Changeset 9 for trunk

Timestamp:

Aug 28, 2011, 4:57:19 AM (12 years ago)

Author:

roman

Message:

 

Location:

trunk/Utilities/GeneratePcmWavFile

Files:

• GeneratePcmWavFile.cpp (modified) (3 diffs)
• Win32/Release/GeneratePcmWavFile.exe (modified) (previous)

trunk/Utilities/GeneratePcmWavFile/GeneratePcmWavFile.cpp

@@ -252 +252 @@
                                                         SHORT* pnSampleData = (SHORT*) (Properties.pbBuffer + nIndex);
                                                         for(WORD nChannelIndex = 0; nChannelIndex < pWaveFormatEx->nChannels; nChannelIndex++)
-                                                                pnSampleData[nChannelIndex] += (SHORT) (m_fSignalAmplitude * (DOUBLE) (rand() - RAND_MAX / 2) / (RAND_MAX / 2));
+                                                                pnSampleData[nChannelIndex] += (SHORT) (m_fNoiseAmplitude * (DOUBLE) (rand() - RAND_MAX / 2) / (RAND_MAX / 2));
                                                 }
                                         }
@@ -273 +273 @@
                         VOID InitializeSignal(DOUBLE fSignalPeriod, DOUBLE fSignalAmplitude, DOUBLE fNoiseAmplitude)
                         {
-                                __D(fSignalPeriod > 0 && fSignalAmplitude >= 0, E_INVALIDARG);
+                                __D(fSignalPeriod >= 0 && fSignalAmplitude >= 0 && fNoiseAmplitude >= 0, E_INVALIDARG);
                                 m_fSignalPeriod = fSignalPeriod;
                                 m_fSignalAmplitude = fSignalAmplitude;
@@ -460 +460 @@
                 {
                         __D(m_WaveFormatEx.wBitsPerSample == 16, E_NOTIMPL);
-                        const DOUBLE fSignalPeriod = (DOUBLE) pWaveFormatEx->nSamplesPerSec / m_nSignalFrequency;
-                        const DOUBLE fSignalAmplitude = 32767.0 / pow(10.0, m_nSignalLoudness / 20.0);
-                        const DOUBLE fNoiseAmplitude = 32767.0 / pow(10.0, m_nNoiseLoudness / 20.0);
+                        DOUBLE fSignalPeriod = 0, fSignalAmplitude = 0;
+                        if(m_nSignalFrequency && m_nSignalLoudness)
+                        {
+                                fSignalPeriod = (DOUBLE) pWaveFormatEx->nSamplesPerSec / m_nSignalFrequency;
+                                fSignalAmplitude = 32767.0 / pow(10.0, m_nSignalLoudness / 20.0);
+                        }
+                        DOUBLE fNoiseAmplitude = 0;
+                        if(m_nNoiseLoudness)
+                        {
+                                fNoiseAmplitude = 32767.0 / pow(10.0, m_nNoiseLoudness / 20.0);
+                        }
                         pSourceFilter->InitializeSignal(fSignalPeriod, fSignalAmplitude, fNoiseAmplitude);
                 }