From 836fe5933e6539b93daf2ca5a11a4c0295d9a981 Mon Sep 17 00:00:00 2001
From: Jesse Engel <jesseengel@google.com>
Date: Mon, 15 Mar 2021 10:22:09 -0700
Subject: [PATCH] Enable other types of amplitude resampling besides
 `windowed`.

PiperOrigin-RevId: 362970612
---
 ddsp/synths.py  | 19 ++++++++++++++++++-
 ddsp/version.py |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ddsp/synths.py b/ddsp/synths.py
index 02c8eb50..3831533f 100644
--- a/ddsp/synths.py
+++ b/ddsp/synths.py
@@ -62,12 +62,28 @@ def __init__(self,
                sample_rate=16000,
                scale_fn=core.exp_sigmoid,
                normalize_below_nyquist=True,
+               amp_resample_method='window',
                name='harmonic'):
+    """Constructor.
+
+    Args:
+      n_samples: Fixed length of output audio.
+      sample_rate: Samples per a second.
+      scale_fn: Scale function for amplitude and harmonic distribution inputs.
+      normalize_below_nyquist: Remove harmonics above the nyquist frequency
+        and normalize the remaining harmonic distribution to sum to 1.0.
+      amp_resample_method: Mode with which to resample amplitude envelopes.
+        Must be in ['nearest', 'linear', 'cubic', 'window']. 'window' uses
+        overlapping windows (only for upsampling) which is smoother
+        for amplitude envelopes with large frame sizes.
+      name: Synth name.
+    """
     super().__init__(name=name)
     self.n_samples = n_samples
     self.sample_rate = sample_rate
     self.scale_fn = scale_fn
     self.normalize_below_nyquist = normalize_below_nyquist
+    self.amp_resample_method = amp_resample_method
 
   def get_controls(self,
                    amplitudes,
@@ -128,7 +144,8 @@ def get_signal(self, amplitudes, harmonic_distribution, f0_hz):
         amplitudes=amplitudes,
         harmonic_distribution=harmonic_distribution,
         n_samples=self.n_samples,
-        sample_rate=self.sample_rate)
+        sample_rate=self.sample_rate,
+        amp_resample_method=self.amp_resample_method)
     return signal
 
 
diff --git a/ddsp/version.py b/ddsp/version.py
index cc7afc85..2c41291d 100644
--- a/ddsp/version.py
+++ b/ddsp/version.py
@@ -19,4 +19,4 @@
 pulling in all the dependencies in __init__.py.
 """
 
-__version__ = '1.0.2'
+__version__ = '1.1.0'