From dc8479928c5aee4c6ad6fe4f59006fb604cee701 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sun, 18 Sep 2016 09:38:01 +0900 Subject: Sources: Run clang-format on everything. --- src/audio_core/time_stretch.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/audio_core/time_stretch.cpp') diff --git a/src/audio_core/time_stretch.cpp b/src/audio_core/time_stretch.cpp index ea38f40d0..f44807c84 100644 --- a/src/audio_core/time_stretch.cpp +++ b/src/audio_core/time_stretch.cpp @@ -26,8 +26,8 @@ static double ClampRatio(double ratio) { return MathUtil::Clamp(ratio, MIN_RATIO, MAX_RATIO); } -constexpr double MIN_DELAY_TIME = 0.05; // Units: seconds -constexpr double MAX_DELAY_TIME = 0.25; // Units: seconds +constexpr double MIN_DELAY_TIME = 0.05; // Units: seconds +constexpr double MAX_DELAY_TIME = 0.25; // Units: seconds constexpr size_t DROP_FRAMES_SAMPLE_DELAY = 16000; // Units: samples constexpr double SMOOTHING_FACTOR = 0.007; @@ -48,7 +48,8 @@ std::vector TimeStretcher::Process(size_t samples_in_queue) { double ratio = CalculateCurrentRatio(); ratio = CorrectForUnderAndOverflow(ratio, samples_in_queue); - impl->smoothed_ratio = (1.0 - SMOOTHING_FACTOR) * impl->smoothed_ratio + SMOOTHING_FACTOR * ratio; + impl->smoothed_ratio = + (1.0 - SMOOTHING_FACTOR) * impl->smoothed_ratio + SMOOTHING_FACTOR * ratio; impl->smoothed_ratio = ClampRatio(impl->smoothed_ratio); // SoundTouch's tempo definition the inverse of our ratio definition. @@ -100,7 +101,8 @@ double TimeStretcher::CalculateCurrentRatio() { const steady_clock::time_point now = steady_clock::now(); const std::chrono::duration duration = now - impl->frame_timer; - const double expected_time = static_cast(impl->samples_queued) / static_cast(native_sample_rate); + const double expected_time = + static_cast(impl->samples_queued) / static_cast(native_sample_rate); const double actual_time = duration.count(); double ratio; -- cgit v1.2.3 From ebdae19fd226104baec712b9da9939ff82ef3c3a Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Wed, 21 Sep 2016 00:21:23 +0900 Subject: Remove empty newlines in #include blocks. This makes clang-format useful on those. Also add a bunch of forgotten transitive includes, which otherwise prevented compilation. --- src/audio_core/time_stretch.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/audio_core/time_stretch.cpp') diff --git a/src/audio_core/time_stretch.cpp b/src/audio_core/time_stretch.cpp index f44807c84..26059f503 100644 --- a/src/audio_core/time_stretch.cpp +++ b/src/audio_core/time_stretch.cpp @@ -2,15 +2,12 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "audio_core/time_stretch.h" #include #include #include - #include - #include "audio_core/audio_core.h" -#include "audio_core/time_stretch.h" - #include "common/common_types.h" #include "common/logging/log.h" #include "common/math_util.h" -- cgit v1.2.3 From 84fbbe26297652d994d203bde543ec252c2d801a Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Tue, 20 Sep 2016 23:52:38 -0700 Subject: Use negative priorities to avoid special-casing the self-include --- src/audio_core/time_stretch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/audio_core/time_stretch.cpp') diff --git a/src/audio_core/time_stretch.cpp b/src/audio_core/time_stretch.cpp index 26059f503..53cb64655 100644 --- a/src/audio_core/time_stretch.cpp +++ b/src/audio_core/time_stretch.cpp @@ -2,12 +2,12 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "audio_core/time_stretch.h" #include #include #include #include #include "audio_core/audio_core.h" +#include "audio_core/time_stretch.h" #include "common/common_types.h" #include "common/logging/log.h" #include "common/math_util.h" -- cgit v1.2.3