Re #802 You can now choose to use or ignore partials phase during synthesis

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/subprojects/soundeditor/trunk@5373 30fe4595-0a0c-4342-8851-515496e4dcbd

atsa/synthesis.c

@@ -142,11 +142,9 @@ void make_sine_table()
 ////////////////////////////////////////////////////////////////////
 double ioscilator(double amp, double freq, double pha, double sr, double *oscpt)
 {
-  const double incr = freq * (double)SINE_TABLE_LEN / sr; 
-
   // Phase management = 3 options (uncomment only one) :
   // 1) No phase = 0 phase.
-  const double osc = *oscpt; 
+  //const double osc = *oscpt; 
 
   // 2) Random phase.
   //static const int max_pha_shift = 300; //(SINE_TABLE_LEN / 2) / 1000;
@@ -156,8 +154,8 @@ double ioscilator(double amp, double freq, double pha, double sr, double *oscpt)
   //const double osc = fmod(*oscpt + SINE_TABLE_LEN + pha_shift, SINE_TABLE_LEN);
 
   // 3) Shipped phase (linear interpolation).
-  //const int pha_shift = (int)(pha * (double)SINE_TABLE_LEN / TWO_PI);
+  const int pha_shift = (int)(pha * (double)SINE_TABLE_LEN / TWO_PI);
-  //const double osc = fmod(*oscpt + SINE_TABLE_LEN + pha_shift, SINE_TABLE_LEN);
+  const double osc = fmod(*oscpt + SINE_TABLE_LEN + pha_shift, SINE_TABLE_LEN);
 
   double output;
   int curr_ind, next_ind;
@@ -173,6 +171,7 @@ double ioscilator(double amp, double freq, double pha, double sr, double *oscpt)
                     * (osc - curr_ind));
 
   // Update oscillator index.
+  const double incr = freq * (double)SINE_TABLE_LEN / sr; 
   *oscpt = fmod(*oscpt + incr, SINE_TABLE_LEN);
 
   return output;
@@ -262,12 +261,11 @@ double locate_frame(ATS_SOUND *ats_sound, double from_frame, double time)
 }
 */
 ////////////////////////////////////////////////////////////////////
