commit 17451d4038fda5ad6a720003554db67ee56a9b2e
parent 57dcd901c1db7e733c845b08984103218503212c
Author: [email protected] <[email protected]>
Date: Wed, 7 Sep 2016 15:00:13 +0300
New function: truncate(Expr, size)
Diffstat:
7 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/examples/sample_rate_conversion.cpp b/examples/sample_rate_conversion.cpp
@@ -29,7 +29,7 @@ int main(int argc, char** argv)
const size_t destsize = r(resampled.data(), swept_sine);
- univector<i32> i32data = clamp(resampled.slice(0, destsize) * i32max, -i32max, +i32max);
+ univector<i32> i32data = clamp(resampled.truncate(destsize) * i32max, -i32max, +i32max);
univector2d<i32> data = { i32data };
auto wr = sequential_file_writer("audio_high_quality.wav");
@@ -44,7 +44,7 @@ int main(int argc, char** argv)
const size_t destsize = r(resampled.data(), swept_sine);
- univector<i32> i32data = clamp(resampled.slice(0, destsize) * i32max, -i32max, +i32max);
+ univector<i32> i32data = clamp(resampled.truncate(destsize) * i32max, -i32max, +i32max);
univector2d<i32> data = { i32data };
auto wr = sequential_file_writer("audio_normal_quality.wav");
@@ -59,7 +59,7 @@ int main(int argc, char** argv)
const size_t destsize = r(resampled.data(), swept_sine);
- univector<i32> i32data = clamp(resampled.slice(0, destsize) * i32max, -i32max, +i32max);
+ univector<i32> i32data = clamp(resampled.truncate(destsize) * i32max, -i32max, +i32max);
univector2d<i32> data = { i32data };
auto wr = sequential_file_writer("audio_low_quality.wav");
@@ -74,7 +74,7 @@ int main(int argc, char** argv)
const size_t destsize = r(resampled.data(), swept_sine);
- univector<i32> i32data = clamp(resampled.slice(0, destsize) * i32max, -i32max, +i32max);
+ univector<i32> i32data = clamp(resampled.truncate(destsize) * i32max, -i32max, +i32max);
univector2d<i32> data = { i32data };
auto wr = sequential_file_writer("audio_draft_quality.wav");
diff --git a/include/kfr/base/basic_expressions.hpp b/include/kfr/base/basic_expressions.hpp
@@ -328,6 +328,12 @@ CMT_INLINE internal::expression_slice<E1> slice(E1&& e1, size_t start, size_t si
return internal::expression_slice<E1>(std::forward<E1>(e1), start, size);
}
+template <typename E1>
+CMT_INLINE internal::expression_slice<E1> truncate(E1&& e1, size_t size)
+{
+ return internal::expression_slice<E1>(std::forward<E1>(e1), 0, size);
+}
+
template <typename T1, typename T2, bool precise = false, typename TF = ftype<common_type<T1, T2>>>
CMT_INLINE internal::expression_linspace<TF, precise> linspace(T1 start, T2 stop, size_t size,
bool endpoint = false)
diff --git a/include/kfr/base/univector.hpp b/include/kfr/base/univector.hpp
@@ -75,6 +75,18 @@ struct univector_base : input_expression, output_expression
const size_t this_size = derived_cast<Class>(this)->size();
return array_ref<const T>(data + start, std::min(size, this_size - start));
}
+ univector<T, 0> truncate(size_t size = max_size_t)
+ {
+ T* data = derived_cast<Class>(this)->data();
+ const size_t this_size = derived_cast<Class>(this)->size();
+ return array_ref<T>(data, std::min(size, this_size));
+ }
+ univector<const T, 0> truncate(size_t size = max_size_t) const
+ {
+ const T* data = derived_cast<Class>(this)->data();
+ const size_t this_size = derived_cast<Class>(this)->size();
+ return array_ref<const T>(data, std::min(size, this_size));
+ }
array_ref<T> ref()
{
diff --git a/include/kfr/dft/conv.hpp b/include/kfr/dft/conv.hpp
@@ -55,7 +55,7 @@ KFR_INTRIN univector<T> convolve(const univector<T, Tag1>& src1, const univector
plan.execute(src2padded, src2padded, temp);
src1padded = src1padded * src2padded;
plan.execute(src1padded, src1padded, temp, true);
- return slice(real(src1padded), 0, src1.size() + src2.size() - 1) / T(size);
+ return truncate(real(src1padded), src1.size() + src2.size() - 1) / T(size);
}
}
#pragma clang diagnostic pop
diff --git a/include/kfr/dsp/oscillators.hpp b/include/kfr/dsp/oscillators.hpp
@@ -34,15 +34,15 @@ namespace kfr
template <typename T = fbase>
auto jaehne(identity<T> magn, size_t size)
{
- return slice(magn * sin(c_pi<T, 1, 2> * sqr(linspace(T(0), T(size), size, false)) / size), 0, size);
+ return truncate(magn * sin(c_pi<T, 1, 2> * sqr(linspace(T(0), T(size), size, false)) / size), size);
}
template <typename T = fbase>
auto swept(identity<T> magn, size_t size)
{
- return slice(
+ return truncate(
magn * sin(c_pi<T, 1, 4> * sqr(sqr(linspace(T(0), T(size), size, false)) / sqr(T(size))) * T(size)),
- 0, size);
+ size);
}
template <typename T = fbase>
diff --git a/include/kfr/dsp/sample_rate_conversion.hpp b/include/kfr/dsp/sample_rate_conversion.hpp
@@ -134,8 +134,8 @@ struct sample_rate_converter
}
else
{
- delay.slice(0, size_t(depth - srcsize)) = delay.slice(size_t(srcsize));
- delay.slice(size_t(depth - srcsize)) = zeros();
+ delay.truncate(size_t(depth - srcsize)) = delay.slice(size_t(srcsize));
+ delay.slice(size_t(depth - srcsize)) = zeros();
}
input_position += srcsize;
@@ -183,8 +183,8 @@ struct sample_rate_converter
}
else
{
- delay.slice(0, size_t(depth - srcsize)) = delay.slice(size_t(srcsize));
- delay.slice(size_t(depth - srcsize)) = src;
+ delay.truncate(size_t(depth - srcsize)) = delay.slice(size_t(srcsize));
+ delay.slice(size_t(depth - srcsize)) = src;
}
input_position += srcsize;
diff --git a/tests/dft_test.cpp b/tests/dft_test.cpp
@@ -47,7 +47,7 @@ TEST(fft_accuracy)
{
univector<complex<float_type>> in =
- slice(gen_random_range<float_type>(gen, -1.0, +1.0), 0, size * 2);
+ truncate(gen_random_range<float_type>(gen, -1.0, +1.0), size);
univector<complex<float_type>> out = in;
univector<complex<float_type>> refout = out;
const dft_plan<float_type> dft(size);
@@ -65,17 +65,17 @@ TEST(fft_accuracy)
if (size >= 16)
{
univector<float_type> in =
- slice(gen_random_range<float_type>(gen, -1.0, +1.0), 0, size);
+ truncate(gen_random_range<float_type>(gen, -1.0, +1.0), size);
- univector<complex<float_type>> out = slice(scalar(qnan), 0, size);
- univector<complex<float_type>> refout = slice(scalar(qnan), 0, size);
+ univector<complex<float_type>> out = truncate(scalar(qnan), size);
+ univector<complex<float_type>> refout = truncate(scalar(qnan), size);
const dft_plan_real<float_type> dft(size);
univector<u8> temp(dft.temp_size);
reference_fft(refout.data(), in.data(), size);
dft.execute(out, in, temp);
const float_type rms_diff_r =
- rms(cabs(refout.slice(0, size / 2 + 1) - out.slice(0, size / 2 + 1)));
+ rms(cabs(refout.truncate(size / 2 + 1) - out.truncate(size / 2 + 1)));
const double ops = log2size * 200;
const double epsilon = std::numeric_limits<float_type>::epsilon();
CHECK(rms_diff_r < epsilon * ops);
