From 861d6f81a3f455d6d2cce6b698507404db73d9bf Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sun, 20 Sep 2015 01:28:15 +0200
Subject: add silence-stripping fade constraints

Ensure that non-silent regions are at least
as long as the selected fade-duration.
---
 libs/ardour/ardour/audioregion.h |  2 +-
 libs/ardour/audioregion.cc       | 50 ++++++++++++++++++++++++++++++++++++----
 libs/ardour/strip_silence.cc     | 12 +++++++---
 3 files changed, 55 insertions(+), 9 deletions(-)

(limited to 'libs/ardour')

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 086544f3aa..9172021e97 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -172,7 +172,7 @@ class LIBARDOUR_API AudioRegion : public Region
 	int update_transient (framepos_t old_position, framepos_t new_position);
 	int adjust_transients (frameoffset_t delta);
 
-	AudioIntervalResult find_silence (Sample, framecnt_t, InterThreadInfo&) const;
+	AudioIntervalResult find_silence (Sample, framecnt_t, framecnt_t, InterThreadInfo&) const;
 
   private:
 	friend class RegionFactory;
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index a3535565dd..9a9459f9b9 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -1799,7 +1799,7 @@ in this and future transient-detection operations.\n\
  */
 
 AudioIntervalResult
-AudioRegion::find_silence (Sample threshold, framecnt_t min_length, InterThreadInfo& itt) const
+AudioRegion::find_silence (Sample threshold, framecnt_t min_length, framecnt_t fade_length, InterThreadInfo& itt) const
 {
 	framecnt_t const block_size = 64 * 1024;
 	boost::scoped_array<Sample> loudest (new Sample[block_size]);
@@ -1812,7 +1812,10 @@ AudioRegion::find_silence (Sample threshold, framecnt_t min_length, InterThreadI
 
 	bool in_silence = false;
 	frameoffset_t silence_start = 0;
+	frameoffset_t silence_end = 0;
 
+	framecnt_t continuous_signal = fade_length;
+	framecnt_t hold_off = 0;
 	while (pos < end && !itt.cancel) {
 
 		/* fill `loudest' with the loudest absolute sample at each instant, across all channels */
@@ -1831,23 +1834,60 @@ AudioRegion::find_silence (Sample threshold, framecnt_t min_length, InterThreadI
 			if (silence && !in_silence) {
 				/* non-silence to silence */
 				in_silence = true;
-				silence_start = pos + i;
+				/* process last queued silent part if any */
+				if (hold_off > 0) {
+					assert (hold_off < fade_length);
+					silence_end -= hold_off;
+					if (silence_end - silence_start >= min_length) {
+						silent_periods.push_back (std::make_pair (silence_start, silence_end));
+					}
+				}
+				hold_off = 0;
+
+				if (continuous_signal < fade_length) {
+					silence_start = pos + i + fade_length - continuous_signal;
+				} else {
+					silence_start = pos + i;
+				}
 			} else if (!silence && in_silence) {
 				/* silence to non-silence */
 				in_silence = false;
+				hold_off = 0;
 				if (pos + i - 1 - silence_start >= min_length) {
-					silent_periods.push_back (std::make_pair (silence_start, pos + i - 1));
+					/* queue silence */
+					silence_end = pos + i - 1;
+					hold_off = 1;
+				}
+			}
+
+			if (hold_off > 0) {
+				assert (!in_silence);
+				if (++hold_off >= fade_length) {
+					silent_periods.push_back (std::make_pair (silence_start, silence_end));
+					hold_off = 0;
 				}
 			}
+
+			if (!silence) {
+				++continuous_signal;
+			} else {
+				continuous_signal = 0;
+			}
 		}
 
 		pos += block_size;
 		itt.progress = (end-pos)/(double)_length;
 	}
 
-	if (in_silence && end - 1 - silence_start >= min_length) {
+	if (in_silence) {
 		/* last block was silent, so finish off the last period */
-		silent_periods.push_back (std::make_pair (silence_start, end));
+		assert (hold_off == 0);
+		if (continuous_signal < fade_length) {
+			silence_start += fade_length - continuous_signal;
+		}
+		if (end - 1 - silence_start >= min_length) {
+			silent_periods.push_back (std::make_pair (silence_start, end));
+		}
 	}
 
 	itt.done = true;
diff --git a/libs/ardour/strip_silence.cc b/libs/ardour/strip_silence.cc
index ff79371b96..b0109d5989 100644
--- a/libs/ardour/strip_silence.cc
+++ b/libs/ardour/strip_silence.cc
@@ -123,9 +123,15 @@ StripSilence::run (boost::shared_ptr<Region> r, Progress* progress)
 
 		framecnt_t const f = std::min (_fade_length, (i->second - i->first));
 
-		copy->set_fade_in_active (true);
-		copy->set_fade_in (FadeLinear, f);
-		copy->set_fade_out (FadeLinear, f);
+		if (f > 0) {
+			copy->set_fade_in_active (true);
+			copy->set_fade_out_active (true);
+			copy->set_fade_in (FadeLinear, f);
+			copy->set_fade_out (FadeLinear, f);
+		} else {
+			copy->set_fade_in_active (false);
+			copy->set_fade_out_active (false);
+		}
 		results.push_back (copy);
 
 		if (progress && (n <= N)) {
-- 
cgit v1.2.3