-//Synthesizes a Buffer NOT using phase interpolation
 int synth_deterministic_only(double ampl_p, double ampl_c, double ampl_n,
                              double freq_p, double freq_c, double freq_n, 
                              double pha_p, double pha_c, double pha_n, 
                              double time_offset, double duration, double sample_rate, 
-                             double *oscpt, double* sample_buf)
+                             short use_phase, double *oscpt, double* sample_buf)
 {
   int s, frame_samps;
   double ampl, freq, pha, frame_offset;
@@ -281,7 +279,7 @@ int synth_deterministic_only(double ampl_p, double ampl_c, double ampl_n,
     frame_offset = (time_offset + s / sample_rate) / duration;
     ampl = LIN3_INTERP(frame_offset, ampl_p, ampl_c, ampl_n);
     freq = LIN3_INTERP(frame_offset, freq_p, freq_c, freq_n);
-    pha  = 0; // Temporary: LIN3_INTERP(frame_offset, pha_p,   pha_c,   pha_n);
+    pha  = (use_phase ? LIN3_INTERP(frame_offset, pha_p, pha_c, pha_n) : 0.);
     sample_buf[s] += ioscilator(ampl, freq, pha, sample_rate, oscpt);
   }
 
@@ -304,7 +302,7 @@ int synth_residual_only(double ampl_p, double ampl_c, double ampl_n,
   for(s = 0; s < frame_samps; s++) { 
     frame_offset = (time_offset + s / sample_rate) / duration;
     ampl = LIN3_INTERP(frame_offset, ampl_p, ampl_c, ampl_n);
-    pha = 0.; // Temporary. Should we use a random phase here ?
+    pha = 0.; // Shouldn't we use a random phase here ?
     sample_buf[s] += ioscilator(ampl, freq, pha, sample_rate, oscpt) * randi(rdata);  
   }
 
@@ -316,7 +314,7 @@ int synth_both(double ampl_p, double ampl_c, double ampl_n,
                double pha_p, double pha_c, double pha_n, 
                double resid_p, double resid_c, double resid_n, 
                double time_offset, double duration, double sample_rate, 
-               double *oscpt, RANDI* rdata, double* sample_buf)
+               short use_phase, double *oscpt, RANDI* rdata, double* sample_buf)
 {
   int s, frame_samps;
   double ampl, freq, pha, resid, rfreq, frame_offset;
@@ -336,7 +334,7 @@ int synth_both(double ampl_p, double ampl_c, double ampl_n,
     frame_offset = (time_offset + s / sample_rate) / duration;
     ampl  = LIN3_INTERP(frame_offset, ampl_p,  ampl_c,  ampl_n);
     freq  = LIN3_INTERP(frame_offset, freq_p,  freq_c,  freq_n);
-    pha   = 0; // Temporary: LIN3_INTERP(frame_offset, pha_p,   pha_c,   pha_n);
+    pha   = (use_phase ? LIN3_INTERP(frame_offset, pha_p, pha_c, pha_n) : 0.);
     resid = LIN3_INTERP(frame_offset, resid_p, resid_c, resid_n);
     rfreq = LIN3_INTERP(frame_offset, rfreq_p, rfreq_c, rfreq_n);
     sample_buf[s] += 
@@ -392,7 +390,7 @@ void do_synthesis(ATS_SOUND *ats_sound, SPARAMS* sparams, CURVE* timenv, int *se
   dur   = sparams->end - sparams->beg;
   todo=0;
   bframe = 0.;
-  fprintf(stdout, "do_synthesis: nbp=%d, dur=%f, dy=%f\n", nbp, dur, dy);
+  fprintf(stdout, "do_synthesis: nbp=%d, dur=%f, dy=%f, pha=%d\n", nbp, dur, dy, sparams->upha);
 
   for(p=0; p < nbp - 1; ++p){
 
@@ -514,7 +512,7 @@ void do_synthesis(ATS_SOUND *ats_sound, SPARAMS* sparams, CURVE* timenv, int *se
       if(sparams->ramp == 0.) {
           //deterministic synthesis only
           for(d = 0; d < ats_sound->partials; d++) {
-              if (selected && !selected[d])
+              if (sparams->allorsel && selected && !selected[d])
                   continue;
               ampl_p = ats_sound->amp[d][f_p] * sparams->amp;
               ampl_c = ats_sound->amp[d][f]   * sparams->amp;
@@ -527,7 +525,7 @@ void do_synthesis(ATS_SOUND *ats_sound, SPARAMS* sparams, CURVE* timenv, int *se
               pha_n = ats_sound->pha[d][f_n];
               frame_samps = synth_deterministic_only(ampl_p, ampl_c, ampl_n, freq_p, freq_c, freq_n,
                                                      pha_p, pha_c, pha_n,
-                                                     time_offset, duration, sparams->sr,
+                                                     time_offset, duration, sparams->sr, sparams->upha,
                                                      ospt+d, *out_samps + n_samps);
           }
       } else if(sparams->amp == 0.) {
@@ -547,7 +545,7 @@ void do_synthesis(ATS_SOUND *ats_sound, SPARAMS* sparams, CURVE* timenv, int *se
       } else {
           //residual and deterministic synthesis
           for(d = 0; d < ats_sound->partials; d++) {
-              if (selected && !selected[d])
+              if (sparams->allorsel && selected && !selected[d])
                   continue;
               ampl_p  = ats_sound->amp[d][f_p] * sparams->amp;
               ampl_c  = ats_sound->amp[d][f]   * sparams->amp;
@@ -566,7 +564,7 @@ void do_synthesis(ATS_SOUND *ats_sound, SPARAMS* sparams, CURVE* timenv, int *se
                   * sparams->ramp;
               frame_samps = synth_both(ampl_p, ampl_c, ampl_n, freq_p, freq_c, freq_n,
                                        pha_p, pha_c, pha_n, resid_p, resid_c, resid_n,
-                                       time_offset, duration, sparams->sr,
+                                       time_offset, duration, sparams->sr, sparams->upha,
                                        ospt+d, &rarray[p], *out_samps + n_samps);
           }
       }

qatsh/ATSSynthesis.cpp

@@ -92,7 +92,6 @@ SampledSound* ATSSynthesis::operator()(ATSSound* pATSSound, const std::vector<in
 	(pATSSound->data(), &_params, &timeEnvelop, aSelectedPartials,
 	 &adSamples[0], &nSamples);
     curve_free(&timeEnvelop);
-    if (aSelectedPartials)
 	delete [] aSelectedPartials;
 
     // Build a SampleSound from these samples (monophonic => 1 channel).

qatsh/SynthesisParamsWidget.cpp

@@ -26,8 +26,6 @@ SynthesisParamsWidget::SynthesisParamsWidget(QWidget *parent)
 SynthesisParamsWidget::~SynthesisParamsWidget()
 {
     delete _pui;
-
-    if (_pSynthesis)
 	delete _pSynthesis;
 }
 
@@ -51,6 +49,7 @@ void SynthesisParamsWidget::onRestoreDefaults()
     _pui->qsbStartTime->setValue(0.0);
     _pui->qsbDuration->setValue(_dMaxDuration);
     _pui->qrbAllPartials->setChecked(!synt.useOnlySelectedPartials());
+    _pui->qrbUsePhase->setChecked(synt.usePartialsPhase());
     _pui->qsbPartAmplFactor->setValue(synt.partialsAmplitudeFactor());
     _pui->qsbResidAmplFactor->setValue(synt.residualAmplitudeFactor());
     _pui->qsbFreqFactor->setValue(synt.frequencyFactor());
@@ -81,6 +80,7 @@ void SynthesisParamsWidget::setupSynthesis()
     _pSynthesis->setStartTime(_pui->qsbStartTime->value());
     _pSynthesis->setDuration(_pui->qsbDuration->value());
     _pSynthesis->setUseOnlySelectedPartials(!_pui->qrbAllPartials->isChecked());
+    _pSynthesis->setUsePartialsPhase(_pui->qrbUsePhase->isChecked());
     _pSynthesis->setPartialsAmplitudeFactor(_pui->qsbPartAmplFactor->value());
     _pSynthesis->setResidualAmplitudeFactor(_pui->qsbResidAmplFactor->value());
     _pSynthesis->setFrequencyFactor(_pui->qsbFreqFactor->value());

qatsh/SynthesisParamsWidget.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>302</width>
-    <height>191</height>
+    <height>230</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -101,6 +101,9 @@
        <property name="checked">
         <bool>true</bool>
        </property>
+       <attribute name="buttonGroup">
+        <string notr="true">bgPartials</string>
+       </attribute>
       </widget>
      </item>
      <item row="2" column="2">
@@ -111,16 +114,67 @@
        <property name="text">
         <string>Selection</string>
        </property>
+       <attribute name="buttonGroup">
+        <string notr="true">bgPartials</string>
+       </attribute>
       </widget>
      </item>
      <item row="3" column="0">
+      <widget class="QLabel" name="label_8">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Use partials phase</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QRadioButton" name="qrbUsePhase">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="text">
+        <string>Yes</string>
+       </property>
+       <attribute name="buttonGroup">
+        <string notr="true">bgPhase</string>
+       </attribute>
+      </widget>
+     </item>
+     <item row="3" column="2">
+      <widget class="QRadioButton" name="qrbIgnorePhase">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="text">
+        <string>No</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+       <attribute name="buttonGroup">
+        <string notr="true">bgPhase</string>
+       </attribute>
+      </widget>
+     </item>
+     <item row="4" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Partials amplitude factor</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="1" colspan="2">
+     <item row="4" column="1" colspan="2">
       <widget class="QDoubleSpinBox" name="qsbPartAmplFactor">
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -136,14 +190,14 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
+     <item row="5" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Residual amplitude factor</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="1" colspan="2">
+     <item row="5" column="1" colspan="2">
       <widget class="QDoubleSpinBox" name="qsbResidAmplFactor">
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -159,14 +213,14 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
+     <item row="6" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Frequency factor</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="1" colspan="2">
+     <item row="6" column="1" colspan="2">
       <widget class="QDoubleSpinBox" name="qsbFreqFactor">
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -185,14 +239,14 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="0">
+     <item row="7" column="0">
       <widget class="QLabel" name="label_4">
        <property name="text">
         <string>Sampling rate</string>
        </property>
       </widget>
      </item>
-     <item row="6" column="1" colspan="2">
+     <item row="7" column="1" colspan="2">
       <widget class="QDoubleSpinBox" name="qsbSamplingRate">
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -217,4 +271,8 @@
  </widget>
  <resources/>
  <connections/>
+ <buttongroups>
+  <buttongroup name="bgPartials"/>
+  <buttongroup name="bgPhase"/>
+ </buttongroups>
 </ui>

qatsh/TableAndToolsWidget.cpp

@@ -57,7 +57,6 @@ TableAndToolsWidget::TableAndToolsWidget(QWidget *parent)
 TableAndToolsWidget::~TableAndToolsWidget()
 {
     delete _pui;
-    if (_pProcessor)
 	delete _pProcessor;
 }