commit b2e838cca2a15b74dc8ebd35bb7b79bcc053ca17 parent a5530edd3e3b62116442772ad78e9b879db7b5e8 Author: [email protected] <[email protected]> Date: Wed, 19 Dec 2018 20:09:08 +0000 Code formatting Diffstat:
72 files changed, 5918 insertions(+), 4214 deletions(-)
diff --git a/examples/sample_rate_converter.cpp b/examples/sample_rate_converter.cpp @@ -4,6 +4,7 @@ * See LICENSE.txt for details */ +#include <chrono> #include <kfr/base.hpp> #include <kfr/dsp.hpp> #include <kfr/io.hpp> @@ -59,10 +60,11 @@ int main(int argc, char** argv) // Skip the first r.get_delay() samples (FIR filter delay). Returns new input pos size_t input_pos = r.skip(r.get_delay(), input.slice()); - size_t output_pos = 0; + std::chrono::high_resolution_clock::time_point start_time = std::chrono::high_resolution_clock::now(); + size_t output_pos = 0; for (;;) { - const size_t block_size = std::min(size_t(4096), output.size() - output_pos); + const size_t block_size = std::min(size_t(16384), output.size() - output_pos); if (block_size == 0) break; @@ -71,6 +73,14 @@ int main(int argc, char** argv) output_pos += block_size; } + std::chrono::high_resolution_clock::duration time = + std::chrono::high_resolution_clock::now() - start_time; + const double duration = static_cast<double>(output.size()) / output_sr; + println("time: ", + fmt<'f', 6, 2>(std::chrono::duration_cast<std::chrono::microseconds>(time).count() / + duration * 0.001), + "ms per 1 second of audio"); + // Place buffer to the list of output channels output_channels.push_back(std::move(output)); } diff --git a/include/kfr/all.hpp b/include/kfr/all.hpp @@ -28,41 +28,41 @@ #include "io.hpp" /** @defgroup cometa Cometa -* @brief Metaprogramming -*/ + * @brief Metaprogramming + */ /** @defgroup types Types -* @brief Core types -*/ + * @brief Core types + */ /** @defgroup expressions Expressions -* @brief Expressions -*/ + * @brief Expressions + */ /** @defgroup shuffle Shuffle -* @brief Vector shuffle functions -*/ + * @brief Vector shuffle functions + */ /** @defgroup utility Utility -* @brief Utility classes and functions -*/ + * @brief Utility classes and functions + */ /** @defgroup dft DFT -* @brief Fast Fourier Transform & Direct Fourier Transform -*/ + * @brief Fast Fourier Transform & Direct Fourier Transform + */ /** @defgroup dsp DSP -* @brief Filters and other DSP-related functions -*/ + * @brief Filters and other DSP-related functions + */ /** @defgroup io IO -* @brief Input & Output -*/ + * @brief Input & Output + */ /** @defgroup math Math -* @brief Mathematical functions -*/ + * @brief Mathematical functions + */ /** @defgroup cpuid CPUID -* @brief CPU detection -*/ + * @brief CPU detection + */ diff --git a/include/kfr/base/asin_acos.hpp b/include/kfr/base/asin_acos.hpp @@ -64,4 +64,4 @@ KFR_INTRIN internal::expression_function<fn::acos, E1> acos(E1&& x) { return { fn::acos(), std::forward<E1>(x) }; } -} +} // namespace kfr diff --git a/include/kfr/base/bitwise.hpp b/include/kfr/base/bitwise.hpp @@ -133,4 +133,4 @@ CMT_INLINE common_type<T1, T2> ror(const T1& left, const T2& right) return shr(left, right) | shl(left, (static_cast<subtype<T1>>(typebits<T1>::bits) - right)); } KFR_FN(ror) -} +} // namespace kfr diff --git a/include/kfr/base/comparison.hpp b/include/kfr/base/comparison.hpp @@ -146,4 +146,4 @@ KFR_SINTRIN maskfor<common_type<T1, T2, T3>> inrange(const T1& x, const T2& min, { return x >= min && x <= max; } -} +} // namespace kfr diff --git a/include/kfr/base/compiletime.hpp b/include/kfr/base/compiletime.hpp @@ -80,5 +80,5 @@ constexpr inline T cos(T x) { return sin(x + c_pi<T, 1, 2>); } -} -} +} // namespace compiletime +} // namespace kfr diff --git a/include/kfr/base/constants.hpp b/include/kfr/base/constants.hpp @@ -294,6 +294,6 @@ constexpr subtype<T> c_log_10 = subtype<T>(2.3025850929940456840179914546844); template <typename T, int m = 1, int d = 1> constexpr subtype<T> c_sqrt_2 = subtype<T>(1.4142135623730950488016887242097 * m / d); -} +} // namespace kfr CMT_PRAGMA_MSVC(warning(pop)) diff --git a/include/kfr/base/conversion.hpp b/include/kfr/base/conversion.hpp @@ -26,6 +26,7 @@ #pragma once #include "types.hpp" +#include "univector.hpp" #include "vec.hpp" namespace kfr diff --git a/include/kfr/base/digitreverse.hpp b/include/kfr/base/digitreverse.hpp @@ -72,7 +72,7 @@ struct shuffle_index_digitreverse return digitreverse_impl<bits>(static_cast<u32>(index), csize_t<radix>()); } }; -} +} // namespace internal template <size_t radix, size_t group = 1, typename T, size_t N> CMT_INLINE vec<T, N> digitreverse(const vec<T, N>& x) @@ -104,4 +104,4 @@ constexpr inline u32 digitreverse4(u32 x) { return internal::digitreverse_impl<bits>(x, csize_t<4>()); } -} +} // namespace kfr diff --git a/include/kfr/base/expression.hpp b/include/kfr/base/expression.hpp @@ -145,10 +145,10 @@ static vec<T, N> get_fn_value(size_t index, Fn&& fn) { vec<T, N> x; for (size_t i = 0; i < N; i++) - x[i] = fn(index + i); + x[i] = fn(index + i); return x; } -} +} // namespace internal template <typename E, typename Fn> static void test_expression(const E& expr, size_t size, Fn&& fn, const char* expression = nullptr) @@ -239,7 +239,7 @@ struct expression_lambda : input_expression Fn fn; }; -} +} // namespace internal template <typename T, typename Fn> internal::expression_lambda<T, decay<Fn>> lambda(Fn&& fn) @@ -260,7 +260,7 @@ struct is_infinite_impl<T, void_t<decltype(T::size())>> : std::integral_constant<bool, T::size() == infinite_size> { }; -} +} // namespace internal template <typename T> using is_infinite = typename internal::is_infinite_impl<T>::type; @@ -402,7 +402,7 @@ struct expression_function : expression_base<arg<Args>...> protected: Fn fn; }; -} +} // namespace internal template <typename A> CMT_INLINE internal::arg<A> e(A&& a) @@ -487,7 +487,7 @@ struct input_expression_base : input_expression { vec<U, N> out; for (size_t i = 0; i < N; i++) - out[i] = static_cast<U>(input(index + i)); + out[i] = static_cast<U>(input(index + i)); return out; } }; @@ -505,6 +505,6 @@ struct output_expression_base : output_expression output(index + i, static_cast<T>(value[i])); } }; -} +} // namespace kfr CMT_PRAGMA_GNU(GCC diagnostic pop) diff --git a/include/kfr/base/generators.hpp b/include/kfr/base/generators.hpp @@ -183,8 +183,8 @@ struct generator_sin : generator<T, width, generator_sin<T, width>> CMT_INLINE void sync(T start) const noexcept { const vec<T, width* 2> cs = splitpairs(cossin(dup(start + enumerate<T, width>() * step))); - this->cos_value = low(cs); - this->value = high(cs); + this->cos_value = low(cs); + this->value = high(cs); } CMT_INLINE void next() const noexcept @@ -215,7 +215,7 @@ protected: T beta; mutable vec<T, width> cos_value; }; -} +} // namespace internal /** * @brief Returns template expression that generates values starting from the start and using the step as the @@ -282,4 +282,4 @@ KFR_SINTRIN internal::generator_sin<TF> gen_sin(T1 start, T2 step) { return internal::generator_sin<TF>(start, step); } -} +} // namespace kfr diff --git a/include/kfr/base/horizontal.hpp b/include/kfr/base/horizontal.hpp @@ -50,7 +50,7 @@ CMT_INLINE T horizontal_impl(const vec<T, N>& value, ReduceFn&& reduce) const T initial = reduce(initialvalue<T>()); return horizontal_impl(widen<next_poweroftwo(N)>(value, initial), std::forward<ReduceFn>(reduce)); } -} +} // namespace internal template <typename T, size_t N, typename ReduceFn> CMT_INLINE T horizontal(const vec<T, N>& value, ReduceFn&& reduce) @@ -116,4 +116,4 @@ CMT_INLINE T rms(const vec<T, N>& value) return internal::builtin_sqrt(hadd(value * value) / N); } KFR_FN(rms) -} +} // namespace kfr diff --git a/include/kfr/base/impl/asin_acos.hpp b/include/kfr/base/impl/asin_acos.hpp @@ -51,8 +51,8 @@ KFR_SINTRIN vec<Tout, N> acos(const vec<T, N>& x) } KFR_I_FLT_CONVERTER(asin) KFR_I_FLT_CONVERTER(acos) -} +} // namespace intrinsics KFR_I_FN(asin) KFR_I_FN(acos) -} +} // namespace kfr diff --git a/include/kfr/base/impl/atan.hpp b/include/kfr/base/impl/atan.hpp @@ -107,7 +107,7 @@ KFR_SINTRIN vec<f64, N> atan2k(const vec<f64, N>& yy, const vec<f64, N>& xx) template <size_t N> KFR_SINTRIN vec<f32, N> atan2(const vec<f32, N>& y, const vec<f32, N>& x) { - vec<f32, N> r = atan2k(abs(y), x); + vec<f32, N> r = atan2k(abs(y), x); constexpr f32 pi = 3.1415926535897932384626433832795f; constexpr f32 pi_over_2 = 1.5707963267948966192313216916398f; constexpr f32 pi_over_4 = 0.78539816339744830961566084581988f; @@ -122,7 +122,7 @@ KFR_SINTRIN vec<f32, N> atan2(const vec<f32, N>& y, const vec<f32, N>& x) template <size_t N> KFR_SINTRIN vec<f64, N> atan2(const vec<f64, N>& y, const vec<f64, N>& x) { - vec<f64, N> r = atan2k(abs(y), x); + vec<f64, N> r = atan2k(abs(y), x); constexpr f64 pi = 3.1415926535897932384626433832795; constexpr f64 pi_over_2 = 1.5707963267948966192313216916398; constexpr f64 pi_over_4 = 0.78539816339744830961566084581988; @@ -139,22 +139,22 @@ KFR_SINTRIN vec<f32, N> atan(const vec<f32, N>& x) { vec<f32, N> t, u; vec<i32, N> q; - q = select(x < 0.f, 2, 0); + q = select(x < 0.f, 2, 0); vec<f32, N> s = select(x < 0.f, -x, x); - q = select(s > 1.f, q | 1, q); - s = select(s > 1.f, 1.0f / s, s); - t = s * s; - u = 0.00282363896258175373077393f; - u = fmadd(u, t, -0.0159569028764963150024414f); - u = fmadd(u, t, 0.0425049886107444763183594f); - u = fmadd(u, t, -0.0748900920152664184570312f); - u = fmadd(u, t, 0.106347933411598205566406f); - u = fmadd(u, t, -0.142027363181114196777344f); - u = fmadd(u, t, 0.199926957488059997558594f); - u = fmadd(u, t, -0.333331018686294555664062f); - t = s + s * (t * u); - t = select((q & 1) != 0, 1.570796326794896557998982f - t, t); - t = select((q & 2) != 0, -t, t); + q = select(s > 1.f, q | 1, q); + s = select(s > 1.f, 1.0f / s, s); + t = s * s; + u = 0.00282363896258175373077393f; + u = fmadd(u, t, -0.0159569028764963150024414f); + u = fmadd(u, t, 0.0425049886107444763183594f); + u = fmadd(u, t, -0.0748900920152664184570312f); + u = fmadd(u, t, 0.106347933411598205566406f); + u = fmadd(u, t, -0.142027363181114196777344f); + u = fmadd(u, t, 0.199926957488059997558594f); + u = fmadd(u, t, -0.333331018686294555664062f); + t = s + s * (t * u); + t = select((q & 1) != 0, 1.570796326794896557998982f - t, t); + t = select((q & 2) != 0, -t, t); return t; } @@ -163,33 +163,33 @@ KFR_SINTRIN vec<f64, N> atan(const vec<f64, N>& x) { vec<f64, N> t, u; vec<i64, N> q; - q = select(x < 0.0, i64(2), i64(0)); + q = select(x < 0.0, i64(2), i64(0)); vec<f64, N> s = select(x < 0.0, -x, x); - q = select(s > 1.0, q | 1, q); - s = select(s > 1.0, 1.0 / s, s); - t = s * s; - u = -1.88796008463073496563746e-05; - u = fmadd(u, t, 0.000209850076645816976906797); - u = fmadd(u, t, -0.00110611831486672482563471); - u = fmadd(u, t, 0.00370026744188713119232403); - u = fmadd(u, t, -0.00889896195887655491740809); - u = fmadd(u, t, 0.016599329773529201970117); - u = fmadd(u, t, -0.0254517624932312641616861); - u = fmadd(u, t, 0.0337852580001353069993897); - u = fmadd(u, t, -0.0407629191276836500001934); - u = fmadd(u, t, 0.0466667150077840625632675); - u = fmadd(u, t, -0.0523674852303482457616113); - u = fmadd(u, t, 0.0587666392926673580854313); - u = fmadd(u, t, -0.0666573579361080525984562); - u = fmadd(u, t, 0.0769219538311769618355029); - u = fmadd(u, t, -0.090908995008245008229153); - u = fmadd(u, t, 0.111111105648261418443745); - u = fmadd(u, t, -0.14285714266771329383765); - u = fmadd(u, t, 0.199999999996591265594148); - u = fmadd(u, t, -0.333333333333311110369124); - t = s + s * (t * u); - t = select((q & 1) != 0, 1.570796326794896557998982 - t, t); - t = select((q & 2) != 0, -t, t); + q = select(s > 1.0, q | 1, q); + s = select(s > 1.0, 1.0 / s, s); + t = s * s; + u = -1.88796008463073496563746e-05; + u = fmadd(u, t, 0.000209850076645816976906797); + u = fmadd(u, t, -0.00110611831486672482563471); + u = fmadd(u, t, 0.00370026744188713119232403); + u = fmadd(u, t, -0.00889896195887655491740809); + u = fmadd(u, t, 0.016599329773529201970117); + u = fmadd(u, t, -0.0254517624932312641616861); + u = fmadd(u, t, 0.0337852580001353069993897); + u = fmadd(u, t, -0.0407629191276836500001934); + u = fmadd(u, t, 0.0466667150077840625632675); + u = fmadd(u, t, -0.0523674852303482457616113); + u = fmadd(u, t, 0.0587666392926673580854313); + u = fmadd(u, t, -0.0666573579361080525984562); + u = fmadd(u, t, 0.0769219538311769618355029); + u = fmadd(u, t, -0.090908995008245008229153); + u = fmadd(u, t, 0.111111105648261418443745); + u = fmadd(u, t, -0.14285714266771329383765); + u = fmadd(u, t, 0.199999999996591265594148); + u = fmadd(u, t, -0.333333333333311110369124); + t = s + s * (t * u); + t = select((q & 1) != 0, 1.570796326794896557998982 - t, t); + t = select((q & 2) != 0, -t, t); return t; } @@ -221,9 +221,9 @@ KFR_I_FLT_CONVERTER(atan) KFR_I_FLT_CONVERTER(atan2) KFR_I_FLT_CONVERTER(atandeg) KFR_I_FLT_CONVERTER(atan2deg) -} +} // namespace intrinsics KFR_I_FN(atan) KFR_I_FN(atandeg) KFR_I_FN(atan2) KFR_I_FN(atan2deg) -} +} // namespace kfr diff --git a/include/kfr/base/impl/clamp.hpp b/include/kfr/base/impl/clamp.hpp @@ -50,7 +50,7 @@ KFR_SINTRIN vec<T, N> clamp(const vec<T, N>& x, const vec<T, N>& hi) { return max(min(x, hi), zerovector<T, N>()); } -} +} // namespace intrinsics KFR_I_FN(clamp) -} +} // namespace kfr diff --git a/include/kfr/base/impl/hyperbolic.hpp b/include/kfr/base/impl/hyperbolic.hpp @@ -89,7 +89,7 @@ KFR_I_FLT_CONVERTER(tanh) KFR_I_FLT_CONVERTER(coth) KFR_I_FLT_CONVERTER(sinhcosh) KFR_I_FLT_CONVERTER(coshsinh) -} +} // namespace intrinsics KFR_I_FN(sinh) KFR_I_FN(cosh) KFR_I_FN(tanh) @@ -97,4 +97,4 @@ KFR_I_FN(coth) KFR_I_FN(sinhcosh) KFR_I_FN(coshsinh) -} +} // namespace kfr diff --git a/include/kfr/base/impl/log_exp.hpp b/include/kfr/base/impl/log_exp.hpp @@ -46,7 +46,7 @@ KFR_SINTRIN vec<i32, N> vilogbp1(const vec<f32, N>& d) { mask<i32, N> m = d < 5.421010862427522E-20f; vec<i32, N> q = (ibitcast(select(m, 1.8446744073709552E19f * d, d)) >> 23) & 0xff; - q = select(m, q - (64 + 0x7e), q - 0x7e); + q = select(m, q - (64 + 0x7e), q - 0x7e); return q; } @@ -55,29 +55,29 @@ KFR_SINTRIN vec<i64, N> vilogbp1(const vec<f64, N>& d) { mask<i64, N> m = d < 4.9090934652977266E-91; vec<i64, N> q = (ibitcast(select(m, 2.037035976334486E90 * d, d)) >> 52) & 0x7ff; - q = select(m, q - (300 + 0x03fe), q - 0x03fe); + q = select(m, q - (300 + 0x03fe), q - 0x03fe); return q; } template <size_t N> KFR_SINTRIN vec<f32, N> vldexpk(const vec<f32, N>& x, const vec<i32, N>& q) { - vec<i32, N> m = q >> 31; - m = (((m + q) >> 6) - m) << 4; + vec<i32, N> m = q >> 31; + m = (((m + q) >> 6) - m) << 4; const vec<i32, N> qq = q - (m << 2); - m = clamp(m + 0x7f, vec<i32, N>(0xff)); - vec<f32, N> u = pow4(bitcast<f32>(cast<i32>(m) << 23)); + m = clamp(m + 0x7f, vec<i32, N>(0xff)); + vec<f32, N> u = pow4(bitcast<f32>(cast<i32>(m) << 23)); return x * u * bitcast<f32>((cast<i32>(qq + 0x7f)) << 23); } template <size_t N> KFR_SINTRIN vec<f64, N> vldexpk(const vec<f64, N>& x, const vec<i64, N>& q) { - vec<i64, N> m = q >> 31; - m = (((m + q) >> 9) - m) << 7; + vec<i64, N> m = q >> 31; + m = (((m + q) >> 9) - m) << 7; const vec<i64, N> qq = q - (m << 2); - m = clamp(m + 0x3ff, i64(0x7ff)); - vec<f64, N> u = pow4(bitcast<f64>(cast<i64>(m) << 52)); + m = clamp(m + 0x3ff, i64(0x7ff)); + vec<f64, N> u = pow4(bitcast<f64>(cast<i64>(m) << 52)); return x * u * bitcast<f64>((cast<i64>(qq + 0x3ff)) << 52); } @@ -99,10 +99,10 @@ KFR_SINTRIN vec<f32, N> log(const vec<f32, N>& d) vec<f32, N> sp = select(d < 0, constants<f32>::qnan, constants<f32>::neginfinity); vec<f32, N> t = 0.2371599674224853515625f; - t = fmadd(t, x2, 0.285279005765914916992188f); - t = fmadd(t, x2, 0.400005519390106201171875f); - t = fmadd(t, x2, 0.666666567325592041015625f); - t = fmadd(t, x2, 2.0f); + t = fmadd(t, x2, 0.285279005765914916992188f); + t = fmadd(t, x2, 0.400005519390106201171875f); + t = fmadd(t, x2, 0.666666567325592041015625f); + t = fmadd(t, x2, 2.0f); x = x * t + c_log_2<f32> * cast<f32>(e); x = select(d > 0, x, sp); @@ -122,13 +122,13 @@ KFR_SINTRIN vec<f64, N> log(const vec<f64, N>& d) vec<f64, N> sp = select(d < 0, constants<f64>::qnan, constants<f64>::neginfinity); vec<f64, N> t = 0.148197055177935105296783; - t = fmadd(t, x2, 0.153108178020442575739679); - t = fmadd(t, x2, 0.181837339521549679055568); - t = fmadd(t, x2, 0.22222194152736701733275); - t = fmadd(t, x2, 0.285714288030134544449368); - t = fmadd(t, x2, 0.399999999989941956712869); - t = fmadd(t, x2, 0.666666666666685503450651); - t = fmadd(t, x2, 2); + t = fmadd(t, x2, 0.153108178020442575739679); + t = fmadd(t, x2, 0.181837339521549679055568); + t = fmadd(t, x2, 0.22222194152736701733275); + t = fmadd(t, x2, 0.285714288030134544449368); + t = fmadd(t, x2, 0.399999999989941956712869); + t = fmadd(t, x2, 0.666666666666685503450651); + t = fmadd(t, x2, 2); x = x * t + constants<f64>::log_2 * cast<f64>(e); x = select(d > 0, x, sp); @@ -239,8 +239,9 @@ KFR_SINTRIN vec<T, N> pow(const vec<T, N>& a, const vec<T, N>& b) const vec<T, N> t = exp(b * log(abs(a))); const mask<T, N> isint = floor(b) == b; const mask<T, N> iseven = (cast<itype<T>>(b) & 1) == 0; - return select(a > T(), t, select(a == T(), T(), - select(isint, select(iseven, t, -t), broadcast<N>(constants<T>::qnan)))); + return select( + a > T(), t, + select(a == T(), T(), select(isint, select(iseven, t, -t), broadcast<N>(constants<T>::qnan)))); } template <typename T, size_t N> @@ -295,7 +296,7 @@ KFR_SINTRIN flt_type<common_type<T1, T2, T3>> log_fmadd(const T1& x, const T2& m { return fmadd(log(x), m, a); } -} +} // namespace intrinsics KFR_I_FN(exp) KFR_I_FN(exp2) KFR_I_FN(exp10) @@ -311,4 +312,4 @@ KFR_I_FN(pow) KFR_I_FN(root) KFR_I_FN(cbrt) -} +} // namespace kfr diff --git a/include/kfr/base/impl/sqrt.hpp b/include/kfr/base/impl/sqrt.hpp @@ -65,7 +65,7 @@ KFR_SINTRIN vec<Tout, N> sqrt(const vec<T, N>& x) } #endif KFR_I_FLT_CONVERTER(sqrt) -} +} // namespace intrinsics KFR_I_FN(sqrt) -} +} // namespace kfr diff --git a/include/kfr/base/log_exp.hpp b/include/kfr/base/log_exp.hpp @@ -121,7 +121,8 @@ KFR_FUNC flt_type<T1> logb(const T1& x) return intrinsics::logb(x); } -/// @brief Returns the rounded binary (base-2) logarithm of the x. Version that accepts and returns expressions. +/// @brief Returns the rounded binary (base-2) logarithm of the x. Version that accepts and returns +/// expressions. template <typename E1, KFR_ENABLE_IF(is_input_expression<E1>::value)> KFR_FUNC internal::expression_function<fn::logb, E1> logb(E1&& x) { diff --git a/include/kfr/base/memory.hpp b/include/kfr/base/memory.hpp @@ -102,7 +102,7 @@ inline void aligned_free(void* ptr) } inline void aligned_release(void* ptr) { aligned_free(ptr); } -} +} // namespace internal /// @brief Allocates aligned memory template <typename T = void, size_t alignment = platform<>::native_cache_alignment> @@ -128,7 +128,7 @@ struct aligned_deleter { CMT_INLINE void operator()(T* ptr) const { aligned_deallocate(ptr); } }; -} +} // namespace internal template <typename T> struct autofree @@ -220,7 +220,7 @@ struct aligned_new }; #define KFR_CLASS_REFCOUNT(cl) \ - \ + \ public: \ void addref() const { m_refcount++; } \ void release() const \ @@ -230,7 +230,7 @@ public: delete this; \ } \ } \ - \ + \ private: \ mutable std::atomic_uintptr_t m_refcount = ATOMIC_VAR_INIT(0); -} +} // namespace kfr diff --git a/include/kfr/base/operators.hpp b/include/kfr/base/operators.hpp @@ -355,7 +355,7 @@ constexpr CMT_INLINE common_type<T1, T2, T3, Ts...> horner_odd(const T1& x, cons const T1 x2 = x * x; return fmadd(horner(x2, c3, values...), x2, c1) * x; } -} +} // namespace internal /// @brief Calculate polynomial using Horner's method /// @@ -549,4 +549,4 @@ vec<vec<T, sizeof...(Ns) + 1>, N1> packtranspose(const vec<T, N1>& x, const vec< } KFR_FN(packtranspose) -} +} // namespace kfr diff --git a/include/kfr/base/platform.hpp b/include/kfr/base/platform.hpp @@ -89,7 +89,8 @@ constexpr auto cpu_all = cfilter(internal::cpu_list, internal::cpu_list >= cpuva CMT_UNUSED static const char* cpu_name(cpu_t set) { #ifdef CMT_ARCH_X86 - static const char* names[] = { "common", "sse2", "sse3", "ssse3", "sse41", "sse42", "avx1", "avx2", "avx512" }; + static const char* names[] = { "common", "sse2", "sse3", "ssse3", "sse41", + "sse42", "avx1", "avx2", "avx512" }; #endif #ifdef CMT_ARCH_ARM static const char* names[] = { "common", "neon", "neon64" }; @@ -132,7 +133,7 @@ struct platform constexpr static size_t maximum_vector_alignment_mask = maximum_vector_alignment - 1; #ifdef CMT_ARCH_X86 constexpr static size_t simd_register_count = - c >= cpu_t::avx512 ? bitness_const(8, 32) : bitness_const(8, 16); + c >= cpu_t::avx512 ? bitness_const(8, 32) : bitness_const(8, 16); #endif #ifdef CMT_ARCH_ARM constexpr static size_t simd_register_count = 16; @@ -143,20 +144,14 @@ struct platform #ifdef CMT_ARCH_X86 constexpr static size_t native_float_vector_size = - c >= cpu_t::avx512 ? 64 : - c >= cpu_t::avx1 ? 32 : - c >= cpu_t::sse2 ? 16 : - common_float_vector_size; + c >= cpu_t::avx512 ? 64 : c >= cpu_t::avx1 ? 32 : c >= cpu_t::sse2 ? 16 : common_float_vector_size; #endif #ifdef CMT_ARCH_ARM constexpr static size_t native_float_vector_size = c == cpu_t::neon ? 16 : common_float_vector_size; #endif #ifdef CMT_ARCH_X86 constexpr static size_t native_int_vector_size = - c >= cpu_t::avx512 ? 64 : - c >= cpu_t::avx2 ? 32 : - c >= cpu_t::sse2 ? 16 : - common_int_vector_size; + c >= cpu_t::avx512 ? 64 : c >= cpu_t::avx2 ? 32 : c >= cpu_t::sse2 ? 16 : common_int_vector_size; #endif #ifdef CMT_ARCH_ARM constexpr static size_t native_int_vector_size = c == cpu_t::neon ? 16 : common_int_vector_size; diff --git a/include/kfr/base/pointer.hpp b/include/kfr/base/pointer.hpp @@ -43,7 +43,6 @@ namespace internal template <typename Expression, typename T, size_t key = 0> KFR_SINTRIN bool invoke_substitute(Expression& expr, expression_pointer<T>&& new_pointer, csize_t<key> = csize_t<key>{}); - } template <typename T, size_t N = maximum_expression_width> @@ -243,7 +242,6 @@ namespace internal template <typename... Args, typename T, size_t key, size_t... indices> KFR_SINTRIN bool substitute(internal::expression_base<Args...>& expr, expression_pointer<T>&& new_pointer, csize_t<key>, csizes_t<indices...>); - } template <typename T, size_t key = 0> @@ -258,8 +256,7 @@ template <typename... Args, typename T, size_t key = 0> KFR_SINTRIN bool substitute(internal::expression_base<Args...>& expr, expression_pointer<T>&& new_pointer, csize_t<key> = csize_t<key>{}) { - return internal::substitute(expr, std::move(new_pointer), csize_t<key>{}, - indicesfor_t<Args...>{}); + return internal::substitute(expr, std::move(new_pointer), csize_t<key>{}, indicesfor_t<Args...>{}); } template <typename T, size_t key = 0> diff --git a/include/kfr/base/reduce.hpp b/include/kfr/base/reduce.hpp @@ -27,9 +27,9 @@ #include "basic_expressions.hpp" #include "function.hpp" +#include "horizontal.hpp" #include "min_max.hpp" #include "operators.hpp" -#include "horizontal.hpp" #include "vec.hpp" namespace kfr @@ -107,7 +107,7 @@ protected: FinalFn finalfn; mutable vec<T, width> value; }; -} +} // namespace internal template <typename ReduceFn, typename TransformFn = fn::pass_through, typename FinalFn = fn::pass_through, typename E1, typename T = value_type_of<E1>> @@ -212,8 +212,7 @@ KFR_SINTRIN T absmaxof(const E1& x) * \f] */ template <typename E1, typename E2, - typename T = value_type_of<decltype(std::declval<E1>()* - std::declval<E2>())>, + typename T = value_type_of<decltype(std::declval<E1>() * std::declval<E2>())>, KFR_ENABLE_IF(is_input_expressions<E1, E2>::value)> KFR_SINTRIN T dotproduct(E1&& x, E2&& y) { @@ -267,4 +266,4 @@ KFR_SINTRIN T product(const E1& x) static_assert(!is_infinite<E1>::value, "e1 must be a sized expression (use slice())"); return reduce(x, fn::mul()); } -} +} // namespace kfr diff --git a/include/kfr/base/shuffle.hpp b/include/kfr/base/shuffle.hpp @@ -44,7 +44,7 @@ CMT_GNU_CONSTEXPR CMT_INLINE vec<T, Nout> broadcast_helper(csizes_t<indices...>, const std::tuple<Ts...> tup(values...); return vec<T, Nout>(std::get<indices % Nin>(tup)...); } -} +} // namespace internal template <size_t Nout, typename... Ts, typename C = typename std::common_type<Ts...>::type> CMT_GNU_CONSTEXPR CMT_INLINE vec<C, Nout> broadcast(const Ts&... values) @@ -205,7 +205,7 @@ struct shuffle_index_dup { constexpr inline size_t operator()(size_t index) const { return start + index / groupsize * groupsize; } }; -} +} // namespace internal template <typename T, size_t N> CMT_INLINE vec<T, N> dupeven(const vec<T, N>& x) @@ -243,7 +243,7 @@ struct shuffle_index_shuffle return csizes_t<Indices...>::get(csize_t<index % indexcount>()) + index / indexcount * indexcount; } }; -} +} // namespace internal template <size_t... Indices, typename T, size_t N, size_t count = sizeof...(Indices)> CMT_INLINE vec<T, N> shuffle(const vec<T, N>& x, const vec<T, N>& y, @@ -276,7 +276,7 @@ struct shuffle_index_permute return csizes_t<Indices...>::get(csize_t<index % indexcount>()) + index / indexcount * indexcount; } }; -} +} // namespace internal template <size_t... Indices, typename T, size_t N, size_t count = sizeof...(Indices)> CMT_INLINE vec<T, N> permute(const vec<T, N>& x, elements_t<Indices...> i = elements_t<Indices...>()) @@ -302,7 +302,7 @@ constexpr CMT_INLINE vec<T, Nout> generate_vector(csizes_t<Indices...>) { return make_vector(static_cast<T>(Fn()(Indices))...); } -} +} // namespace internal template <typename T, size_t Nout, typename Fn> constexpr CMT_INLINE vec<T, Nout> generate_vector() @@ -323,7 +323,7 @@ constexpr CMT_INLINE mask<T, N> oddmask() { return broadcast<N, T>(maskbits<T>(false), maskbits<T>(true)); } -} +} // namespace internal template <typename T, size_t N, size_t Nout = N * 2> CMT_INLINE vec<T, Nout> dup(const vec<T, N>& x) @@ -339,7 +339,7 @@ struct shuffle_index_duphalf { constexpr inline size_t operator()(size_t index) const { return start + (index) % count; } }; -} +} // namespace internal template <typename T, size_t N> CMT_INLINE vec<T, N> duplow(const vec<T, N>& x) @@ -368,7 +368,7 @@ struct shuffle_index_blend return (elements_t<Indices...>::get(csize_t<index % indexcount>()) ? size : 0) + index % size; } }; -} +} // namespace internal template <size_t... Indices, typename T, size_t N> CMT_INLINE vec<T, N> blend(const vec<T, N>& x, const vec<T, N>& y, @@ -397,7 +397,7 @@ struct shuffle_index_outputright return index < N - amount ? index : index + amount; } }; -} +} // namespace internal template <size_t elements = 2, typename T, size_t N> CMT_INLINE vec<T, N> swap(const vec<T, N>& x) @@ -459,7 +459,7 @@ struct shuffle_index_transpose return index % (size / side1) * side1 + index / (size / side1); } }; -} +} // namespace internal template <size_t side1, size_t group = 1, typename T, size_t N, size_t size = N / group, size_t side2 = size / side1, KFR_ENABLE_IF(size > 3)> @@ -548,7 +548,7 @@ struct shuffle_index_reverse { constexpr inline size_t operator()(size_t index) const { return size - 1 - index; } }; -} +} // namespace internal template <size_t group = 1, typename T, size_t N, size_t size = N / group> CMT_INLINE vec<T, N> reverse(const vec<T, N>& x) @@ -569,7 +569,7 @@ struct shuffle_index_combine { constexpr inline size_t operator()(size_t index) const { return index >= N2 ? index : N1 + index; } }; -} +} // namespace internal template <typename T, size_t N1, size_t N2> CMT_INLINE vec<T, N1> combine(const vec<T, N1>& x, const vec<T, N2>& y) @@ -595,7 +595,7 @@ struct generate_onoff return index >= start && index < start + size ? on : off; } }; -} +} // namespace internal template <typename T, size_t N, size_t start = 0, size_t stride = 1> constexpr CMT_INLINE vec<T, N> enumerate() @@ -620,6 +620,6 @@ constexpr CMT_INLINE vec<T, N> onoff(vec_t<T, N>, cint_t<on> = cint_t<on>(), cin return generate_vector<T, N, internal::generate_onoff<start, size, on, off>>(); } KFR_FN(onoff) -} +} // namespace kfr #define KFR_SHUFFLE_SPECIALIZATIONS 1 #include "specializations.i" diff --git a/include/kfr/base/simd_clang.hpp b/include/kfr/base/simd_clang.hpp @@ -93,7 +93,7 @@ CMT_INLINE void simd_write(T* dest, const simd_type<T, N>& value) simd_write<A, first>(dest, simd_shuffle(value, csizeseq_t<first>())); simd_write<false, rest>(dest + first, simd_shuffle(value, csizeseq_t<rest, first>())); } -} +} // namespace internal template <typename T, size_t N> struct alignas(alignof(internal::simd_type<T, N>)) vec : public vec_t<T, N> @@ -207,13 +207,13 @@ struct alignas(alignof(internal::simd_type<T, N>)) vec : public vec_t<T, N> constexpr friend vec& operator++(vec& x) noexcept { return x = x + vec(1); } constexpr friend vec& operator--(vec& x) noexcept { return x = x - vec(1); } - constexpr friend vec operator++(vec& x, int)noexcept + constexpr friend vec operator++(vec& x, int) noexcept { const vec z = x; ++x; return z; } - constexpr friend vec operator--(vec& x, int)noexcept + constexpr friend vec operator--(vec& x, int) noexcept { const vec z = x; --x; @@ -234,7 +234,7 @@ struct alignas(alignof(internal::simd_type<T, N>)) vec : public vec_t<T, N> // element access struct element; - constexpr value_type operator[](size_t index) const & noexcept { return get(index); } + constexpr value_type operator[](size_t index) const& noexcept { return get(index); } constexpr value_type operator[](size_t index) && noexcept { return get(index); } constexpr element operator[](size_t index) & noexcept { return { *this, index }; } @@ -334,13 +334,13 @@ CMT_INLINE vec<T, csum<size_t, N1, N2, Sizes...>()> concat_impl(const vec<T, N1> { return concat_impl(concat_impl(x, y), args...); } -} +} // namespace internal template <typename T, size_t... Ns> constexpr inline vec<T, csum<size_t, Ns...>()> concat(const vec<T, Ns>&... vs) noexcept { return internal::concat_impl(vs...); } -} +} // namespace kfr CMT_PRAGMA_MSVC(warning(pop)) diff --git a/include/kfr/base/small_buffer.hpp b/include/kfr/base/small_buffer.hpp @@ -113,4 +113,4 @@ protected: std::size_t m_size; T* m_data; }; -} +} // namespace kfr diff --git a/include/kfr/base/sort.hpp b/include/kfr/base/sort.hpp @@ -43,9 +43,9 @@ template <typename T, size_t N> CMT_INLINE vec<T, N> sort(const vec<T, N>& x) { constexpr size_t Nhalf = N / 2; - vec<T, Nhalf> e = low(x); - vec<T, Nhalf> o = high(x); - constexpr auto blend0 = cconcat(csizes_t<1>(), csizeseq_t<Nhalf - 1, 0, 0>()); + vec<T, Nhalf> e = low(x); + vec<T, Nhalf> o = high(x); + constexpr auto blend0 = cconcat(csizes_t<1>(), csizeseq_t<Nhalf - 1, 0, 0>()); for (size_t i = 0; i < Nhalf; i++) { vec<T, Nhalf> t; @@ -76,9 +76,9 @@ template <typename T, size_t N> CMT_INLINE vec<T, N> sortdesc(const vec<T, N>& x) { constexpr size_t Nhalf = N / 2; - vec<T, Nhalf> e = low(x); - vec<T, Nhalf> o = high(x); - constexpr auto blend0 = cconcat(csizes_t<1>(), csizeseq_t<Nhalf - 1, 0, 0>()); + vec<T, Nhalf> e = low(x); + vec<T, Nhalf> o = high(x); + constexpr auto blend0 = cconcat(csizes_t<1>(), csizeseq_t<Nhalf - 1, 0, 0>()); for (size_t i = 0; i < Nhalf; i++) { vec<T, Nhalf> t; @@ -96,4 +96,4 @@ CMT_INLINE vec<T, N> sortdesc(const vec<T, N>& x) } return interleavehalfs(concat(e, o)); } -} +} // namespace kfr diff --git a/include/kfr/base/sqrt.hpp b/include/kfr/base/sqrt.hpp @@ -47,4 +47,4 @@ KFR_INTRIN internal::expression_function<fn::sqrt, E1> sqrt(E1&& x) { return { fn::sqrt(), std::forward<E1>(x) }; } -} +} // namespace kfr diff --git a/include/kfr/cometa.hpp b/include/kfr/cometa.hpp @@ -6,10 +6,10 @@ #include "cident.h" #include <cstdint> +#include <cstdlib> #include <limits> #include <type_traits> #include <utility> -#include <cstdlib> CMT_PRAGMA_GNU(GCC diagnostic push) CMT_PRAGMA_GNU(GCC diagnostic ignored "-Wshadow") diff --git a/include/kfr/cometa/cstring.hpp b/include/kfr/cometa/cstring.hpp @@ -16,7 +16,7 @@ namespace cometa namespace details { constexpr inline size_t strlen(const char* str) { return *str ? 1 + cometa::details::strlen(str + 1) : 0; } -} +} // namespace details template <size_t N> struct cstring @@ -66,6 +66,7 @@ struct cstring return true; } constexpr char operator[](size_t index) const noexcept { return value[index]; } + private: template <size_t... indices> constexpr cstring<sizeof...(indices) + 1> slice_impl(csizes_t<indices...>) const @@ -108,7 +109,7 @@ CMT_INTRIN cstring<N1 - Nfrom + Nto> str_replace_impl(size_t pos, const cstring< : (indices < pos + Nto - 1) ? to[indices - pos] : str[indices - Nto + Nfrom])..., 0 } }; } -} +} // namespace details CMT_INTRIN constexpr cstring<1> concat_cstring() { return { { 0 } }; } @@ -160,6 +161,6 @@ CMT_INTRIN cstring<N1 - Nfrom + Nto> str_replace(const cstring<N1>& str, const c return details::str_replace_impl(str_find(str, from), str, from, to, cvalseq_t<size_t, N1 - Nfrom + Nto - 1>()); } -} +} // namespace cometa CMT_PRAGMA_MSVC(warning(pop)) diff --git a/include/kfr/cometa/ctti.hpp b/include/kfr/cometa/ctti.hpp @@ -40,7 +40,7 @@ constexpr cstring<Nout> gettypename_impl(const char* str, csizes_t<indices...>) { return cstring<Nout>{ { (str[indices])..., 0 } }; } -} +} // namespace details template <typename T> constexpr auto ctype_name() noexcept @@ -97,4 +97,4 @@ constexpr inline type_id_t ctypeid(T x) (void)x; return details::typeident_impl<T>(); } -} +} // namespace cometa diff --git a/include/kfr/cometa/function.hpp b/include/kfr/cometa/function.hpp @@ -56,7 +56,7 @@ template <> constexpr CMT_INTRIN void return_val<void>() noexcept { } -} +} // namespace details template <typename> struct function; @@ -125,6 +125,7 @@ struct function<Result(Args...)> CMT_INTRIN explicit operator bool() const noexcept { return !!fn; } CMT_INTRIN ~function() { delete fn; } + private: details::virtual_function<Result, Args...>* fn; }; @@ -151,4 +152,4 @@ inline function<Ret(Args...)> cdispatch(cvals_t<T, v0, values...>, identity<T> v std::forward<DefFn>(deffn)); } } -} +} // namespace cometa diff --git a/include/kfr/cometa/named_arg.hpp b/include/kfr/cometa/named_arg.hpp @@ -30,6 +30,6 @@ struct named }; inline named operator""_arg(const char* name, size_t) { return name; } -} +} // namespace cometa CMT_PRAGMA_MSVC(warning(pop)) diff --git a/include/kfr/cometa/range.hpp b/include/kfr/cometa/range.hpp @@ -66,4 +66,4 @@ range<T> make_range(T begin, T end, diff_type step) { return range<T>(begin, end, step); } -} +} // namespace cometa diff --git a/include/kfr/cometa/result.hpp b/include/kfr/cometa/result.hpp @@ -43,8 +43,9 @@ struct result constexpr reference value() { return m_value; } constexpr ErrEnum error() const { return m_error; } constexpr bool ok() const { return m_error == OkValue; } + private: Type m_value; ErrEnum m_error; }; -} +} // namespace cometa diff --git a/include/kfr/cometa/string.hpp b/include/kfr/cometa/string.hpp @@ -240,7 +240,7 @@ CMT_INLINE auto build_fmt(const std::string& str, ctypes_t<Arg, Args...>) constexpr auto fmt = value_fmt(ctype_t<decay<Arg>>()); return build_fmt(replace_one(str, "{}", std::string(fmt.data())), ctypes_t<Args...>()); } -} +} // namespace details template <char t, int width = -1, int prec = -1, typename T> CMT_INLINE details::fmt_t<T, t, width, prec> fmt(const T& value) @@ -367,7 +367,7 @@ constexpr auto get_value_fmt() { return details::value_fmt(ctype_t<decay<repr_type<T>>>()); } -} +} // namespace details template <typename... Args> CMT_INLINE void print(const Args&... args) @@ -512,6 +512,6 @@ struct representation<std::shared_ptr<T1>> return as_string(type_name<std::shared_ptr<T1>>(), "(nullptr)"); } }; -} +} // namespace cometa CMT_PRAGMA_GNU(GCC diagnostic pop) diff --git a/include/kfr/cometa/tuple.hpp b/include/kfr/cometa/tuple.hpp @@ -30,7 +30,7 @@ void cforeach_tuple_impl(const std::tuple<Ts...>& tuple, Fn&& fn, csizes_t<indic { swallow{ (fn(std::get<indices>(tuple)), void(), 0)... }; } -} +} // namespace details template <typename... Ts, typename Fn> void cforeach(const std::tuple<Ts...>& tuple, Fn&& fn) @@ -38,6 +38,6 @@ void cforeach(const std::tuple<Ts...>& tuple, Fn&& fn) details::cforeach_tuple_impl(tuple, std::forward<Fn>(fn), typename details::cvalseq_impl<size_t, sizeof...(Ts), 0, 1>::type()); } -} +} // namespace cometa #include "../cometa.hpp" diff --git a/include/kfr/cpuid/cpuid.hpp b/include/kfr/cpuid/cpuid.hpp @@ -29,6 +29,7 @@ #include <intrin.h> #endif +#include "../base/platform.hpp" #include "../base/types.hpp" #include <cstring> diff --git a/include/kfr/cpuid/cpuid_auto.hpp b/include/kfr/cpuid/cpuid_auto.hpp @@ -51,10 +51,10 @@ CMT_INLINE char init_dummyvar() } static char dummyvar = init_dummyvar(); -} +} // namespace internal /** * @brief Returns cpu instruction set detected at runtime. */ CMT_INLINE cpu_t get_cpu() { return internal::cpu_v(); } -} +} // namespace kfr diff --git a/include/kfr/data/bitrev.hpp b/include/kfr/data/bitrev.hpp @@ -1054,4 +1054,4 @@ constexpr unsigned short bitrev_table[] = { 1023, 9215, 5119, 13311, 3071, 11263, 7167, 15359, 2047, 10239, 6143, 14335, 4095, 12287, 8191, 16383, }; } -} +} // namespace kfr diff --git a/include/kfr/data/sincos.hpp b/include/kfr/data/sincos.hpp @@ -23,6 +23,7 @@ #pragma once #include "../base/kfr.h" +#include "../base/types.hpp" #include <cstdint> namespace kfr diff --git a/include/kfr/dft/cache.hpp b/include/kfr/dft/cache.hpp @@ -166,4 +166,4 @@ univector<T> irealdft(const univector<complex<T>, Tag>& input) dft->execute(output, input, temp); return output; } -} +} // namespace kfr diff --git a/include/kfr/dft/convolution.hpp b/include/kfr/dft/convolution.hpp @@ -26,8 +26,8 @@ #pragma once #include "../base/complex.hpp" -#include "../base/filter.hpp" #include "../base/constants.hpp" +#include "../base/filter.hpp" #include "../base/memory.hpp" #include "../base/read_write.hpp" #include "../base/vec.hpp" diff --git a/include/kfr/dft/impl/bitrev.hpp b/include/kfr/dft/impl/bitrev.hpp @@ -386,5 +386,5 @@ KFR_INTRIN void fft_reorder(complex<T>* inout, size_t log2n, cfalse_t use_br2) i += istep; } } -} -} +} // namespace internal +} // namespace kfr diff --git a/include/kfr/dft/impl/dft-impl-f64.cpp b/include/kfr/dft/impl/dft-impl-f64.cpp @@ -27,4 +27,3 @@ #define FLOAT double #include "dft-templates.hpp" - diff --git a/include/kfr/dft/reference_dft.hpp b/include/kfr/dft/reference_dft.hpp @@ -30,8 +30,10 @@ #include "../base/memory.hpp" #include "../base/read_write.hpp" #include "../base/small_buffer.hpp" +#include "../base/univector.hpp" #include "../base/vec.hpp" #include <cmath> +#include <vector> namespace kfr { diff --git a/include/kfr/dsp/biquad.hpp b/include/kfr/dsp/biquad.hpp @@ -25,8 +25,10 @@ */ #pragma once +#include "../base/filter.hpp" #include "../base/function.hpp" #include "../base/operators.hpp" +#include "../base/pointer.hpp" #include "../base/vec.hpp" namespace kfr diff --git a/include/kfr/dsp/biquad_design.hpp b/include/kfr/dsp/biquad_design.hpp @@ -243,4 +243,4 @@ biquad_params<T> biquad_highshelf(identity<T> frequency, identity<T> gain) } return result; } -} +} // namespace kfr diff --git a/include/kfr/dsp/dcremove.hpp b/include/kfr/dsp/dcremove.hpp @@ -37,4 +37,4 @@ CMT_INLINE internal::expression_biquads<1, T, E1> dcremove(E1&& e1, double cutof const biquad_params<T> bqs[1] = { biquad_highpass(cutoff, 0.5) }; return internal::expression_biquads<1, T, E1>(bqs, std::forward<E1>(e1)); } -} +} // namespace kfr diff --git a/include/kfr/dsp/delay.hpp b/include/kfr/dsp/delay.hpp @@ -71,7 +71,7 @@ struct expression_delay : expression_base<E> } mutable univector<value_type, delay> data = scalar(value_type(0)); - mutable size_t cursor = 0; + mutable size_t cursor = 0; }; template <typename E> @@ -86,12 +86,12 @@ struct expression_delay<1, E> : expression_base<E> { const vec<T, N> in = this->argument_first(cinput, index, vec_t<T, N>()); const vec<T, N> out = insertleft(data, in); - data = in[N - 1]; + data = in[N - 1]; return out; } mutable value_type data = value_type(0); }; -} +} // namespace internal /** * @brief Returns template expression that applies delay to the input (uses ring buffer internally) @@ -108,4 +108,4 @@ CMT_INLINE internal::expression_delay<samples, E1> delay(E1&& e1, csize_t<sample static_assert(samples >= 1 && samples < 1024, ""); return internal::expression_delay<samples, E1>(std::forward<E1>(e1)); } -} +} // namespace kfr diff --git a/include/kfr/dsp/fir.hpp b/include/kfr/dsp/fir.hpp @@ -26,6 +26,7 @@ #pragma once #include "../base/basic_expressions.hpp" +#include "../base/filter.hpp" #include "../base/memory.hpp" #include "../base/reduce.hpp" #include "../base/univector.hpp" diff --git a/include/kfr/dsp/fir_design.hpp b/include/kfr/dsp/fir_design.hpp @@ -25,6 +25,7 @@ */ #pragma once +#include "../base/sin_cos.hpp" #include "fir.hpp" namespace kfr @@ -114,7 +115,7 @@ void fir_bandstop(univector_ref<T> taps, T frequency1, T frequency2, const expre taps = taps * invsum; } } -} +} // namespace intrinsics KFR_I_FN(fir_lowpass) KFR_I_FN(fir_highpass) KFR_I_FN(fir_bandpass) @@ -217,4 +218,4 @@ CMT_INLINE void fir_bandstop(const univector_ref<T>& taps, identity<T> frequency { return intrinsics::fir_bandstop(taps, frequency1, frequency2, window, normalize); } -} +} // namespace kfr diff --git a/include/kfr/dsp/fracdelay.hpp b/include/kfr/dsp/fracdelay.hpp @@ -38,4 +38,4 @@ CMT_INLINE internal::expression_short_fir<2, T, value_type_of<E1>, E1> fracdelay univector<T, 2> taps({ 1 - delay, delay }); return internal::expression_short_fir<2, T, value_type_of<E1>, E1>(std::forward<E1>(e1), taps); } -} +} // namespace kfr diff --git a/include/kfr/dsp/goertzel.hpp b/include/kfr/dsp/goertzel.hpp @@ -103,7 +103,7 @@ struct expression_parallel_goertzel : output_expression vec<T, width> q1; vec<T, width> q2; }; -}; +}; // namespace internal template <typename T> KFR_SINTRIN internal::expression_goertzel<T> goertzel(complex<T>& result, identity<T> omega) @@ -117,4 +117,4 @@ KFR_SINTRIN internal::expression_parallel_goertzel<T, width> goertzel(complex<T> { return internal::expression_parallel_goertzel<T, width>(result, read<width>(omega)); } -} +} // namespace kfr diff --git a/include/kfr/dsp/interpolation.hpp b/include/kfr/dsp/interpolation.hpp @@ -69,4 +69,4 @@ KFR_FUNC T catmullrom(M mu, T x0, T x1, T x2, T x3) const T a3 = x1; return horner(mu, a0, a1, a2, a3); } -} +} // namespace kfr diff --git a/include/kfr/dsp/mixdown.hpp b/include/kfr/dsp/mixdown.hpp @@ -54,7 +54,7 @@ struct stereo_matrix } const f64x2x2 matrix; }; -} +} // namespace internal template <int = 0> CMT_GNU_CONSTEXPR f64x2x2 matrix_sum_diff() @@ -71,11 +71,12 @@ CMT_GNU_CONSTEXPR f64x2x2 matrix_halfsum_halfdiff() * @brief Returns template expression that returns the vector of length 2 containing mix of the left and right * channels */ -template <typename Left, typename Right, typename Result = internal::expression_function< - internal::stereo_matrix, internal::expression_pack<Left, Right>>> +template <typename Left, typename Right, + typename Result = + internal::expression_function<internal::stereo_matrix, internal::expression_pack<Left, Right>>> Result mixdown_stereo(Left&& left, Right&& right, const f64x2x2& matrix) { return Result(internal::stereo_matrix{ matrix }, pack(std::forward<Left>(left), std::forward<Right>(right))); } -} +} // namespace kfr diff --git a/include/kfr/dsp/speaker.hpp b/include/kfr/dsp/speaker.hpp @@ -93,4 +93,4 @@ enum class SpeakerArrangement : int Music81 = 27, Arr102 = 28 }; -} +} // namespace kfr diff --git a/include/kfr/dsp/special.hpp b/include/kfr/dsp/special.hpp @@ -78,4 +78,4 @@ static auto swept(identity<T> magn, size_t size) { return magn * sin(swept_arg<T>(size)); } -} +} // namespace kfr diff --git a/include/kfr/dsp/units.hpp b/include/kfr/dsp/units.hpp @@ -25,9 +25,9 @@ */ #pragma once +#include "../base/abs.hpp" #include "../base/basic_expressions.hpp" #include "../base/log_exp.hpp" -#include "../base/abs.hpp" #include "../base/vec.hpp" namespace kfr @@ -112,7 +112,7 @@ KFR_SINTRIN Tc hertz_to_note(const T1& hertz, const T2& tunenote, const T3& tune return intrinsics::log_fmadd(hertz, subtype<Tc>(17.312340490667560888319096172023), offset); } -} +} // namespace intrinsics KFR_I_FN(note_to_hertz) KFR_I_FN(hertz_to_note) KFR_I_FN(amp_to_dB) @@ -191,4 +191,4 @@ KFR_INTRIN internal::expression_function<fn::dB_to_power, E1> dB_to_power(E1&& x { return { fn::dB_to_power(), std::forward<E1>(x) }; } -} +} // namespace kfr diff --git a/include/kfr/dsp/waveshaper.hpp b/include/kfr/dsp/waveshaper.hpp @@ -88,4 +88,4 @@ inline auto waveshaper_poly(E1&& input, fbase c1, fbase c3, Cs... cs) { return horner_odd(input, c1, c3, static_cast<fbase>(cs)...); } -} +} // namespace kfr diff --git a/include/kfr/dsp/weighting.hpp b/include/kfr/dsp/weighting.hpp @@ -88,7 +88,7 @@ KFR_SINTRIN T cweighting(T f) { return weight_c_unnorm(f) * weight_c_gain<subtype<T>>; } -} +} // namespace intrinsics KFR_I_FN(aweighting) KFR_I_FN(bweighting) KFR_I_FN(cweighting) @@ -128,4 +128,4 @@ KFR_INTRIN internal::expression_function<fn::cweighting, E1> cweighting(E1&& x) { return { fn::cweighting(), std::forward<E1>(x) }; } -} +} // namespace kfr diff --git a/include/kfr/ext/console_colors.hpp b/include/kfr/ext/console_colors.hpp @@ -27,12 +27,13 @@ typedef short SHORT; typedef unsigned short WORD; typedef int WINBOOL; -extern "C" { -WIN32_LITE_DECLSPEC_IMPORT HANDLE WIN32_LITE_WINAPI GetStdHandle(DWORD nStdHandle); -WIN32_LITE_DECLSPEC_IMPORT WINBOOL WIN32_LITE_WINAPI SetConsoleTextAttribute(HANDLE hConsoleOutput, - WORD wAttributes); -} +extern "C" +{ + WIN32_LITE_DECLSPEC_IMPORT HANDLE WIN32_LITE_WINAPI GetStdHandle(DWORD nStdHandle); + WIN32_LITE_DECLSPEC_IMPORT WINBOOL WIN32_LITE_WINAPI SetConsoleTextAttribute(HANDLE hConsoleOutput, + WORD wAttributes); } +} // namespace win32_lite #endif @@ -158,4 +159,4 @@ typedef console_color_tpl<Red> red_text; typedef console_color_tpl<Magenta> magenta_text; typedef console_color_tpl<Yellow> yellow_text; typedef console_color_tpl<White> white_text; -} +} // namespace console_colors diff --git a/include/kfr/io/dr/dr_flac.h b/include/kfr/io/dr/dr_flac.h @@ -9,8 +9,8 @@ // #define DR_FLAC_IMPLEMENTATION // #include "dr_flac.h" // -// You can then #include this file in other parts of the program as you would with any other header file. To decode audio data, -// do something like the following: +// You can then #include this file in other parts of the program as you would with any other header file. To +// decode audio data, do something like the following: // // drflac* pFlac = drflac_open_file("MySong.flac"); // if (pFlac == NULL) { @@ -18,25 +18,27 @@ // } // // drflac_int32* pSamples = malloc(pFlac->totalSampleCount * sizeof(drflac_int32)); -// drflac_uint64 numberOfInterleavedSamplesActuallyRead = drflac_read_s32(pFlac, pFlac->totalSampleCount, pSamples); +// drflac_uint64 numberOfInterleavedSamplesActuallyRead = drflac_read_s32(pFlac, pFlac->totalSampleCount, +// pSamples); // -// The drflac object represents the decoder. It is a transparent type so all the information you need, such as the number of -// channels and the bits per sample, should be directly accessible - just make sure you don't change their values. Samples are -// always output as interleaved signed 32-bit PCM. In the example above a native FLAC stream was opened, however dr_flac has -// seamless support for Ogg encapsulated FLAC streams as well. +// The drflac object represents the decoder. It is a transparent type so all the information you need, such as +// the number of channels and the bits per sample, should be directly accessible - just make sure you don't +// change their values. Samples are always output as interleaved signed 32-bit PCM. In the example above a +// native FLAC stream was opened, however dr_flac has seamless support for Ogg encapsulated FLAC streams as +// well. // -// You do not need to decode the entire stream in one go - you just specify how many samples you'd like at any given time and -// the decoder will give you as many samples as it can, up to the amount requested. Later on when you need the next batch of -// samples, just call it again. Example: +// You do not need to decode the entire stream in one go - you just specify how many samples you'd like at any +// given time and the decoder will give you as many samples as it can, up to the amount requested. Later on +// when you need the next batch of samples, just call it again. Example: // // while (drflac_read_s32(pFlac, chunkSize, pChunkSamples) > 0) { // do_something(); // } // -// You can seek to a specific sample with drflac_seek_to_sample(). The given sample is based on interleaving. So for example, -// if you were to seek to the sample at index 0 in a stereo stream, you'll be seeking to the first sample of the left channel. -// The sample at index 1 will be the first sample of the right channel. The sample at index 2 will be the second sample of the -// left channel, etc. +// You can seek to a specific sample with drflac_seek_to_sample(). The given sample is based on interleaving. +// So for example, if you were to seek to the sample at index 0 in a stereo stream, you'll be seeking to the +// first sample of the left channel. The sample at index 1 will be the first sample of the right channel. The +// sample at index 2 will be the second sample of the left channel, etc. // // // If you just want to quickly decode an entire FLAC file in one go you can do something like this: @@ -44,8 +46,8 @@ // unsigned int channels; // unsigned int sampleRate; // drflac_uint64 totalSampleCount; -// drflac_int32* pSampleData = drflac_open_and_decode_file_s32("MySong.flac", &channels, &sampleRate, &totalSampleCount); -// if (pSampleData == NULL) { +// drflac_int32* pSampleData = drflac_open_and_decode_file_s32("MySong.flac", &channels, &sampleRate, +// &totalSampleCount); if (pSampleData == NULL) { // // Failed to open and decode FLAC file. // } // @@ -54,25 +56,26 @@ // drflac_free(pSampleData); // // -// You can read samples as signed 16-bit integer and 32-bit floating-point PCM with the *_s16() and *_f32() family of APIs -// respectively, but note that these should be considered lossy. +// You can read samples as signed 16-bit integer and 32-bit floating-point PCM with the *_s16() and *_f32() +// family of APIs respectively, but note that these should be considered lossy. // // -// If you need access to metadata (album art, etc.), use drflac_open_with_metadata(), drflac_open_file_with_metdata() or -// drflac_open_memory_with_metadata(). The rationale for keeping these APIs separate is that they're slightly slower than the -// normal versions and also just a little bit harder to use. +// If you need access to metadata (album art, etc.), use drflac_open_with_metadata(), +// drflac_open_file_with_metdata() or drflac_open_memory_with_metadata(). The rationale for keeping these APIs +// separate is that they're slightly slower than the normal versions and also just a little bit harder to use. // -// dr_flac reports metadata to the application through the use of a callback, and every metadata block is reported before -// drflac_open_with_metdata() returns. +// dr_flac reports metadata to the application through the use of a callback, and every metadata block is +// reported before drflac_open_with_metdata() returns. // // -// The main opening APIs (drflac_open(), etc.) will fail if the header is not present. The presents a problem in certain -// scenarios such as broadcast style streams like internet radio where the header may not be present because the user has -// started playback mid-stream. To handle this, use the relaxed APIs: drflac_open_relaxed() and drflac_open_with_metadata_relaxed(). +// The main opening APIs (drflac_open(), etc.) will fail if the header is not present. The presents a problem +// in certain scenarios such as broadcast style streams like internet radio where the header may not be +// present because the user has started playback mid-stream. To handle this, use the relaxed APIs: +// drflac_open_relaxed() and drflac_open_with_metadata_relaxed(). // -// It is not recommended to use these APIs for file based streams because a missing header would usually indicate a -// corrupted or perverse file. In addition, these APIs can take a long time to initialize because they may need to spend -// a lot of time finding the first frame. +// It is not recommended to use these APIs for file based streams because a missing header would usually +// indicate a corrupted or perverse file. In addition, these APIs can take a long time to initialize because +// they may need to spend a lot of time finding the first frame. // // // @@ -86,26 +89,30 @@ // Disables support for Ogg/FLAC streams. // // #define DR_FLAC_BUFFER_SIZE <number> -// Defines the size of the internal buffer to store data from onRead(). This buffer is used to reduce the number of calls -// back to the client for more data. Larger values means more memory, but better performance. My tests show diminishing -// returns after about 4KB (which is the default). Consider reducing this if you have a very efficient implementation of -// onRead(), or increase it if it's very inefficient. Must be a multiple of 8. +// Defines the size of the internal buffer to store data from onRead(). This buffer is used to reduce the +// number of calls back to the client for more data. Larger values means more memory, but better +// performance. My tests show diminishing returns after about 4KB (which is the default). Consider reducing +// this if you have a very efficient implementation of onRead(), or increase it if it's very inefficient. +// Must be a multiple of 8. // // #define DR_FLAC_NO_CRC // Disables CRC checks. This will offer a performance boost when CRC is unnecessary. // // #define DR_FLAC_NO_SIMD -// Disables SIMD optimizations (SSE on x86/x64 architectures). Use this if you are having compatibility issues with your -// compiler. +// Disables SIMD optimizations (SSE on x86/x64 architectures). Use this if you are having compatibility +// issues with your compiler. // // // // QUICK NOTES // - dr_flac does not currently support changing the sample rate nor channel count mid stream. -// - Audio data is output as signed 32-bit PCM, regardless of the bits per sample the FLAC stream is encoded as. +// - Audio data is output as signed 32-bit PCM, regardless of the bits per sample the FLAC stream is encoded +// as. // - This has not been tested on big-endian architectures. -// - dr_flac is not thread-safe, but its APIs can be called from any thread so long as you do your own synchronization. -// - When using Ogg encapsulation, a corrupted metadata block will result in drflac_open_with_metadata() and drflac_open() +// - dr_flac is not thread-safe, but its APIs can be called from any thread so long as you do your own +// synchronization. +// - When using Ogg encapsulation, a corrupted metadata block will result in drflac_open_with_metadata() and +// drflac_open() // returning inconsistent samples. #ifndef dr_flac_h @@ -114,39 +121,41 @@ #include <stddef.h> #if defined(_MSC_VER) && _MSC_VER < 1600 -typedef signed char drflac_int8; -typedef unsigned char drflac_uint8; -typedef signed short drflac_int16; -typedef unsigned short drflac_uint16; -typedef signed int drflac_int32; -typedef unsigned int drflac_uint32; -typedef signed __int64 drflac_int64; +typedef signed char drflac_int8; +typedef unsigned char drflac_uint8; +typedef signed short drflac_int16; +typedef unsigned short drflac_uint16; +typedef signed int drflac_int32; +typedef unsigned int drflac_uint32; +typedef signed __int64 drflac_int64; typedef unsigned __int64 drflac_uint64; #else #include <stdint.h> -typedef int8_t drflac_int8; -typedef uint8_t drflac_uint8; -typedef int16_t drflac_int16; -typedef uint16_t drflac_uint16; -typedef int32_t drflac_int32; -typedef uint32_t drflac_uint32; -typedef int64_t drflac_int64; -typedef uint64_t drflac_uint64; +typedef int8_t drflac_int8; +typedef uint8_t drflac_uint8; +typedef int16_t drflac_int16; +typedef uint16_t drflac_uint16; +typedef int32_t drflac_int32; +typedef uint32_t drflac_uint32; +typedef int64_t drflac_int64; +typedef uint64_t drflac_uint64; #endif -typedef drflac_uint8 drflac_bool8; -typedef drflac_uint32 drflac_bool32; -#define DRFLAC_TRUE 1 -#define DRFLAC_FALSE 0 +typedef drflac_uint8 drflac_bool8; +typedef drflac_uint32 drflac_bool32; +#define DRFLAC_TRUE 1 +#define DRFLAC_FALSE 0 // As data is read from the client it is placed into an internal buffer for fast access. This controls the -// size of that buffer. Larger values means more speed, but also more memory. In my testing there is diminishing -// returns after about 4KB, but you can fiddle with this to suit your own needs. Must be a multiple of 8. +// size of that buffer. Larger values means more speed, but also more memory. In my testing there is +// diminishing returns after about 4KB, but you can fiddle with this to suit your own needs. Must be a +// multiple of 8. #ifndef DR_FLAC_BUFFER_SIZE -#define DR_FLAC_BUFFER_SIZE 4096 +#define DR_FLAC_BUFFER_SIZE 4096 #endif #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif // Check if we can enable 64-bit optimizations. @@ -155,621 +164,657 @@ extern "C" { #endif #ifdef DRFLAC_64BIT -typedef drflac_uint64 drflac_cache_t; + typedef drflac_uint64 drflac_cache_t; #else typedef drflac_uint32 drflac_cache_t; #endif // The various metadata block types. -#define DRFLAC_METADATA_BLOCK_TYPE_STREAMINFO 0 -#define DRFLAC_METADATA_BLOCK_TYPE_PADDING 1 -#define DRFLAC_METADATA_BLOCK_TYPE_APPLICATION 2 -#define DRFLAC_METADATA_BLOCK_TYPE_SEEKTABLE 3 -#define DRFLAC_METADATA_BLOCK_TYPE_VORBIS_COMMENT 4 -#define DRFLAC_METADATA_BLOCK_TYPE_CUESHEET 5 -#define DRFLAC_METADATA_BLOCK_TYPE_PICTURE 6 -#define DRFLAC_METADATA_BLOCK_TYPE_INVALID 127 +#define DRFLAC_METADATA_BLOCK_TYPE_STREAMINFO 0 +#define DRFLAC_METADATA_BLOCK_TYPE_PADDING 1 +#define DRFLAC_METADATA_BLOCK_TYPE_APPLICATION 2 +#define DRFLAC_METADATA_BLOCK_TYPE_SEEKTABLE 3 +#define DRFLAC_METADATA_BLOCK_TYPE_VORBIS_COMMENT 4 +#define DRFLAC_METADATA_BLOCK_TYPE_CUESHEET 5 +#define DRFLAC_METADATA_BLOCK_TYPE_PICTURE 6 +#define DRFLAC_METADATA_BLOCK_TYPE_INVALID 127 // The various picture types specified in the PICTURE block. -#define DRFLAC_PICTURE_TYPE_OTHER 0 -#define DRFLAC_PICTURE_TYPE_FILE_ICON 1 -#define DRFLAC_PICTURE_TYPE_OTHER_FILE_ICON 2 -#define DRFLAC_PICTURE_TYPE_COVER_FRONT 3 -#define DRFLAC_PICTURE_TYPE_COVER_BACK 4 -#define DRFLAC_PICTURE_TYPE_LEAFLET_PAGE 5 -#define DRFLAC_PICTURE_TYPE_MEDIA 6 -#define DRFLAC_PICTURE_TYPE_LEAD_ARTIST 7 -#define DRFLAC_PICTURE_TYPE_ARTIST 8 -#define DRFLAC_PICTURE_TYPE_CONDUCTOR 9 -#define DRFLAC_PICTURE_TYPE_BAND 10 -#define DRFLAC_PICTURE_TYPE_COMPOSER 11 -#define DRFLAC_PICTURE_TYPE_LYRICIST 12 -#define DRFLAC_PICTURE_TYPE_RECORDING_LOCATION 13 -#define DRFLAC_PICTURE_TYPE_DURING_RECORDING 14 -#define DRFLAC_PICTURE_TYPE_DURING_PERFORMANCE 15 -#define DRFLAC_PICTURE_TYPE_SCREEN_CAPTURE 16 -#define DRFLAC_PICTURE_TYPE_BRIGHT_COLORED_FISH 17 -#define DRFLAC_PICTURE_TYPE_ILLUSTRATION 18 -#define DRFLAC_PICTURE_TYPE_BAND_LOGOTYPE 19 -#define DRFLAC_PICTURE_TYPE_PUBLISHER_LOGOTYPE 20 - -typedef enum -{ - drflac_container_native, - drflac_container_ogg, - drflac_container_unknown -} drflac_container; +#define DRFLAC_PICTURE_TYPE_OTHER 0 +#define DRFLAC_PICTURE_TYPE_FILE_ICON 1 +#define DRFLAC_PICTURE_TYPE_OTHER_FILE_ICON 2 +#define DRFLAC_PICTURE_TYPE_COVER_FRONT 3 +#define DRFLAC_PICTURE_TYPE_COVER_BACK 4 +#define DRFLAC_PICTURE_TYPE_LEAFLET_PAGE 5 +#define DRFLAC_PICTURE_TYPE_MEDIA 6 +#define DRFLAC_PICTURE_TYPE_LEAD_ARTIST 7 +#define DRFLAC_PICTURE_TYPE_ARTIST 8 +#define DRFLAC_PICTURE_TYPE_CONDUCTOR 9 +#define DRFLAC_PICTURE_TYPE_BAND 10 +#define DRFLAC_PICTURE_TYPE_COMPOSER 11 +#define DRFLAC_PICTURE_TYPE_LYRICIST 12 +#define DRFLAC_PICTURE_TYPE_RECORDING_LOCATION 13 +#define DRFLAC_PICTURE_TYPE_DURING_RECORDING 14 +#define DRFLAC_PICTURE_TYPE_DURING_PERFORMANCE 15 +#define DRFLAC_PICTURE_TYPE_SCREEN_CAPTURE 16 +#define DRFLAC_PICTURE_TYPE_BRIGHT_COLORED_FISH 17 +#define DRFLAC_PICTURE_TYPE_ILLUSTRATION 18 +#define DRFLAC_PICTURE_TYPE_BAND_LOGOTYPE 19 +#define DRFLAC_PICTURE_TYPE_PUBLISHER_LOGOTYPE 20 + + typedef enum + { + drflac_container_native, + drflac_container_ogg, + drflac_container_unknown + } drflac_container; -typedef enum -{ - drflac_seek_origin_start, - drflac_seek_origin_current -} drflac_seek_origin; + typedef enum + { + drflac_seek_origin_start, + drflac_seek_origin_current + } drflac_seek_origin; -// Packing is important on this structure because we map this directly to the raw data within the SEEKTABLE metadata block. +// Packing is important on this structure because we map this directly to the raw data within the SEEKTABLE +// metadata block. #pragma pack(2) -typedef struct -{ - drflac_uint64 firstSample; - drflac_uint64 frameOffset; // The offset from the first byte of the header of the first frame. - drflac_uint16 sampleCount; -} drflac_seekpoint; + typedef struct + { + drflac_uint64 firstSample; + drflac_uint64 frameOffset; // The offset from the first byte of the header of the first frame. + drflac_uint16 sampleCount; + } drflac_seekpoint; #pragma pack() -typedef struct -{ - drflac_uint16 minBlockSize; - drflac_uint16 maxBlockSize; - drflac_uint32 minFrameSize; - drflac_uint32 maxFrameSize; - drflac_uint32 sampleRate; - drflac_uint8 channels; - drflac_uint8 bitsPerSample; - drflac_uint64 totalSampleCount; - drflac_uint8 md5[16]; -} drflac_streaminfo; - -typedef struct -{ - // The metadata type. Use this to know how to interpret the data below. - drflac_uint32 type; - - // A pointer to the raw data. This points to a temporary buffer so don't hold on to it. It's best to - // not modify the contents of this buffer. Use the structures below for more meaningful and structured - // information about the metadata. It's possible for this to be null. - const void* pRawData; - - // The size in bytes of the block and the buffer pointed to by pRawData if it's non-NULL. - drflac_uint32 rawDataSize; - - union + typedef struct { - drflac_streaminfo streaminfo; - - struct - { - int unused; - } padding; - - struct - { - drflac_uint32 id; - const void* pData; - drflac_uint32 dataSize; - } application; - - struct - { - drflac_uint32 seekpointCount; - const drflac_seekpoint* pSeekpoints; - } seektable; - - struct - { - drflac_uint32 vendorLength; - const char* vendor; - drflac_uint32 commentCount; - const void* pComments; - } vorbis_comment; - - struct - { - char catalog[128]; - drflac_uint64 leadInSampleCount; - drflac_bool32 isCD; - drflac_uint8 trackCount; - const void* pTrackData; - } cuesheet; - - struct - { - drflac_uint32 type; - drflac_uint32 mimeLength; - const char* mime; - drflac_uint32 descriptionLength; - const char* description; - drflac_uint32 width; - drflac_uint32 height; - drflac_uint32 colorDepth; - drflac_uint32 indexColorCount; - drflac_uint32 pictureDataSize; - const drflac_uint8* pPictureData; - } picture; - } data; -} drflac_metadata; - - -// Callback for when data needs to be read from the client. -// -// pUserData [in] The user data that was passed to drflac_open() and family. -// pBufferOut [out] The output buffer. -// bytesToRead [in] The number of bytes to read. -// -// Returns the number of bytes actually read. -// -// A return value of less than bytesToRead indicates the end of the stream. Do _not_ return from this callback until -// either the entire bytesToRead is filled or you have reached the end of the stream. -typedef size_t (* drflac_read_proc)(void* pUserData, void* pBufferOut, size_t bytesToRead); - -// Callback for when data needs to be seeked. -// -// pUserData [in] The user data that was passed to drflac_open() and family. -// offset [in] The number of bytes to move, relative to the origin. Will never be negative. -// origin [in] The origin of the seek - the current position or the start of the stream. -// -// Returns whether or not the seek was successful. -// -// The offset will never be negative. Whether or not it is relative to the beginning or current position is determined -// by the "origin" parameter which will be either drflac_seek_origin_start or drflac_seek_origin_current. -typedef drflac_bool32 (* drflac_seek_proc)(void* pUserData, int offset, drflac_seek_origin origin); - -// Callback for when a metadata block is read. -// -// pUserData [in] The user data that was passed to drflac_open() and family. -// pMetadata [in] A pointer to a structure containing the data of the metadata block. -// -// Use pMetadata->type to determine which metadata block is being handled and how to read the data. -typedef void (* drflac_meta_proc)(void* pUserData, drflac_metadata* pMetadata); - - -// Structure for internal use. Only used for decoders opened with drflac_open_memory. -typedef struct -{ - const drflac_uint8* data; - size_t dataSize; - size_t currentReadPos; -} drflac__memory_stream; - -// Structure for internal use. Used for bit streaming. -typedef struct -{ - // The function to call when more data needs to be read. - drflac_read_proc onRead; - - // The function to call when the current read position needs to be moved. - drflac_seek_proc onSeek; - - // The user data to pass around to onRead and onSeek. - void* pUserData; - - - // The number of unaligned bytes in the L2 cache. This will always be 0 until the end of the stream is hit. At the end of the - // stream there will be a number of bytes that don't cleanly fit in an L1 cache line, so we use this variable to know whether - // or not the bistreamer needs to run on a slower path to read those last bytes. This will never be more than sizeof(drflac_cache_t). - size_t unalignedByteCount; - - // The content of the unaligned bytes. - drflac_cache_t unalignedCache; - - // The index of the next valid cache line in the "L2" cache. - drflac_uint32 nextL2Line; + drflac_uint16 minBlockSize; + drflac_uint16 maxBlockSize; + drflac_uint32 minFrameSize; + drflac_uint32 maxFrameSize; + drflac_uint32 sampleRate; + drflac_uint8 channels; + drflac_uint8 bitsPerSample; + drflac_uint64 totalSampleCount; + drflac_uint8 md5[16]; + } drflac_streaminfo; + + typedef struct + { + // The metadata type. Use this to know how to interpret the data below. + drflac_uint32 type; - // The number of bits that have been consumed by the cache. This is used to determine how many valid bits are remaining. - drflac_uint32 consumedBits; + // A pointer to the raw data. This points to a temporary buffer so don't hold on to it. It's best to + // not modify the contents of this buffer. Use the structures below for more meaningful and structured + // information about the metadata. It's possible for this to be null. + const void* pRawData; - // The cached data which was most recently read from the client. There are two levels of cache. Data flows as such: - // Client -> L2 -> L1. The L2 -> L1 movement is aligned and runs on a fast path in just a few instructions. - drflac_cache_t cacheL2[DR_FLAC_BUFFER_SIZE/sizeof(drflac_cache_t)]; - drflac_cache_t cache; + // The size in bytes of the block and the buffer pointed to by pRawData if it's non-NULL. + drflac_uint32 rawDataSize; - // CRC-16. This is updated whenever bits are read from the bit stream. Manually set this to 0 to reset the CRC. For FLAC, this - // is reset to 0 at the beginning of each frame. - drflac_uint16 crc16; - drflac_cache_t crc16Cache; // A cache for optimizing CRC calculations. This is filled when when the L1 cache is reloaded. - drflac_uint32 crc16CacheIgnoredBytes; // The number of bytes to ignore when updating the CRC-16 from the CRC-16 cache. -} drflac_bs; + union { + drflac_streaminfo streaminfo; -typedef struct -{ - // The type of the subframe: SUBFRAME_CONSTANT, SUBFRAME_VERBATIM, SUBFRAME_FIXED or SUBFRAME_LPC. - drflac_uint8 subframeType; - - // The number of wasted bits per sample as specified by the sub-frame header. - drflac_uint8 wastedBitsPerSample; + struct + { + int unused; + } padding; - // The order to use for the prediction stage for SUBFRAME_FIXED and SUBFRAME_LPC. - drflac_uint8 lpcOrder; + struct + { + drflac_uint32 id; + const void* pData; + drflac_uint32 dataSize; + } application; - // The number of bits per sample for this subframe. This is not always equal to the current frame's bit per sample because - // an extra bit is required for side channels when interchannel decorrelation is being used. - drflac_uint32 bitsPerSample; + struct + { + drflac_uint32 seekpointCount; + const drflac_seekpoint* pSeekpoints; + } seektable; - // A pointer to the buffer containing the decoded samples in the subframe. This pointer is an offset from drflac::pExtraData. Note that - // it's a signed 32-bit integer for each value. - drflac_int32* pDecodedSamples; -} drflac_subframe; + struct + { + drflac_uint32 vendorLength; + const char* vendor; + drflac_uint32 commentCount; + const void* pComments; + } vorbis_comment; -typedef struct -{ - // If the stream uses variable block sizes, this will be set to the index of the first sample. If fixed block sizes are used, this will - // always be set to 0. - drflac_uint64 sampleNumber; + struct + { + char catalog[128]; + drflac_uint64 leadInSampleCount; + drflac_bool32 isCD; + drflac_uint8 trackCount; + const void* pTrackData; + } cuesheet; + + struct + { + drflac_uint32 type; + drflac_uint32 mimeLength; + const char* mime; + drflac_uint32 descriptionLength; + const char* description; + drflac_uint32 width; + drflac_uint32 height; + drflac_uint32 colorDepth; + drflac_uint32 indexColorCount; + drflac_uint32 pictureDataSize; + const drflac_uint8* pPictureData; + } picture; + } data; + } drflac_metadata; + + // Callback for when data needs to be read from the client. + // + // pUserData [in] The user data that was passed to drflac_open() and family. + // pBufferOut [out] The output buffer. + // bytesToRead [in] The number of bytes to read. + // + // Returns the number of bytes actually read. + // + // A return value of less than bytesToRead indicates the end of the stream. Do _not_ return from this + // callback until either the entire bytesToRead is filled or you have reached the end of the stream. + typedef size_t (*drflac_read_proc)(void* pUserData, void* pBufferOut, size_t bytesToRead); - // If the stream uses fixed block sizes, this will be set to the frame number. If variable block sizes are used, this will always be 0. - drflac_uint32 frameNumber; + // Callback for when data needs to be seeked. + // + // pUserData [in] The user data that was passed to drflac_open() and family. + // offset [in] The number of bytes to move, relative to the origin. Will never be negative. + // origin [in] The origin of the seek - the current position or the start of the stream. + // + // Returns whether or not the seek was successful. + // + // The offset will never be negative. Whether or not it is relative to the beginning or current position + // is determined by the "origin" parameter which will be either drflac_seek_origin_start or + // drflac_seek_origin_current. + typedef drflac_bool32 (*drflac_seek_proc)(void* pUserData, int offset, drflac_seek_origin origin); - // The sample rate of this frame. - drflac_uint32 sampleRate; + // Callback for when a metadata block is read. + // + // pUserData [in] The user data that was passed to drflac_open() and family. + // pMetadata [in] A pointer to a structure containing the data of the metadata block. + // + // Use pMetadata->type to determine which metadata block is being handled and how to read the data. + typedef void (*drflac_meta_proc)(void* pUserData, drflac_metadata* pMetadata); - // The number of samples in each sub-frame within this frame. - drflac_uint16 blockSize; + // Structure for internal use. Only used for decoders opened with drflac_open_memory. + typedef struct + { + const drflac_uint8* data; + size_t dataSize; + size_t currentReadPos; + } drflac__memory_stream; - // The channel assignment of this frame. This is not always set to the channel count. If interchannel decorrelation is being used this - // will be set to DRFLAC_CHANNEL_ASSIGNMENT_LEFT_SIDE, DRFLAC_CHANNEL_ASSIGNMENT_RIGHT_SIDE or DRFLAC_CHANNEL_ASSIGNMENT_MID_SIDE. - drflac_uint8 channelAssignment; + // Structure for internal use. Used for bit streaming. + typedef struct + { + // The function to call when more data needs to be read. + drflac_read_proc onRead; + + // The function to call when the current read position needs to be moved. + drflac_seek_proc onSeek; + + // The user data to pass around to onRead and onSeek. + void* pUserData; + + // The number of unaligned bytes in the L2 cache. This will always be 0 until the end of the stream is + // hit. At the end of the stream there will be a number of bytes that don't cleanly fit in an L1 cache + // line, so we use this variable to know whether or not the bistreamer needs to run on a slower path + // to read those last bytes. This will never be more than sizeof(drflac_cache_t). + size_t unalignedByteCount; + + // The content of the unaligned bytes. + drflac_cache_t unalignedCache; + + // The index of the next valid cache line in the "L2" cache. + drflac_uint32 nextL2Line; + + // The number of bits that have been consumed by the cache. This is used to determine how many valid + // bits are remaining. + drflac_uint32 consumedBits; + + // The cached data which was most recently read from the client. There are two levels of cache. Data + // flows as such: Client -> L2 -> L1. The L2 -> L1 movement is aligned and runs on a fast path in just + // a few instructions. + drflac_cache_t cacheL2[DR_FLAC_BUFFER_SIZE / sizeof(drflac_cache_t)]; + drflac_cache_t cache; + + // CRC-16. This is updated whenever bits are read from the bit stream. Manually set this to 0 to reset + // the CRC. For FLAC, this is reset to 0 at the beginning of each frame. + drflac_uint16 crc16; + drflac_cache_t crc16Cache; // A cache for optimizing CRC calculations. This is filled when when the L1 + // cache is reloaded. + drflac_uint32 crc16CacheIgnoredBytes; // The number of bytes to ignore when updating the CRC-16 from + // the CRC-16 cache. + } drflac_bs; + + typedef struct + { + // The type of the subframe: SUBFRAME_CONSTANT, SUBFRAME_VERBATIM, SUBFRAME_FIXED or SUBFRAME_LPC. + drflac_uint8 subframeType; - // The number of bits per sample within this frame. - drflac_uint8 bitsPerSample; + // The number of wasted bits per sample as specified by the sub-frame header. + drflac_uint8 wastedBitsPerSample; - // The frame's CRC. - drflac_uint8 crc8; -} drflac_frame_header; + // The order to use for the prediction stage for SUBFRAME_FIXED and SUBFRAME_LPC. + drflac_uint8 lpcOrder; -typedef struct -{ - // The header. - drflac_frame_header header; + // The number of bits per sample for this subframe. This is not always equal to the current frame's + // bit per sample because an extra bit is required for side channels when interchannel decorrelation + // is being used. + drflac_uint32 bitsPerSample; - // The number of samples left to be read in this frame. This is initially set to the block size multiplied by the channel count. As samples - // are read, this will be decremented. When it reaches 0, the decoder will see this frame as fully consumed and load the next frame. - drflac_uint32 samplesRemaining; + // A pointer to the buffer containing the decoded samples in the subframe. This pointer is an offset + // from drflac::pExtraData. Note that it's a signed 32-bit integer for each value. + drflac_int32* pDecodedSamples; + } drflac_subframe; - // The list of sub-frames within the frame. There is one sub-frame for each channel, and there's a maximum of 8 channels. - drflac_subframe subframes[8]; -} drflac_frame; + typedef struct + { + // If the stream uses variable block sizes, this will be set to the index of the first sample. If + // fixed block sizes are used, this will always be set to 0. + drflac_uint64 sampleNumber; -typedef struct -{ - // The function to call when a metadata block is read. - drflac_meta_proc onMeta; + // If the stream uses fixed block sizes, this will be set to the frame number. If variable block sizes + // are used, this will always be 0. + drflac_uint32 frameNumber; - // The user data posted to the metadata callback function. - void* pUserDataMD; + // The sample rate of this frame. + drflac_uint32 sampleRate; + // The number of samples in each sub-frame within this frame. + drflac_uint16 blockSize; - // The sample rate. Will be set to something like 44100. - drflac_uint32 sampleRate; + // The channel assignment of this frame. This is not always set to the channel count. If interchannel + // decorrelation is being used this will be set to DRFLAC_CHANNEL_ASSIGNMENT_LEFT_SIDE, + // DRFLAC_CHANNEL_ASSIGNMENT_RIGHT_SIDE or DRFLAC_CHANNEL_ASSIGNMENT_MID_SIDE. + drflac_uint8 channelAssignment; - // The number of channels. This will be set to 1 for monaural streams, 2 for stereo, etc. Maximum 8. This is set based on the - // value specified in the STREAMINFO block. - drflac_uint8 channels; + // The number of bits per sample within this frame. + drflac_uint8 bitsPerSample; - // The bits per sample. Will be set to something like 16, 24, etc. - drflac_uint8 bitsPerSample; + // The frame's CRC. + drflac_uint8 crc8; + } drflac_frame_header; - // The maximum block size, in samples. This number represents the number of samples in each channel (not combined). - drflac_uint16 maxBlockSize; + typedef struct + { + // The header. + drflac_frame_header header; - // The total number of samples making up the stream. This includes every channel. For example, if the stream has 2 channels, - // with each channel having a total of 4096, this value will be set to 2*4096 = 8192. Can be 0 in which case it's still a - // valid stream, but just means the total sample count is unknown. Likely the case with streams like internet radio. - drflac_uint64 totalSampleCount; + // The number of samples left to be read in this frame. This is initially set to the block size + // multiplied by the channel count. As samples are read, this will be decremented. When it reaches 0, + // the decoder will see this frame as fully consumed and load the next frame. + drflac_uint32 samplesRemaining; + // The list of sub-frames within the frame. There is one sub-frame for each channel, and there's a + // maximum of 8 channels. + drflac_subframe subframes[8]; + } drflac_frame; - // The container type. This is set based on whether or not the decoder was opened from a native or Ogg stream. - drflac_container container; + typedef struct + { + // The function to call when a metadata block is read. + drflac_meta_proc onMeta; - // The number of seekpoints in the seektable. - drflac_uint32 seekpointCount; + // The user data posted to the metadata callback function. + void* pUserDataMD; + // The sample rate. Will be set to something like 44100. + drflac_uint32 sampleRate; - // Information about the frame the decoder is currently sitting on. - drflac_frame currentFrame; + // The number of channels. This will be set to 1 for monaural streams, 2 for stereo, etc. Maximum 8. + // This is set based on the value specified in the STREAMINFO block. + drflac_uint8 channels; - // The index of the sample the decoder is currently sitting on. This is only used for seeking. - drflac_uint64 currentSample; + // The bits per sample. Will be set to something like 16, 24, etc. + drflac_uint8 bitsPerSample; - // The position of the first frame in the stream. This is only ever used for seeking. - drflac_uint64 firstFramePos; + // The maximum block size, in samples. This number represents the number of samples in each channel + // (not combined). + drflac_uint16 maxBlockSize; + // The total number of samples making up the stream. This includes every channel. For example, if the + // stream has 2 channels, with each channel having a total of 4096, this value will be set to 2*4096 = + // 8192. Can be 0 in which case it's still a valid stream, but just means the total sample count is + // unknown. Likely the case with streams like internet radio. + drflac_uint64 totalSampleCount; - // A hack to avoid a malloc() when opening a decoder with drflac_open_memory(). - drflac__memory_stream memoryStream; + // The container type. This is set based on whether or not the decoder was opened from a native or Ogg + // stream. + drflac_container container; + // The number of seekpoints in the seektable. + drflac_uint32 seekpointCount; - // A pointer to the decoded sample data. This is an offset of pExtraData. - drflac_int32* pDecodedSamples; + // Information about the frame the decoder is currently sitting on. + drflac_frame currentFrame; - // A pointer to the seek table. This is an offset of pExtraData, or NULL if there is no seek table. - drflac_seekpoint* pSeekpoints; + // The index of the sample the decoder is currently sitting on. This is only used for seeking. + drflac_uint64 currentSample; - // Internal use only. Only used with Ogg containers. Points to a drflac_oggbs object. This is an offset of pExtraData. - void* _oggbs; + // The position of the first frame in the stream. This is only ever used for seeking. + drflac_uint64 firstFramePos; - // The bit streamer. The raw FLAC data is fed through this object. - drflac_bs bs; + // A hack to avoid a malloc() when opening a decoder with drflac_open_memory(). + drflac__memory_stream memoryStream; - // Variable length extra data. We attach this to the end of the object so we can avoid unnecessary mallocs. - drflac_uint8 pExtraData[1]; -} drflac; + // A pointer to the decoded sample data. This is an offset of pExtraData. + drflac_int32* pDecodedSamples; + // A pointer to the seek table. This is an offset of pExtraData, or NULL if there is no seek table. + drflac_seekpoint* pSeekpoints; -// Opens a FLAC decoder. -// -// onRead [in] The function to call when data needs to be read from the client. -// onSeek [in] The function to call when the read position of the client data needs to move. -// pUserData [in, optional] A pointer to application defined data that will be passed to onRead and onSeek. -// -// Returns a pointer to an object representing the decoder. -// -// Close the decoder with drflac_close(). -// -// This function will automatically detect whether or not you are attempting to open a native or Ogg encapsulated -// FLAC, both of which should work seamlessly without any manual intervention. Ogg encapsulation also works with -// multiplexed streams which basically means it can play FLAC encoded audio tracks in videos. -// -// This is the lowest level function for opening a FLAC stream. You can also use drflac_open_file() and drflac_open_memory() -// to open the stream from a file or from a block of memory respectively. -// -// The STREAMINFO block must be present for this to succeed. Use drflac_open_relaxed() to open a FLAC stream where -// the header may not be present. -// -// See also: drflac_open_file(), drflac_open_memory(), drflac_open_with_metadata(), drflac_close() -drflac* drflac_open(drflac_read_proc onRead, drflac_seek_proc onSeek, void* pUserData); + // Internal use only. Only used with Ogg containers. Points to a drflac_oggbs object. This is an + // offset of pExtraData. + void* _oggbs; -// The same as drflac_open(), except attempts to open the stream even when a header block is not present. -// -// Because the header is not necessarily available, the caller must explicitly define the container (Native or Ogg). Do -// not set this to drflac_container_unknown - that is for internal use only. -// -// Opening in relaxed mode will continue reading data from onRead until it finds a valid frame. If a frame is never -// found it will continue forever. To abort, force your onRead callback to return 0, which dr_flac will use as an -// indicator that the end of the stream was found. -drflac* drflac_open_relaxed(drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_container container, void* pUserData); + // The bit streamer. The raw FLAC data is fed through this object. + drflac_bs bs; -// Opens a FLAC decoder and notifies the caller of the metadata chunks (album art, etc.). -// -// onRead [in] The function to call when data needs to be read from the client. -// onSeek [in] The function to call when the read position of the client data needs to move. -// onMeta [in] The function to call for every metadata block. -// pUserData [in, optional] A pointer to application defined data that will be passed to onRead, onSeek and onMeta. -// -// Returns a pointer to an object representing the decoder. -// -// Close the decoder with drflac_close(). -// -// This is slower than drflac_open(), so avoid this one if you don't need metadata. Internally, this will do a DRFLAC_MALLOC() -// and DRFLAC_FREE() for every metadata block except for STREAMINFO and PADDING blocks. -// -// The caller is notified of the metadata via the onMeta callback. All metadata blocks will be handled before the function -// returns. -// -// The STREAMINFO block must be present for this to succeed. Use drflac_open_with_metadata_relaxed() to open a FLAC -// stream where the header may not be present. -// -// Note that this will behave inconsistently with drflac_open() if the stream is an Ogg encapsulated stream and a metadata -// block is corrupted. This is due to the way the Ogg stream recovers from corrupted pages. When drflac_open_with_metadata() -// is being used, the open routine will try to read the contents of the metadata block, whereas drflac_open() will simply -// seek past it (for the sake of efficiency). This inconsistency can result in different samples being returned depending on -// whether or not the stream is being opened with metadata. -// -// See also: drflac_open_file_with_metadata(), drflac_open_memory_with_metadata(), drflac_open(), drflac_close() -drflac* drflac_open_with_metadata(drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_meta_proc onMeta, void* pUserData); + // Variable length extra data. We attach this to the end of the object so we can avoid unnecessary + // mallocs. + drflac_uint8 pExtraData[1]; + } drflac; -// The same as drflac_open_with_metadata(), except attempts to open the stream even when a header block is not present. -// -// See also: drflac_open_with_metadata(), drflac_open_relaxed() -drflac* drflac_open_with_metadata_relaxed(drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_meta_proc onMeta, drflac_container container, void* pUserData); + // Opens a FLAC decoder. + // + // onRead [in] The function to call when data needs to be read from the client. + // onSeek [in] The function to call when the read position of the client data needs to move. + // pUserData [in, optional] A pointer to application defined data that will be passed to onRead and + // onSeek. + // + // Returns a pointer to an object representing the decoder. + // + // Close the decoder with drflac_close(). + // + // This function will automatically detect whether or not you are attempting to open a native or Ogg + // encapsulated FLAC, both of which should work seamlessly without any manual intervention. Ogg + // encapsulation also works with multiplexed streams which basically means it can play FLAC encoded audio + // tracks in videos. + // + // This is the lowest level function for opening a FLAC stream. You can also use drflac_open_file() and + // drflac_open_memory() to open the stream from a file or from a block of memory respectively. + // + // The STREAMINFO block must be present for this to succeed. Use drflac_open_relaxed() to open a FLAC + // stream where the header may not be present. + // + // See also: drflac_open_file(), drflac_open_memory(), drflac_open_with_metadata(), drflac_close() + drflac* drflac_open(drflac_read_proc onRead, drflac_seek_proc onSeek, void* pUserData); -// Closes the given FLAC decoder. -// -// pFlac [in] The decoder to close. -// -// This will destroy the decoder object. -void drflac_close(drflac* pFlac); + // The same as drflac_open(), except attempts to open the stream even when a header block is not present. + // + // Because the header is not necessarily available, the caller must explicitly define the container + // (Native or Ogg). Do not set this to drflac_container_unknown - that is for internal use only. + // + // Opening in relaxed mode will continue reading data from onRead until it finds a valid frame. If a frame + // is never found it will continue forever. To abort, force your onRead callback to return 0, which + // dr_flac will use as an indicator that the end of the stream was found. + drflac* drflac_open_relaxed(drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_container container, + void* pUserData); + // Opens a FLAC decoder and notifies the caller of the metadata chunks (album art, etc.). + // + // onRead [in] The function to call when data needs to be read from the client. + // onSeek [in] The function to call when the read position of the client data needs to move. + // onMeta [in] The function to call for every metadata block. + // pUserData [in, optional] A pointer to application defined data that will be passed to onRead, onSeek + // and onMeta. + // + // Returns a pointer to an object representing the decoder. + // + // Close the decoder with drflac_close(). + // + // This is slower than drflac_open(), so avoid this one if you don't need metadata. Internally, this will + // do a DRFLAC_MALLOC() and DRFLAC_FREE() for every metadata block except for STREAMINFO and PADDING + // blocks. + // + // The caller is notified of the metadata via the onMeta callback. All metadata blocks will be handled + // before the function returns. + // + // The STREAMINFO block must be present for this to succeed. Use drflac_open_with_metadata_relaxed() to + // open a FLAC stream where the header may not be present. + // + // Note that this will behave inconsistently with drflac_open() if the stream is an Ogg encapsulated + // stream and a metadata block is corrupted. This is due to the way the Ogg stream recovers from corrupted + // pages. When drflac_open_with_metadata() is being used, the open routine will try to read the contents + // of the metadata block, whereas drflac_open() will simply seek past it (for the sake of efficiency). + // This inconsistency can result in different samples being returned depending on whether or not the + // stream is being opened with metadata. + // + // See also: drflac_open_file_with_metadata(), drflac_open_memory_with_metadata(), drflac_open(), + // drflac_close() + drflac* drflac_open_with_metadata(drflac_read_proc onRead, drflac_seek_proc onSeek, + drflac_meta_proc onMeta, void* pUserData); -// Reads sample data from the given FLAC decoder, output as interleaved signed 32-bit PCM. -// -// pFlac [in] The decoder. -// samplesToRead [in] The number of samples to read. -// pBufferOut [out, optional] A pointer to the buffer that will receive the decoded samples. -// -// Returns the number of samples actually read. -// -// pBufferOut can be null, in which case the call will act as a seek, and the return value will be the number of samples -// seeked. -drflac_uint64 drflac_read_s32(drflac* pFlac, drflac_uint64 samplesToRead, drflac_int32* pBufferOut); + // The same as drflac_open_with_metadata(), except attempts to open the stream even when a header block is + // not present. + // + // See also: drflac_open_with_metadata(), drflac_open_relaxed() + drflac* drflac_open_with_metadata_relaxed(drflac_read_proc onRead, drflac_seek_proc onSeek, + drflac_meta_proc onMeta, drflac_container container, + void* pUserData); -// Same as drflac_read_s32(), except outputs samples as 16-bit integer PCM rather than 32-bit. -// -// pFlac [in] The decoder. -// samplesToRead [in] The number of samples to read. -// pBufferOut [out, optional] A pointer to the buffer that will receive the decoded samples. -// -// Returns the number of samples actually read. -// -// pBufferOut can be null, in which case the call will act as a seek, and the return value will be the number of samples -// seeked. -// -// Note that this is lossy for streams where the bits per sample is larger than 16. -drflac_uint64 drflac_read_s16(drflac* pFlac, drflac_uint64 samplesToRead, drflac_int16* pBufferOut); + // Closes the given FLAC decoder. + // + // pFlac [in] The decoder to close. + // + // This will destroy the decoder object. + void drflac_close(drflac* pFlac); -// Same as drflac_read_s32(), except outputs samples as 32-bit floating-point PCM. -// -// pFlac [in] The decoder. -// samplesToRead [in] The number of samples to read. -// pBufferOut [out, optional] A pointer to the buffer that will receive the decoded samples. -// -// Returns the number of samples actually read. -// -// pBufferOut can be null, in which case the call will act as a seek, and the return value will be the number of samples -// seeked. -// -// Note that this should be considered lossy due to the nature of floating point numbers not being able to exactly -// represent every possible number. -drflac_uint64 drflac_read_f32(drflac* pFlac, drflac_uint64 samplesToRead, float* pBufferOut); + // Reads sample data from the given FLAC decoder, output as interleaved signed 32-bit PCM. + // + // pFlac [in] The decoder. + // samplesToRead [in] The number of samples to read. + // pBufferOut [out, optional] A pointer to the buffer that will receive the decoded samples. + // + // Returns the number of samples actually read. + // + // pBufferOut can be null, in which case the call will act as a seek, and the return value will be the + // number of samples seeked. + drflac_uint64 drflac_read_s32(drflac* pFlac, drflac_uint64 samplesToRead, drflac_int32* pBufferOut); -// Seeks to the sample at the given index. -// -// pFlac [in] The decoder. -// sampleIndex [in] The index of the sample to seek to. See notes below. -// -// Returns DRFLAC_TRUE if successful; DRFLAC_FALSE otherwise. -// -// The sample index is based on interleaving. In a stereo stream, for example, the sample at index 0 is the first sample -// in the left channel; the sample at index 1 is the first sample on the right channel, and so on. -// -// When seeking, you will likely want to ensure it's rounded to a multiple of the channel count. You can do this with -// something like drflac_seek_to_sample(pFlac, (mySampleIndex + (mySampleIndex % pFlac->channels))) -drflac_bool32 drflac_seek_to_sample(drflac* pFlac, drflac_uint64 sampleIndex); + // Same as drflac_read_s32(), except outputs samples as 16-bit integer PCM rather than 32-bit. + // + // pFlac [in] The decoder. + // samplesToRead [in] The number of samples to read. + // pBufferOut [out, optional] A pointer to the buffer that will receive the decoded samples. + // + // Returns the number of samples actually read. + // + // pBufferOut can be null, in which case the call will act as a seek, and the return value will be the + // number of samples seeked. + // + // Note that this is lossy for streams where the bits per sample is larger than 16. + drflac_uint64 drflac_read_s16(drflac* pFlac, drflac_uint64 samplesToRead, drflac_int16* pBufferOut); + // Same as drflac_read_s32(), except outputs samples as 32-bit floating-point PCM. + // + // pFlac [in] The decoder. + // samplesToRead [in] The number of samples to read. + // pBufferOut [out, optional] A pointer to the buffer that will receive the decoded samples. + // + // Returns the number of samples actually read. + // + // pBufferOut can be null, in which case the call will act as a seek, and the return value will be the + // number of samples seeked. + // + // Note that this should be considered lossy due to the nature of floating point numbers not being able to + // exactly represent every possible number. + drflac_uint64 drflac_read_f32(drflac* pFlac, drflac_uint64 samplesToRead, float* pBufferOut); + // Seeks to the sample at the given index. + // + // pFlac [in] The decoder. + // sampleIndex [in] The index of the sample to seek to. See notes below. + // + // Returns DRFLAC_TRUE if successful; DRFLAC_FALSE otherwise. + // + // The sample index is based on interleaving. In a stereo stream, for example, the sample at index 0 is + // the first sample in the left channel; the sample at index 1 is the first sample on the right channel, + // and so on. + // + // When seeking, you will likely want to ensure it's rounded to a multiple of the channel count. You can + // do this with something like drflac_seek_to_sample(pFlac, (mySampleIndex + (mySampleIndex % + // pFlac->channels))) + drflac_bool32 drflac_seek_to_sample(drflac* pFlac, drflac_uint64 sampleIndex); #ifndef DR_FLAC_NO_STDIO -// Opens a FLAC decoder from the file at the given path. -// -// filename [in] The path of the file to open, either absolute or relative to the current directory. -// -// Returns a pointer to an object representing the decoder. -// -// Close the decoder with drflac_close(). -// -// This will hold a handle to the file until the decoder is closed with drflac_close(). Some platforms will restrict the -// number of files a process can have open at any given time, so keep this mind if you have many decoders open at the -// same time. -// -// See also: drflac_open(), drflac_open_file_with_metadata(), drflac_close() -drflac* drflac_open_file(const char* filename); + // Opens a FLAC decoder from the file at the given path. + // + // filename [in] The path of the file to open, either absolute or relative to the current directory. + // + // Returns a pointer to an object representing the decoder. + // + // Close the decoder with drflac_close(). + // + // This will hold a handle to the file until the decoder is closed with drflac_close(). Some platforms + // will restrict the number of files a process can have open at any given time, so keep this mind if you + // have many decoders open at the same time. + // + // See also: drflac_open(), drflac_open_file_with_metadata(), drflac_close() + drflac* drflac_open_file(const char* filename); -// Opens a FLAC decoder from the file at the given path and notifies the caller of the metadata chunks (album art, etc.) -// -// Look at the documentation for drflac_open_with_metadata() for more information on how metadata is handled. -drflac* drflac_open_file_with_metadata(const char* filename, drflac_meta_proc onMeta, void* pUserData); + // Opens a FLAC decoder from the file at the given path and notifies the caller of the metadata chunks + // (album art, etc.) + // + // Look at the documentation for drflac_open_with_metadata() for more information on how metadata is + // handled. + drflac* drflac_open_file_with_metadata(const char* filename, drflac_meta_proc onMeta, void* pUserData); #endif -// Opens a FLAC decoder from a pre-allocated block of memory -// -// This does not create a copy of the data. It is up to the application to ensure the buffer remains valid for -// the lifetime of the decoder. -drflac* drflac_open_memory(const void* data, size_t dataSize); - -// Opens a FLAC decoder from a pre-allocated block of memory and notifies the caller of the metadata chunks (album art, etc.) -// -// Look at the documentation for drflac_open_with_metadata() for more information on how metadata is handled. -drflac* drflac_open_memory_with_metadata(const void* data, size_t dataSize, drflac_meta_proc onMeta, void* pUserData); - + // Opens a FLAC decoder from a pre-allocated block of memory + // + // This does not create a copy of the data. It is up to the application to ensure the buffer remains valid + // for the lifetime of the decoder. + drflac* drflac_open_memory(const void* data, size_t dataSize); + // Opens a FLAC decoder from a pre-allocated block of memory and notifies the caller of the metadata + // chunks (album art, etc.) + // + // Look at the documentation for drflac_open_with_metadata() for more information on how metadata is + // handled. + drflac* drflac_open_memory_with_metadata(const void* data, size_t dataSize, drflac_meta_proc onMeta, + void* pUserData); -//// High Level APIs //// + //// High Level APIs //// -// Opens a FLAC stream from the given callbacks and fully decodes it in a single operation. The return value is a -// pointer to the sample data as interleaved signed 32-bit PCM. The returned data must be freed with DRFLAC_FREE(). -// -// Sometimes a FLAC file won't keep track of the total sample count. In this situation the function will continuously -// read samples into a dynamically sized buffer on the heap until no samples are left. -// -// Do not call this function on a broadcast type of stream (like internet radio streams and whatnot). -drflac_int32* drflac_open_and_decode_s32(drflac_read_proc onRead, drflac_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount); + // Opens a FLAC stream from the given callbacks and fully decodes it in a single operation. The return + // value is a pointer to the sample data as interleaved signed 32-bit PCM. The returned data must be freed + // with DRFLAC_FREE(). + // + // Sometimes a FLAC file won't keep track of the total sample count. In this situation the function will + // continuously read samples into a dynamically sized buffer on the heap until no samples are left. + // + // Do not call this function on a broadcast type of stream (like internet radio streams and whatnot). + drflac_int32* drflac_open_and_decode_s32(drflac_read_proc onRead, drflac_seek_proc onSeek, + void* pUserData, unsigned int* channels, + unsigned int* sampleRate, drflac_uint64* totalSampleCount); -// Same as drflac_open_and_decode_s32(), except returns signed 16-bit integer samples. -drflac_int16* drflac_open_and_decode_s16(drflac_read_proc onRead, drflac_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount); + // Same as drflac_open_and_decode_s32(), except returns signed 16-bit integer samples. + drflac_int16* drflac_open_and_decode_s16(drflac_read_proc onRead, drflac_seek_proc onSeek, + void* pUserData, unsigned int* channels, + unsigned int* sampleRate, drflac_uint64* totalSampleCount); -// Same as drflac_open_and_decode_s32(), except returns 32-bit floating-point samples. -float* drflac_open_and_decode_f32(drflac_read_proc onRead, drflac_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount); + // Same as drflac_open_and_decode_s32(), except returns 32-bit floating-point samples. + float* drflac_open_and_decode_f32(drflac_read_proc onRead, drflac_seek_proc onSeek, void* pUserData, + unsigned int* channels, unsigned int* sampleRate, + drflac_uint64* totalSampleCount); #ifndef DR_FLAC_NO_STDIO -// Same as drflac_open_and_decode_s32() except opens the decoder from a file. -drflac_int32* drflac_open_and_decode_file_s32(const char* filename, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount); + // Same as drflac_open_and_decode_s32() except opens the decoder from a file. + drflac_int32* drflac_open_and_decode_file_s32(const char* filename, unsigned int* channels, + unsigned int* sampleRate, drflac_uint64* totalSampleCount); -// Same as drflac_open_and_decode_file_s32(), except returns signed 16-bit integer samples. -drflac_int16* drflac_open_and_decode_file_s16(const char* filename, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount); + // Same as drflac_open_and_decode_file_s32(), except returns signed 16-bit integer samples. + drflac_int16* drflac_open_and_decode_file_s16(const char* filename, unsigned int* channels, + unsigned int* sampleRate, drflac_uint64* totalSampleCount); -// Same as drflac_open_and_decode_file_f32(), except returns 32-bit floating-point samples. -float* drflac_open_and_decode_file_f32(const char* filename, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount); + // Same as drflac_open_and_decode_file_f32(), except returns 32-bit floating-point samples. + float* drflac_open_and_decode_file_f32(const char* filename, unsigned int* channels, + unsigned int* sampleRate, drflac_uint64* totalSampleCount); #endif -// Same as drflac_open_and_decode_s32() except opens the decoder from a block of memory. -drflac_int32* drflac_open_and_decode_memory_s32(const void* data, size_t dataSize, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount); - -// Same as drflac_open_and_decode_memory_s32(), except returns signed 16-bit integer samples. -drflac_int16* drflac_open_and_decode_memory_s16(const void* data, size_t dataSize, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount); + // Same as drflac_open_and_decode_s32() except opens the decoder from a block of memory. + drflac_int32* drflac_open_and_decode_memory_s32(const void* data, size_t dataSize, unsigned int* channels, + unsigned int* sampleRate, + drflac_uint64* totalSampleCount); -// Same as drflac_open_and_decode_memory_s32(), except returns 32-bit floating-point samples. -float* drflac_open_and_decode_memory_f32(const void* data, size_t dataSize, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount); + // Same as drflac_open_and_decode_memory_s32(), except returns signed 16-bit integer samples. + drflac_int16* drflac_open_and_decode_memory_s16(const void* data, size_t dataSize, unsigned int* channels, + unsigned int* sampleRate, + drflac_uint64* totalSampleCount); -// Frees memory that was allocated internally by dr_flac. -void drflac_free(void* p); + // Same as drflac_open_and_decode_memory_s32(), except returns 32-bit floating-point samples. + float* drflac_open_and_decode_memory_f32(const void* data, size_t dataSize, unsigned int* channels, + unsigned int* sampleRate, drflac_uint64* totalSampleCount); + // Frees memory that was allocated internally by dr_flac. + void drflac_free(void* p); -// Structure representing an iterator for vorbis comments in a VORBIS_COMMENT metadata block. -typedef struct -{ - drflac_uint32 countRemaining; - const char* pRunningData; -} drflac_vorbis_comment_iterator; + // Structure representing an iterator for vorbis comments in a VORBIS_COMMENT metadata block. + typedef struct + { + drflac_uint32 countRemaining; + const char* pRunningData; + } drflac_vorbis_comment_iterator; + + // Initializes a vorbis comment iterator. This can be used for iterating over the vorbis comments in a + // VORBIS_COMMENT metadata block. + void drflac_init_vorbis_comment_iterator(drflac_vorbis_comment_iterator* pIter, + drflac_uint32 commentCount, const void* pComments); + + // Goes to the next vorbis comment in the given iterator. If null is returned it means there are no more + // comments. The returned string is NOT null terminated. + const char* drflac_next_vorbis_comment(drflac_vorbis_comment_iterator* pIter, + drflac_uint32* pCommentLengthOut); + + // Structure representing an iterator for cuesheet tracks in a CUESHEET metadata block. + typedef struct + { + drflac_uint32 countRemaining; + const char* pRunningData; + } drflac_cuesheet_track_iterator; -// Initializes a vorbis comment iterator. This can be used for iterating over the vorbis comments in a VORBIS_COMMENT +// Packing is important on this structure because we map this directly to the raw data within the CUESHEET // metadata block. -void drflac_init_vorbis_comment_iterator(drflac_vorbis_comment_iterator* pIter, drflac_uint32 commentCount, const void* pComments); - -// Goes to the next vorbis comment in the given iterator. If null is returned it means there are no more comments. The -// returned string is NOT null terminated. -const char* drflac_next_vorbis_comment(drflac_vorbis_comment_iterator* pIter, drflac_uint32* pCommentLengthOut); - - -// Structure representing an iterator for cuesheet tracks in a CUESHEET metadata block. -typedef struct -{ - drflac_uint32 countRemaining; - const char* pRunningData; -} drflac_cuesheet_track_iterator; - -// Packing is important on this structure because we map this directly to the raw data within the CUESHEET metadata block. #pragma pack(4) -typedef struct -{ - drflac_uint64 offset; - drflac_uint8 index; - drflac_uint8 reserved[3]; -} drflac_cuesheet_track_index; + typedef struct + { + drflac_uint64 offset; + drflac_uint8 index; + drflac_uint8 reserved[3]; + } drflac_cuesheet_track_index; #pragma pack() -typedef struct -{ - drflac_uint64 offset; - drflac_uint8 trackNumber; - char ISRC[12]; - drflac_bool8 isAudio; - drflac_bool8 preEmphasis; - drflac_uint8 indexCount; - const drflac_cuesheet_track_index* pIndexPoints; -} drflac_cuesheet_track; - -// Initializes a cuesheet track iterator. This can be used for iterating over the cuesheet tracks in a CUESHEET metadata -// block. -void drflac_init_cuesheet_track_iterator(drflac_cuesheet_track_iterator* pIter, drflac_uint32 trackCount, const void* pTrackData); - -// Goes to the next cuesheet track in the given iterator. If DRFLAC_FALSE is returned it means there are no more comments. -drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter, drflac_cuesheet_track* pCuesheetTrack); - - + typedef struct + { + drflac_uint64 offset; + drflac_uint8 trackNumber; + char ISRC[12]; + drflac_bool8 isAudio; + drflac_bool8 preEmphasis; + drflac_uint8 indexCount; + const drflac_cuesheet_track_index* pIndexPoints; + } drflac_cuesheet_track; + + // Initializes a cuesheet track iterator. This can be used for iterating over the cuesheet tracks in a + // CUESHEET metadata block. + void drflac_init_cuesheet_track_iterator(drflac_cuesheet_track_iterator* pIter, drflac_uint32 trackCount, + const void* pTrackData); + + // Goes to the next cuesheet track in the given iterator. If DRFLAC_FALSE is returned it means there are + // no more comments. + drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter, + drflac_cuesheet_track* pCuesheetTrack); #ifdef __cplusplus } #endif -#endif //dr_flac_h - +#endif // dr_flac_h /////////////////////////////////////////////////////////////////////////////// // @@ -778,13 +823,13 @@ drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter, /////////////////////////////////////////////////////////////////////////////// #ifdef DR_FLAC_IMPLEMENTATION #ifdef __linux__ - #ifndef _BSD_SOURCE - #define _BSD_SOURCE - #endif - #ifndef __USE_BSD - #define __USE_BSD - #endif - #include <endian.h> +#ifndef _BSD_SOURCE +#define _BSD_SOURCE +#endif +#ifndef __USE_BSD +#define __USE_BSD +#endif +#include <endian.h> #endif #include <stdlib.h> @@ -792,113 +837,108 @@ drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter, // CPU architecture. #if defined(__x86_64__) || defined(_M_X64) - #define DRFLAC_X64 +#define DRFLAC_X64 #elif defined(__i386) || defined(_M_IX86) - #define DRFLAC_X86 +#define DRFLAC_X86 #elif defined(__arm__) || defined(_M_ARM) - #define DRFLAC_ARM +#define DRFLAC_ARM #endif // Compile-time CPU feature support. #if !defined(DR_FLAC_NO_SIMD) && (defined(DRFLAC_X86) || defined(DRFLAC_X64)) - #if defined(_MSC_VER) && !defined(__clang__) - #if _MSC_VER >= 1400 - #include <intrin.h> - static void drflac__cpuid(int info[4], int fid) - { - __cpuid(info, fid); - } - #else - #define DRFLAC_NO_CPUID - #endif - #else - #if defined(__GNUC__) || defined(__clang__) - static void drflac__cpuid(int info[4], int fid) - { - // It looks like the -fPIC option uses the ebx register which GCC complains about. We can work around this by just using a different register, the - // specific register of which I'm letting the compiler decide on. The "k" prefix is used to specify a 32-bit register. The {...} syntax is for - // supporting different assembly dialects. - // - // What's basically happening is that we're saving and restoring the ebx register manually. - #if defined(DRFLAC_X86) && defined(__PIC__) - __asm__ __volatile__ ( - "xchg{l} {%%}ebx, %k1;" - "cpuid;" - "xchg{l} {%%}ebx, %k1;" - : "=a"(info[0]), "=&r"(info[1]), "=c"(info[2]), "=d"(info[3]) : "a"(fid), "c"(0) - ); - #else - __asm__ __volatile__ ( - "cpuid" : "=a"(info[0]), "=b"(info[1]), "=c"(info[2]), "=d"(info[3]) : "a"(fid), "c"(0) - ); - #endif - } - #else - #define DRFLAC_NO_CPUID - #endif - #endif +#if defined(_MSC_VER) && !defined(__clang__) +#if _MSC_VER >= 1400 +#include <intrin.h> +static void drflac__cpuid(int info[4], int fid) { __cpuid(info, fid); } #else - #define DRFLAC_NO_CPUID +#define DRFLAC_NO_CPUID +#endif +#else +#if defined(__GNUC__) || defined(__clang__) +static void drflac__cpuid(int info[4], int fid) +{ +// It looks like the -fPIC option uses the ebx register which GCC complains about. We can work around this by +// just using a different register, the specific register of which I'm letting the compiler decide on. The "k" +// prefix is used to specify a 32-bit register. The {...} syntax is for supporting different assembly +// dialects. +// +// What's basically happening is that we're saving and restoring the ebx register manually. +#if defined(DRFLAC_X86) && defined(__PIC__) + __asm__ __volatile__("xchg{l} {%%}ebx, %k1;" + "cpuid;" + "xchg{l} {%%}ebx, %k1;" + : "=a"(info[0]), "=&r"(info[1]), "=c"(info[2]), "=d"(info[3]) + : "a"(fid), "c"(0)); +#else + __asm__ __volatile__("cpuid" + : "=a"(info[0]), "=b"(info[1]), "=c"(info[2]), "=d"(info[3]) + : "a"(fid), "c"(0)); +#endif +} +#else +#define DRFLAC_NO_CPUID +#endif +#endif +#else +#define DRFLAC_NO_CPUID #endif - #if defined(_MSC_VER) && _MSC_VER >= 1500 && (defined(DRFLAC_X86) || defined(DRFLAC_X64)) - #define DRFLAC_HAS_LZCNT_INTRINSIC +#define DRFLAC_HAS_LZCNT_INTRINSIC #elif (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) - #define DRFLAC_HAS_LZCNT_INTRINSIC +#define DRFLAC_HAS_LZCNT_INTRINSIC #elif defined(__clang__) - #if __has_builtin(__builtin_clzll) || __has_builtin(__builtin_clzl) - #define DRFLAC_HAS_LZCNT_INTRINSIC - #endif +#if __has_builtin(__builtin_clzll) || __has_builtin(__builtin_clzl) +#define DRFLAC_HAS_LZCNT_INTRINSIC +#endif #endif #if defined(_MSC_VER) && _MSC_VER >= 1300 - #define DRFLAC_HAS_BYTESWAP16_INTRINSIC - #define DRFLAC_HAS_BYTESWAP32_INTRINSIC - #define DRFLAC_HAS_BYTESWAP64_INTRINSIC +#define DRFLAC_HAS_BYTESWAP16_INTRINSIC +#define DRFLAC_HAS_BYTESWAP32_INTRINSIC +#define DRFLAC_HAS_BYTESWAP64_INTRINSIC #elif defined(__clang__) - #if __has_builtin(__builtin_bswap16) - #define DRFLAC_HAS_BYTESWAP16_INTRINSIC - #endif - #if __has_builtin(__builtin_bswap32) - #define DRFLAC_HAS_BYTESWAP32_INTRINSIC - #endif - #if __has_builtin(__builtin_bswap64) - #define DRFLAC_HAS_BYTESWAP64_INTRINSIC - #endif +#if __has_builtin(__builtin_bswap16) +#define DRFLAC_HAS_BYTESWAP16_INTRINSIC +#endif +#if __has_builtin(__builtin_bswap32) +#define DRFLAC_HAS_BYTESWAP32_INTRINSIC +#endif +#if __has_builtin(__builtin_bswap64) +#define DRFLAC_HAS_BYTESWAP64_INTRINSIC +#endif #elif defined(__GNUC__) - #if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) - #define DRFLAC_HAS_BYTESWAP32_INTRINSIC - #define DRFLAC_HAS_BYTESWAP64_INTRINSIC - #endif - #if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) - #define DRFLAC_HAS_BYTESWAP16_INTRINSIC - #endif +#if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) +#define DRFLAC_HAS_BYTESWAP32_INTRINSIC +#define DRFLAC_HAS_BYTESWAP64_INTRINSIC +#endif +#if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) +#define DRFLAC_HAS_BYTESWAP16_INTRINSIC +#endif #endif - // Standard library stuff. #ifndef DRFLAC_ASSERT #include <assert.h> -#define DRFLAC_ASSERT(expression) assert(expression) +#define DRFLAC_ASSERT(expression) assert(expression) #endif #ifndef DRFLAC_MALLOC -#define DRFLAC_MALLOC(sz) malloc((sz)) +#define DRFLAC_MALLOC(sz) malloc((sz)) #endif #ifndef DRFLAC_REALLOC -#define DRFLAC_REALLOC(p, sz) realloc((p), (sz)) +#define DRFLAC_REALLOC(p, sz) realloc((p), (sz)) #endif #ifndef DRFLAC_FREE -#define DRFLAC_FREE(p) free((p)) +#define DRFLAC_FREE(p) free((p)) #endif #ifndef DRFLAC_COPY_MEMORY -#define DRFLAC_COPY_MEMORY(dst, src, sz) memcpy((dst), (src), (sz)) +#define DRFLAC_COPY_MEMORY(dst, src, sz) memcpy((dst), (src), (sz)) #endif #ifndef DRFLAC_ZERO_MEMORY -#define DRFLAC_ZERO_MEMORY(p, sz) memset((p), 0, (sz)) +#define DRFLAC_ZERO_MEMORY(p, sz) memset((p), 0, (sz)) #endif -#define DRFLAC_MAX_SIMD_VECTOR_SIZE 64 // 64 for AVX-512 in the future. +#define DRFLAC_MAX_SIMD_VECTOR_SIZE 64 // 64 for AVX-512 in the future. #ifdef _MSC_VER #define DRFLAC_INLINE __forceinline @@ -911,32 +951,30 @@ drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter, #endif typedef drflac_int32 drflac_result; -#define DRFLAC_SUCCESS 0 -#define DRFLAC_ERROR -1 // A generic error. -#define DRFLAC_INVALID_ARGS -2 -#define DRFLAC_END_OF_STREAM -128 -#define DRFLAC_CRC_MISMATCH -129 - -#define DRFLAC_SUBFRAME_CONSTANT 0 -#define DRFLAC_SUBFRAME_VERBATIM 1 -#define DRFLAC_SUBFRAME_FIXED 8 -#define DRFLAC_SUBFRAME_LPC 32 -#define DRFLAC_SUBFRAME_RESERVED 255 - -#define DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE 0 +#define DRFLAC_SUCCESS 0 +#define DRFLAC_ERROR -1 // A generic error. +#define DRFLAC_INVALID_ARGS -2 +#define DRFLAC_END_OF_STREAM -128 +#define DRFLAC_CRC_MISMATCH -129 + +#define DRFLAC_SUBFRAME_CONSTANT 0 +#define DRFLAC_SUBFRAME_VERBATIM 1 +#define DRFLAC_SUBFRAME_FIXED 8 +#define DRFLAC_SUBFRAME_LPC 32 +#define DRFLAC_SUBFRAME_RESERVED 255 + +#define DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE 0 #define DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE2 1 -#define DRFLAC_CHANNEL_ASSIGNMENT_INDEPENDENT 0 -#define DRFLAC_CHANNEL_ASSIGNMENT_LEFT_SIDE 8 -#define DRFLAC_CHANNEL_ASSIGNMENT_RIGHT_SIDE 9 -#define DRFLAC_CHANNEL_ASSIGNMENT_MID_SIDE 10 - - -#define drflac_align(x, a) ((((x) + (a) - 1) / (a)) * (a)) -#define drflac_assert DRFLAC_ASSERT -#define drflac_copy_memory DRFLAC_COPY_MEMORY -#define drflac_zero_memory DRFLAC_ZERO_MEMORY +#define DRFLAC_CHANNEL_ASSIGNMENT_INDEPENDENT 0 +#define DRFLAC_CHANNEL_ASSIGNMENT_LEFT_SIDE 8 +#define DRFLAC_CHANNEL_ASSIGNMENT_RIGHT_SIDE 9 +#define DRFLAC_CHANNEL_ASSIGNMENT_MID_SIDE 10 +#define drflac_align(x, a) ((((x) + (a)-1) / (a)) * (a)) +#define drflac_assert DRFLAC_ASSERT +#define drflac_copy_memory DRFLAC_COPY_MEMORY +#define drflac_zero_memory DRFLAC_ZERO_MEMORY // CPU caps. static drflac_bool32 drflac__gIsLZCNTSupported = DRFLAC_FALSE; @@ -944,11 +982,11 @@ static drflac_bool32 drflac__gIsLZCNTSupported = DRFLAC_FALSE; static drflac_bool32 drflac__gIsSSE42Supported = DRFLAC_FALSE; static void drflac__init_cpu_caps() { - int info[4] = {0}; + int info[4] = { 0 }; // LZCNT drflac__cpuid(info, 0x80000001); - drflac__gIsLZCNTSupported = (info[2] & (1 << 5)) != 0; + drflac__gIsLZCNTSupported = (info[2] & (1 << 5)) != 0; // SSE4.2 drflac__cpuid(info, 1); @@ -956,7 +994,6 @@ static void drflac__init_cpu_caps() } #endif - //// Endian Management //// static DRFLAC_INLINE drflac_bool32 drflac__is_little_endian() { @@ -971,33 +1008,30 @@ static DRFLAC_INLINE drflac_bool32 drflac__is_little_endian() static DRFLAC_INLINE drflac_uint16 drflac__swap_endian_uint16(drflac_uint16 n) { #ifdef DRFLAC_HAS_BYTESWAP16_INTRINSIC - #if defined(_MSC_VER) - return _byteswap_ushort(n); - #elif defined(__GNUC__) || defined(__clang__) - return __builtin_bswap16(n); - #else - #error "This compiler does not support the byte swap intrinsic." - #endif +#if defined(_MSC_VER) + return _byteswap_ushort(n); +#elif defined(__GNUC__) || defined(__clang__) + return __builtin_bswap16(n); +#else +#error "This compiler does not support the byte swap intrinsic." +#endif #else - return ((n & 0xFF00) >> 8) | - ((n & 0x00FF) << 8); + return ((n & 0xFF00) >> 8) | ((n & 0x00FF) << 8); #endif } static DRFLAC_INLINE drflac_uint32 drflac__swap_endian_uint32(drflac_uint32 n) { #ifdef DRFLAC_HAS_BYTESWAP32_INTRINSIC - #if defined(_MSC_VER) - return _byteswap_ulong(n); - #elif defined(__GNUC__) || defined(__clang__) - return __builtin_bswap32(n); - #else - #error "This compiler does not support the byte swap intrinsic." - #endif +#if defined(_MSC_VER) + return _byteswap_ulong(n); +#elif defined(__GNUC__) || defined(__clang__) + return __builtin_bswap32(n); #else - return ((n & 0xFF000000) >> 24) | - ((n & 0x00FF0000) >> 8) | - ((n & 0x0000FF00) << 8) | +#error "This compiler does not support the byte swap intrinsic." +#endif +#else + return ((n & 0xFF000000) >> 24) | ((n & 0x00FF0000) >> 8) | ((n & 0x0000FF00) << 8) | ((n & 0x000000FF) << 24); #endif } @@ -1005,32 +1039,28 @@ static DRFLAC_INLINE drflac_uint32 drflac__swap_endian_uint32(drflac_uint32 n) static DRFLAC_INLINE drflac_uint64 drflac__swap_endian_uint64(drflac_uint64 n) { #ifdef DRFLAC_HAS_BYTESWAP64_INTRINSIC - #if defined(_MSC_VER) - return _byteswap_uint64(n); - #elif defined(__GNUC__) || defined(__clang__) - return __builtin_bswap64(n); - #else - #error "This compiler does not support the byte swap intrinsic." - #endif +#if defined(_MSC_VER) + return _byteswap_uint64(n); +#elif defined(__GNUC__) || defined(__clang__) + return __builtin_bswap64(n); +#else +#error "This compiler does not support the byte swap intrinsic." +#endif #else - return ((n & (drflac_uint64)0xFF00000000000000) >> 56) | - ((n & (drflac_uint64)0x00FF000000000000) >> 40) | - ((n & (drflac_uint64)0x0000FF0000000000) >> 24) | - ((n & (drflac_uint64)0x000000FF00000000) >> 8) | - ((n & (drflac_uint64)0x00000000FF000000) << 8) | - ((n & (drflac_uint64)0x0000000000FF0000) << 24) | - ((n & (drflac_uint64)0x000000000000FF00) << 40) | - ((n & (drflac_uint64)0x00000000000000FF) << 56); + return ((n & (drflac_uint64)0xFF00000000000000) >> 56) | ((n & (drflac_uint64)0x00FF000000000000) >> 40) | + ((n & (drflac_uint64)0x0000FF0000000000) >> 24) | ((n & (drflac_uint64)0x000000FF00000000) >> 8) | + ((n & (drflac_uint64)0x00000000FF000000) << 8) | ((n & (drflac_uint64)0x0000000000FF0000) << 24) | + ((n & (drflac_uint64)0x000000000000FF00) << 40) | ((n & (drflac_uint64)0x00000000000000FF) << 56); #endif } - static DRFLAC_INLINE drflac_uint16 drflac__be2host_16(drflac_uint16 n) { #ifdef __linux__ return be16toh(n); #else - if (drflac__is_little_endian()) { + if (drflac__is_little_endian()) + { return drflac__swap_endian_uint16(n); } @@ -1043,7 +1073,8 @@ static DRFLAC_INLINE drflac_uint32 drflac__be2host_32(drflac_uint32 n) #ifdef __linux__ return be32toh(n); #else - if (drflac__is_little_endian()) { + if (drflac__is_little_endian()) + { return drflac__swap_endian_uint32(n); } @@ -1056,7 +1087,8 @@ static DRFLAC_INLINE drflac_uint64 drflac__be2host_64(drflac_uint64 n) #ifdef __linux__ return be64toh(n); #else - if (drflac__is_little_endian()) { + if (drflac__is_little_endian()) + { return drflac__swap_endian_uint64(n); } @@ -1064,13 +1096,13 @@ static DRFLAC_INLINE drflac_uint64 drflac__be2host_64(drflac_uint64 n) #endif } - static DRFLAC_INLINE drflac_uint32 drflac__le2host_32(drflac_uint32 n) { #ifdef __linux__ return le32toh(n); #else - if (!drflac__is_little_endian()) { + if (!drflac__is_little_endian()) + { return drflac__swap_endian_uint32(n); } @@ -1078,7 +1110,6 @@ static DRFLAC_INLINE drflac_uint32 drflac__le2host_32(drflac_uint32 n) #endif } - static DRFLAC_INLINE drflac_uint32 drflac__unsynchsafe_32(drflac_uint32 n) { drflac_uint32 result = 0; @@ -1090,8 +1121,6 @@ static DRFLAC_INLINE drflac_uint32 drflac__unsynchsafe_32(drflac_uint32 n) return result; } - - // The CRC code below is based on this document: http://zlib.net/crc_v3.txt static drflac_uint8 drflac__crc8_table[] = { 0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15, 0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D, @@ -1113,38 +1142,26 @@ static drflac_uint8 drflac__crc8_table[] = { }; static drflac_uint16 drflac__crc16_table[] = { - 0x0000, 0x8005, 0x800F, 0x000A, 0x801B, 0x001E, 0x0014, 0x8011, - 0x8033, 0x0036, 0x003C, 0x8039, 0x0028, 0x802D, 0x8027, 0x0022, - 0x8063, 0x0066, 0x006C, 0x8069, 0x0078, 0x807D, 0x8077, 0x0072, - 0x0050, 0x8055, 0x805F, 0x005A, 0x804B, 0x004E, 0x0044, 0x8041, - 0x80C3, 0x00C6, 0x00CC, 0x80C9, 0x00D8, 0x80DD, 0x80D7, 0x00D2, - 0x00F0, 0x80F5, 0x80FF, 0x00FA, 0x80EB, 0x00EE, 0x00E4, 0x80E1, - 0x00A0, 0x80A5, 0x80AF, 0x00AA, 0x80BB, 0x00BE, 0x00B4, 0x80B1, - 0x8093, 0x0096, 0x009C, 0x8099, 0x0088, 0x808D, 0x8087, 0x0082, - 0x8183, 0x0186, 0x018C, 0x8189, 0x0198, 0x819D, 0x8197, 0x0192, - 0x01B0, 0x81B5, 0x81BF, 0x01BA, 0x81AB, 0x01AE, 0x01A4, 0x81A1, - 0x01E0, 0x81E5, 0x81EF, 0x01EA, 0x81FB, 0x01FE, 0x01F4, 0x81F1, - 0x81D3, 0x01D6, 0x01DC, 0x81D9, 0x01C8, 0x81CD, 0x81C7, 0x01C2, - 0x0140, 0x8145, 0x814F, 0x014A, 0x815B, 0x015E, 0x0154, 0x8151, - 0x8173, 0x0176, 0x017C, 0x8179, 0x0168, 0x816D, 0x8167, 0x0162, - 0x8123, 0x0126, 0x012C, 0x8129, 0x0138, 0x813D, 0x8137, 0x0132, - 0x0110, 0x8115, 0x811F, 0x011A, 0x810B, 0x010E, 0x0104, 0x8101, - 0x8303, 0x0306, 0x030C, 0x8309, 0x0318, 0x831D, 0x8317, 0x0312, - 0x0330, 0x8335, 0x833F, 0x033A, 0x832B, 0x032E, 0x0324, 0x8321, - 0x0360, 0x8365, 0x836F, 0x036A, 0x837B, 0x037E, 0x0374, 0x8371, - 0x8353, 0x0356, 0x035C, 0x8359, 0x0348, 0x834D, 0x8347, 0x0342, - 0x03C0, 0x83C5, 0x83CF, 0x03CA, 0x83DB, 0x03DE, 0x03D4, 0x83D1, - 0x83F3, 0x03F6, 0x03FC, 0x83F9, 0x03E8, 0x83ED, 0x83E7, 0x03E2, - 0x83A3, 0x03A6, 0x03AC, 0x83A9, 0x03B8, 0x83BD, 0x83B7, 0x03B2, - 0x0390, 0x8395, 0x839F, 0x039A, 0x838B, 0x038E, 0x0384, 0x8381, - 0x0280, 0x8285, 0x828F, 0x028A, 0x829B, 0x029E, 0x0294, 0x8291, - 0x82B3, 0x02B6, 0x02BC, 0x82B9, 0x02A8, 0x82AD, 0x82A7, 0x02A2, - 0x82E3, 0x02E6, 0x02EC, 0x82E9, 0x02F8, 0x82FD, 0x82F7, 0x02F2, - 0x02D0, 0x82D5, 0x82DF, 0x02DA, 0x82CB, 0x02CE, 0x02C4, 0x82C1, - 0x8243, 0x0246, 0x024C, 0x8249, 0x0258, 0x825D, 0x8257, 0x0252, - 0x0270, 0x8275, 0x827F, 0x027A, 0x826B, 0x026E, 0x0264, 0x8261, - 0x0220, 0x8225, 0x822F, 0x022A, 0x823B, 0x023E, 0x0234, 0x8231, - 0x8213, 0x0216, 0x021C, 0x8219, 0x0208, 0x820D, 0x8207, 0x0202 + 0x0000, 0x8005, 0x800F, 0x000A, 0x801B, 0x001E, 0x0014, 0x8011, 0x8033, 0x0036, 0x003C, 0x8039, 0x0028, + 0x802D, 0x8027, 0x0022, 0x8063, 0x0066, 0x006C, 0x8069, 0x0078, 0x807D, 0x8077, 0x0072, 0x0050, 0x8055, + 0x805F, 0x005A, 0x804B, 0x004E, 0x0044, 0x8041, 0x80C3, 0x00C6, 0x00CC, 0x80C9, 0x00D8, 0x80DD, 0x80D7, + 0x00D2, 0x00F0, 0x80F5, 0x80FF, 0x00FA, 0x80EB, 0x00EE, 0x00E4, 0x80E1, 0x00A0, 0x80A5, 0x80AF, 0x00AA, + 0x80BB, 0x00BE, 0x00B4, 0x80B1, 0x8093, 0x0096, 0x009C, 0x8099, 0x0088, 0x808D, 0x8087, 0x0082, 0x8183, + 0x0186, 0x018C, 0x8189, 0x0198, 0x819D, 0x8197, 0x0192, 0x01B0, 0x81B5, 0x81BF, 0x01BA, 0x81AB, 0x01AE, + 0x01A4, 0x81A1, 0x01E0, 0x81E5, 0x81EF, 0x01EA, 0x81FB, 0x01FE, 0x01F4, 0x81F1, 0x81D3, 0x01D6, 0x01DC, + 0x81D9, 0x01C8, 0x81CD, 0x81C7, 0x01C2, 0x0140, 0x8145, 0x814F, 0x014A, 0x815B, 0x015E, 0x0154, 0x8151, + 0x8173, 0x0176, 0x017C, 0x8179, 0x0168, 0x816D, 0x8167, 0x0162, 0x8123, 0x0126, 0x012C, 0x8129, 0x0138, + 0x813D, 0x8137, 0x0132, 0x0110, 0x8115, 0x811F, 0x011A, 0x810B, 0x010E, 0x0104, 0x8101, 0x8303, 0x0306, + 0x030C, 0x8309, 0x0318, 0x831D, 0x8317, 0x0312, 0x0330, 0x8335, 0x833F, 0x033A, 0x832B, 0x032E, 0x0324, + 0x8321, 0x0360, 0x8365, 0x836F, 0x036A, 0x837B, 0x037E, 0x0374, 0x8371, 0x8353, 0x0356, 0x035C, 0x8359, + 0x0348, 0x834D, 0x8347, 0x0342, 0x03C0, 0x83C5, 0x83CF, 0x03CA, 0x83DB, 0x03DE, 0x03D4, 0x83D1, 0x83F3, + 0x03F6, 0x03FC, 0x83F9, 0x03E8, 0x83ED, 0x83E7, 0x03E2, 0x83A3, 0x03A6, 0x03AC, 0x83A9, 0x03B8, 0x83BD, + 0x83B7, 0x03B2, 0x0390, 0x8395, 0x839F, 0x039A, 0x838B, 0x038E, 0x0384, 0x8381, 0x0280, 0x8285, 0x828F, + 0x028A, 0x829B, 0x029E, 0x0294, 0x8291, 0x82B3, 0x02B6, 0x02BC, 0x82B9, 0x02A8, 0x82AD, 0x82A7, 0x02A2, + 0x82E3, 0x02E6, 0x02EC, 0x82E9, 0x02F8, 0x82FD, 0x82F7, 0x02F2, 0x02D0, 0x82D5, 0x82DF, 0x02DA, 0x82CB, + 0x02CE, 0x02C4, 0x82C1, 0x8243, 0x0246, 0x024C, 0x8249, 0x0258, 0x825D, 0x8257, 0x0252, 0x0270, 0x8275, + 0x827F, 0x027A, 0x826B, 0x026E, 0x0264, 0x8261, 0x0220, 0x8225, 0x822F, 0x022A, 0x823B, 0x023E, 0x0234, + 0x8231, 0x8213, 0x0216, 0x021C, 0x8219, 0x0208, 0x820D, 0x8207, 0x0202 }; static DRFLAC_INLINE drflac_uint8 drflac_crc8_byte(drflac_uint8 crc, drflac_uint8 data) @@ -1175,20 +1192,30 @@ static DRFLAC_INLINE drflac_uint8 drflac_crc8(drflac_uint8 crc, drflac_uint32 da } return crc; #else - drflac_uint32 wholeBytes = count >> 3; - drflac_uint32 leftoverBits = count - (wholeBytes*8); + drflac_uint32 wholeBytes = count >> 3; + drflac_uint32 leftoverBits = count - (wholeBytes * 8); - static drflac_uint64 leftoverDataMaskTable[8] = { - 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F - }; - drflac_uint64 leftoverDataMask = leftoverDataMaskTable[leftoverBits]; + static drflac_uint64 leftoverDataMaskTable[8] = { 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F }; + drflac_uint64 leftoverDataMask = leftoverDataMaskTable[leftoverBits]; - switch (wholeBytes) { - case 4: crc = drflac_crc8_byte(crc, (drflac_uint8)((data & (0xFF000000UL << leftoverBits)) >> (24 + leftoverBits))); - case 3: crc = drflac_crc8_byte(crc, (drflac_uint8)((data & (0x00FF0000UL << leftoverBits)) >> (16 + leftoverBits))); - case 2: crc = drflac_crc8_byte(crc, (drflac_uint8)((data & (0x0000FF00UL << leftoverBits)) >> ( 8 + leftoverBits))); - case 1: crc = drflac_crc8_byte(crc, (drflac_uint8)((data & (0x000000FFUL << leftoverBits)) >> ( 0 + leftoverBits))); - case 0: if (leftoverBits > 0) crc = (crc << leftoverBits) ^ drflac__crc8_table[(crc >> (8 - leftoverBits)) ^ (data & leftoverDataMask)]; + switch (wholeBytes) + { + case 4: + crc = drflac_crc8_byte( + crc, (drflac_uint8)((data & (0xFF000000UL << leftoverBits)) >> (24 + leftoverBits))); + case 3: + crc = drflac_crc8_byte( + crc, (drflac_uint8)((data & (0x00FF0000UL << leftoverBits)) >> (16 + leftoverBits))); + case 2: + crc = drflac_crc8_byte(crc, + (drflac_uint8)((data & (0x0000FF00UL << leftoverBits)) >> (8 + leftoverBits))); + case 1: + crc = drflac_crc8_byte(crc, + (drflac_uint8)((data & (0x000000FFUL << leftoverBits)) >> (0 + leftoverBits))); + case 0: + if (leftoverBits > 0) + crc = (crc << leftoverBits) ^ + drflac__crc8_table[(crc >> (8 - leftoverBits)) ^ (data & leftoverDataMask)]; } return crc; #endif @@ -1200,26 +1227,36 @@ static DRFLAC_INLINE drflac_uint16 drflac_crc16_byte(drflac_uint16 crc, drflac_u return (crc << 8) ^ drflac__crc16_table[(drflac_uint8)(crc >> 8) ^ data]; } -static DRFLAC_INLINE drflac_uint16 drflac_crc16_bytes(drflac_uint16 crc, drflac_cache_t data, drflac_uint32 byteCount) +static DRFLAC_INLINE drflac_uint16 drflac_crc16_bytes(drflac_uint16 crc, drflac_cache_t data, + drflac_uint32 byteCount) { switch (byteCount) { #ifdef DRFLAC_64BIT - case 8: crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 56) & 0xFF)); - case 7: crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 48) & 0xFF)); - case 6: crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 40) & 0xFF)); - case 5: crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 32) & 0xFF)); + case 8: + crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 56) & 0xFF)); + case 7: + crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 48) & 0xFF)); + case 6: + crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 40) & 0xFF)); + case 5: + crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 32) & 0xFF)); #endif - case 4: crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 24) & 0xFF)); - case 3: crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 16) & 0xFF)); - case 2: crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 8) & 0xFF)); - case 1: crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 0) & 0xFF)); + case 4: + crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 24) & 0xFF)); + case 3: + crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 16) & 0xFF)); + case 2: + crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 8) & 0xFF)); + case 1: + crc = drflac_crc16_byte(crc, (drflac_uint8)((data >> 0) & 0xFF)); } return crc; } -static DRFLAC_INLINE drflac_uint16 drflac_crc16__32bit(drflac_uint16 crc, drflac_uint32 data, drflac_uint32 count) +static DRFLAC_INLINE drflac_uint16 drflac_crc16__32bit(drflac_uint16 crc, drflac_uint32 data, + drflac_uint32 count) { drflac_assert(count <= 64); @@ -1243,28 +1280,39 @@ static DRFLAC_INLINE drflac_uint16 drflac_crc16__32bit(drflac_uint16 crc, drflac return crc; #else - drflac_uint32 wholeBytes = count >> 3; - drflac_uint32 leftoverBits = count - (wholeBytes*8); + drflac_uint32 wholeBytes = count >> 3; + drflac_uint32 leftoverBits = count - (wholeBytes * 8); - static drflac_uint64 leftoverDataMaskTable[8] = { - 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F - }; - drflac_uint64 leftoverDataMask = leftoverDataMaskTable[leftoverBits]; + static drflac_uint64 leftoverDataMaskTable[8] = { 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F }; + drflac_uint64 leftoverDataMask = leftoverDataMaskTable[leftoverBits]; - switch (wholeBytes) { - default: - case 4: crc = drflac_crc16_byte(crc, (drflac_uint8)((data & (0xFF000000UL << leftoverBits)) >> (24 + leftoverBits))); - case 3: crc = drflac_crc16_byte(crc, (drflac_uint8)((data & (0x00FF0000UL << leftoverBits)) >> (16 + leftoverBits))); - case 2: crc = drflac_crc16_byte(crc, (drflac_uint8)((data & (0x0000FF00UL << leftoverBits)) >> ( 8 + leftoverBits))); - case 1: crc = drflac_crc16_byte(crc, (drflac_uint8)((data & (0x000000FFUL << leftoverBits)) >> ( 0 + leftoverBits))); - case 0: if (leftoverBits > 0) crc = (crc << leftoverBits) ^ drflac__crc16_table[(crc >> (16 - leftoverBits)) ^ (data & leftoverDataMask)]; + switch (wholeBytes) + { + default: + case 4: + crc = drflac_crc16_byte( + crc, (drflac_uint8)((data & (0xFF000000UL << leftoverBits)) >> (24 + leftoverBits))); + case 3: + crc = drflac_crc16_byte( + crc, (drflac_uint8)((data & (0x00FF0000UL << leftoverBits)) >> (16 + leftoverBits))); + case 2: + crc = drflac_crc16_byte( + crc, (drflac_uint8)((data & (0x0000FF00UL << leftoverBits)) >> (8 + leftoverBits))); + case 1: + crc = drflac_crc16_byte( + crc, (drflac_uint8)((data & (0x000000FFUL << leftoverBits)) >> (0 + leftoverBits))); + case 0: + if (leftoverBits > 0) + crc = (crc << leftoverBits) ^ + drflac__crc16_table[(crc >> (16 - leftoverBits)) ^ (data & leftoverDataMask)]; } return crc; #endif #endif } -static DRFLAC_INLINE drflac_uint16 drflac_crc16__64bit(drflac_uint16 crc, drflac_uint64 data, drflac_uint32 count) +static DRFLAC_INLINE drflac_uint16 drflac_crc16__64bit(drflac_uint16 crc, drflac_uint64 data, + drflac_uint32 count) { drflac_assert(count <= 64); @@ -1274,31 +1322,56 @@ static DRFLAC_INLINE drflac_uint16 drflac_crc16__64bit(drflac_uint16 crc, drflac (void)count; return 0; #else - drflac_uint32 wholeBytes = count >> 3; - drflac_uint32 leftoverBits = count - (wholeBytes*8); + drflac_uint32 wholeBytes = count >> 3; + drflac_uint32 leftoverBits = count - (wholeBytes * 8); - static drflac_uint64 leftoverDataMaskTable[8] = { - 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F - }; - drflac_uint64 leftoverDataMask = leftoverDataMaskTable[leftoverBits]; + static drflac_uint64 leftoverDataMaskTable[8] = { 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F }; + drflac_uint64 leftoverDataMask = leftoverDataMaskTable[leftoverBits]; - switch (wholeBytes) { - default: - case 8: crc = drflac_crc16_byte(crc, (drflac_uint8)((data & ((drflac_uint64)0xFF00000000000000 << leftoverBits)) >> (56 + leftoverBits))); - case 7: crc = drflac_crc16_byte(crc, (drflac_uint8)((data & ((drflac_uint64)0x00FF000000000000 << leftoverBits)) >> (48 + leftoverBits))); - case 6: crc = drflac_crc16_byte(crc, (drflac_uint8)((data & ((drflac_uint64)0x0000FF0000000000 << leftoverBits)) >> (40 + leftoverBits))); - case 5: crc = drflac_crc16_byte(crc, (drflac_uint8)((data & ((drflac_uint64)0x000000FF00000000 << leftoverBits)) >> (32 + leftoverBits))); - case 4: crc = drflac_crc16_byte(crc, (drflac_uint8)((data & ((drflac_uint64)0x00000000FF000000 << leftoverBits)) >> (24 + leftoverBits))); - case 3: crc = drflac_crc16_byte(crc, (drflac_uint8)((data & ((drflac_uint64)0x0000000000FF0000 << leftoverBits)) >> (16 + leftoverBits))); - case 2: crc = drflac_crc16_byte(crc, (drflac_uint8)((data & ((drflac_uint64)0x000000000000FF00 << leftoverBits)) >> ( 8 + leftoverBits))); - case 1: crc = drflac_crc16_byte(crc, (drflac_uint8)((data & ((drflac_uint64)0x00000000000000FF << leftoverBits)) >> ( 0 + leftoverBits))); - case 0: if (leftoverBits > 0) crc = (crc << leftoverBits) ^ drflac__crc16_table[(crc >> (16 - leftoverBits)) ^ (data & leftoverDataMask)]; + switch (wholeBytes) + { + default: + case 8: + crc = drflac_crc16_byte(crc, + (drflac_uint8)((data & ((drflac_uint64)0xFF00000000000000 << leftoverBits)) >> + (56 + leftoverBits))); + case 7: + crc = drflac_crc16_byte(crc, + (drflac_uint8)((data & ((drflac_uint64)0x00FF000000000000 << leftoverBits)) >> + (48 + leftoverBits))); + case 6: + crc = drflac_crc16_byte(crc, + (drflac_uint8)((data & ((drflac_uint64)0x0000FF0000000000 << leftoverBits)) >> + (40 + leftoverBits))); + case 5: + crc = drflac_crc16_byte(crc, + (drflac_uint8)((data & ((drflac_uint64)0x000000FF00000000 << leftoverBits)) >> + (32 + leftoverBits))); + case 4: + crc = drflac_crc16_byte(crc, + (drflac_uint8)((data & ((drflac_uint64)0x00000000FF000000 << leftoverBits)) >> + (24 + leftoverBits))); + case 3: + crc = drflac_crc16_byte(crc, + (drflac_uint8)((data & ((drflac_uint64)0x0000000000FF0000 << leftoverBits)) >> + (16 + leftoverBits))); + case 2: + crc = drflac_crc16_byte(crc, + (drflac_uint8)((data & ((drflac_uint64)0x000000000000FF00 << leftoverBits)) >> + (8 + leftoverBits))); + case 1: + crc = drflac_crc16_byte(crc, + (drflac_uint8)((data & ((drflac_uint64)0x00000000000000FF << leftoverBits)) >> + (0 + leftoverBits))); + case 0: + if (leftoverBits > 0) + crc = (crc << leftoverBits) ^ + drflac__crc16_table[(crc >> (16 - leftoverBits)) ^ (data & leftoverDataMask)]; } return crc; #endif } - static DRFLAC_INLINE drflac_uint16 drflac_crc16(drflac_uint16 crc, drflac_cache_t data, drflac_uint32 count) { #ifdef DRFLAC_64BIT @@ -1308,7 +1381,6 @@ static DRFLAC_INLINE drflac_uint16 drflac_crc16(drflac_uint16 crc, drflac_cache_ #endif } - #ifdef DRFLAC_64BIT #define drflac__be2host__cache_line drflac__be2host_64 #else @@ -1317,34 +1389,37 @@ static DRFLAC_INLINE drflac_uint16 drflac_crc16(drflac_uint16 crc, drflac_cache_ // BIT READING ATTEMPT #2 // -// This uses a 32- or 64-bit bit-shifted cache - as bits are read, the cache is shifted such that the first valid bit is sitting -// on the most significant bit. It uses the notion of an L1 and L2 cache (borrowed from CPU architecture), where the L1 cache -// is a 32- or 64-bit unsigned integer (depending on whether or not a 32- or 64-bit build is being compiled) and the L2 is an -// array of "cache lines", with each cache line being the same size as the L1. The L2 is a buffer of about 4KB and is where data -// from onRead() is read into. -#define DRFLAC_CACHE_L1_SIZE_BYTES(bs) (sizeof((bs)->cache)) -#define DRFLAC_CACHE_L1_SIZE_BITS(bs) (sizeof((bs)->cache)*8) -#define DRFLAC_CACHE_L1_BITS_REMAINING(bs) (DRFLAC_CACHE_L1_SIZE_BITS(bs) - (bs)->consumedBits) -#define DRFLAC_CACHE_L1_SELECTION_MASK(_bitCount) (~((~(drflac_cache_t)0) >> (_bitCount))) -#define DRFLAC_CACHE_L1_SELECTION_SHIFT(bs, _bitCount) (DRFLAC_CACHE_L1_SIZE_BITS(bs) - (_bitCount)) -#define DRFLAC_CACHE_L1_SELECT(bs, _bitCount) (((bs)->cache) & DRFLAC_CACHE_L1_SELECTION_MASK(_bitCount)) -#define DRFLAC_CACHE_L1_SELECT_AND_SHIFT(bs, _bitCount) (DRFLAC_CACHE_L1_SELECT((bs), (_bitCount)) >> DRFLAC_CACHE_L1_SELECTION_SHIFT((bs), (_bitCount))) -#define DRFLAC_CACHE_L1_SELECT_AND_SHIFT_SAFE(bs, _bitCount)(DRFLAC_CACHE_L1_SELECT((bs), (_bitCount)) >> (DRFLAC_CACHE_L1_SELECTION_SHIFT((bs), (_bitCount)) & (DRFLAC_CACHE_L1_SIZE_BITS(bs)-1))) -#define DRFLAC_CACHE_L2_SIZE_BYTES(bs) (sizeof((bs)->cacheL2)) -#define DRFLAC_CACHE_L2_LINE_COUNT(bs) (DRFLAC_CACHE_L2_SIZE_BYTES(bs) / sizeof((bs)->cacheL2[0])) -#define DRFLAC_CACHE_L2_LINES_REMAINING(bs) (DRFLAC_CACHE_L2_LINE_COUNT(bs) - (bs)->nextL2Line) - +// This uses a 32- or 64-bit bit-shifted cache - as bits are read, the cache is shifted such that the first +// valid bit is sitting on the most significant bit. It uses the notion of an L1 and L2 cache (borrowed from +// CPU architecture), where the L1 cache is a 32- or 64-bit unsigned integer (depending on whether or not a +// 32- or 64-bit build is being compiled) and the L2 is an array of "cache lines", with each cache line being +// the same size as the L1. The L2 is a buffer of about 4KB and is where data from onRead() is read into. +#define DRFLAC_CACHE_L1_SIZE_BYTES(bs) (sizeof((bs)->cache)) +#define DRFLAC_CACHE_L1_SIZE_BITS(bs) (sizeof((bs)->cache) * 8) +#define DRFLAC_CACHE_L1_BITS_REMAINING(bs) (DRFLAC_CACHE_L1_SIZE_BITS(bs) - (bs)->consumedBits) +#define DRFLAC_CACHE_L1_SELECTION_MASK(_bitCount) (~((~(drflac_cache_t)0) >> (_bitCount))) +#define DRFLAC_CACHE_L1_SELECTION_SHIFT(bs, _bitCount) (DRFLAC_CACHE_L1_SIZE_BITS(bs) - (_bitCount)) +#define DRFLAC_CACHE_L1_SELECT(bs, _bitCount) (((bs)->cache) & DRFLAC_CACHE_L1_SELECTION_MASK(_bitCount)) +#define DRFLAC_CACHE_L1_SELECT_AND_SHIFT(bs, _bitCount) \ + (DRFLAC_CACHE_L1_SELECT((bs), (_bitCount)) >> DRFLAC_CACHE_L1_SELECTION_SHIFT((bs), (_bitCount))) +#define DRFLAC_CACHE_L1_SELECT_AND_SHIFT_SAFE(bs, _bitCount) \ + (DRFLAC_CACHE_L1_SELECT((bs), (_bitCount)) >> \ + (DRFLAC_CACHE_L1_SELECTION_SHIFT((bs), (_bitCount)) & (DRFLAC_CACHE_L1_SIZE_BITS(bs) - 1))) +#define DRFLAC_CACHE_L2_SIZE_BYTES(bs) (sizeof((bs)->cacheL2)) +#define DRFLAC_CACHE_L2_LINE_COUNT(bs) (DRFLAC_CACHE_L2_SIZE_BYTES(bs) / sizeof((bs)->cacheL2[0])) +#define DRFLAC_CACHE_L2_LINES_REMAINING(bs) (DRFLAC_CACHE_L2_LINE_COUNT(bs) - (bs)->nextL2Line) #ifndef DR_FLAC_NO_CRC static DRFLAC_INLINE void drflac__reset_crc16(drflac_bs* bs) { - bs->crc16 = 0; + bs->crc16 = 0; bs->crc16CacheIgnoredBytes = bs->consumedBits >> 3; } static DRFLAC_INLINE void drflac__update_crc16(drflac_bs* bs) { - bs->crc16 = drflac_crc16_bytes(bs->crc16, bs->crc16Cache, DRFLAC_CACHE_L1_SIZE_BYTES(bs) - bs->crc16CacheIgnoredBytes); + bs->crc16 = drflac_crc16_bytes(bs->crc16, bs->crc16Cache, + DRFLAC_CACHE_L1_SIZE_BYTES(bs) - bs->crc16CacheIgnoredBytes); bs->crc16CacheIgnoredBytes = 0; } @@ -1353,16 +1428,20 @@ static DRFLAC_INLINE drflac_uint16 drflac__flush_crc16(drflac_bs* bs) // We should never be flushing in a situation where we are not aligned on a byte boundary. drflac_assert((DRFLAC_CACHE_L1_BITS_REMAINING(bs) & 7) == 0); - // The bits that were read from the L1 cache need to be accumulated. The number of bytes needing to be accumulated is determined - // by the number of bits that have been consumed. - if (DRFLAC_CACHE_L1_BITS_REMAINING(bs) == 0) { + // The bits that were read from the L1 cache need to be accumulated. The number of bytes needing to be + // accumulated is determined by the number of bits that have been consumed. + if (DRFLAC_CACHE_L1_BITS_REMAINING(bs) == 0) + { drflac__update_crc16(bs); - } else { + } + else + { // We only accumulate the consumed bits. - bs->crc16 = drflac_crc16_bytes(bs->crc16, bs->crc16Cache >> DRFLAC_CACHE_L1_BITS_REMAINING(bs), (bs->consumedBits >> 3) - bs->crc16CacheIgnoredBytes); + bs->crc16 = drflac_crc16_bytes(bs->crc16, bs->crc16Cache >> DRFLAC_CACHE_L1_BITS_REMAINING(bs), + (bs->consumedBits >> 3) - bs->crc16CacheIgnoredBytes); - // The bits that we just accumulated should never be accumulated again. We need to keep track of how many bytes were accumulated - // so we can handle that later. + // The bits that we just accumulated should never be accumulated again. We need to keep track of how + // many bytes were accumulated so we can handle that later. bs->crc16CacheIgnoredBytes = bs->consumedBits >> 3; } @@ -1373,48 +1452,56 @@ static DRFLAC_INLINE drflac_uint16 drflac__flush_crc16(drflac_bs* bs) static DRFLAC_INLINE drflac_bool32 drflac__reload_l1_cache_from_l2(drflac_bs* bs) { // Fast path. Try loading straight from L2. - if (bs->nextL2Line < DRFLAC_CACHE_L2_LINE_COUNT(bs)) { + if (bs->nextL2Line < DRFLAC_CACHE_L2_LINE_COUNT(bs)) + { bs->cache = bs->cacheL2[bs->nextL2Line++]; return DRFLAC_TRUE; } - // If we get here it means we've run out of data in the L2 cache. We'll need to fetch more from the client, if there's - // any left. - if (bs->unalignedByteCount > 0) { - return DRFLAC_FALSE; // If we have any unaligned bytes it means there's no more aligned bytes left in the client. + // If we get here it means we've run out of data in the L2 cache. We'll need to fetch more from the + // client, if there's any left. + if (bs->unalignedByteCount > 0) + { + return DRFLAC_FALSE; // If we have any unaligned bytes it means there's no more aligned bytes left in + // the client. } size_t bytesRead = bs->onRead(bs->pUserData, bs->cacheL2, DRFLAC_CACHE_L2_SIZE_BYTES(bs)); bs->nextL2Line = 0; - if (bytesRead == DRFLAC_CACHE_L2_SIZE_BYTES(bs)) { + if (bytesRead == DRFLAC_CACHE_L2_SIZE_BYTES(bs)) + { bs->cache = bs->cacheL2[bs->nextL2Line++]; return DRFLAC_TRUE; } - // If we get here it means we were unable to retrieve enough data to fill the entire L2 cache. It probably - // means we've just reached the end of the file. We need to move the valid data down to the end of the buffer - // and adjust the index of the next line accordingly. Also keep in mind that the L2 cache must be aligned to - // the size of the L1 so we'll need to seek backwards by any misaligned bytes. + // means we've just reached the end of the file. We need to move the valid data down to the end of the + // buffer and adjust the index of the next line accordingly. Also keep in mind that the L2 cache must be + // aligned to the size of the L1 so we'll need to seek backwards by any misaligned bytes. size_t alignedL1LineCount = bytesRead / DRFLAC_CACHE_L1_SIZE_BYTES(bs); // We need to keep track of any unaligned bytes for later use. bs->unalignedByteCount = bytesRead - (alignedL1LineCount * DRFLAC_CACHE_L1_SIZE_BYTES(bs)); - if (bs->unalignedByteCount > 0) { + if (bs->unalignedByteCount > 0) + { bs->unalignedCache = bs->cacheL2[alignedL1LineCount]; } - if (alignedL1LineCount > 0) { + if (alignedL1LineCount > 0) + { size_t offset = DRFLAC_CACHE_L2_LINE_COUNT(bs) - alignedL1LineCount; - for (size_t i = alignedL1LineCount; i > 0; --i) { - bs->cacheL2[i-1 + offset] = bs->cacheL2[i-1]; + for (size_t i = alignedL1LineCount; i > 0; --i) + { + bs->cacheL2[i - 1 + offset] = bs->cacheL2[i - 1]; } bs->nextL2Line = (drflac_uint32)offset; - bs->cache = bs->cacheL2[bs->nextL2Line++]; + bs->cache = bs->cacheL2[bs->nextL2Line++]; return DRFLAC_TRUE; - } else { + } + else + { // If we get into this branch it means we weren't able to load any L1-aligned data. bs->nextL2Line = DRFLAC_CACHE_L2_LINE_COUNT(bs); return DRFLAC_FALSE; @@ -1428,8 +1515,9 @@ static drflac_bool32 drflac__reload_cache(drflac_bs* bs) #endif // Fast path. Try just moving the next value in the L2 cache to the L1 cache. - if (drflac__reload_l1_cache_from_l2(bs)) { - bs->cache = drflac__be2host__cache_line(bs->cache); + if (drflac__reload_l1_cache_from_l2(bs)) + { + bs->cache = drflac__be2host__cache_line(bs->cache); bs->consumedBits = 0; #ifndef DR_FLAC_NO_CRC bs->crc16Cache = bs->cache; @@ -1439,12 +1527,14 @@ static drflac_bool32 drflac__reload_cache(drflac_bs* bs) // Slow path. - // If we get here it means we have failed to load the L1 cache from the L2. Likely we've just reached the end of the stream and the last - // few bytes did not meet the alignment requirements for the L2 cache. In this case we need to fall back to a slower path and read the - // data from the unaligned cache. + // If we get here it means we have failed to load the L1 cache from the L2. Likely we've just reached the + // end of the stream and the last few bytes did not meet the alignment requirements for the L2 cache. In + // this case we need to fall back to a slower path and read the data from the unaligned cache. size_t bytesRead = bs->unalignedByteCount; - if (bytesRead == 0) { - bs->consumedBits = DRFLAC_CACHE_L1_SIZE_BITS(bs); // <-- The stream has been exhausted, so marked the bits as consumed. + if (bytesRead == 0) + { + bs->consumedBits = DRFLAC_CACHE_L1_SIZE_BITS( + bs); // <-- The stream has been exhausted, so marked the bits as consumed. return DRFLAC_FALSE; } @@ -1452,11 +1542,14 @@ static drflac_bool32 drflac__reload_cache(drflac_bs* bs) bs->consumedBits = (drflac_uint32)(DRFLAC_CACHE_L1_SIZE_BYTES(bs) - bytesRead) * 8; bs->cache = drflac__be2host__cache_line(bs->unalignedCache); - bs->cache &= DRFLAC_CACHE_L1_SELECTION_MASK(DRFLAC_CACHE_L1_BITS_REMAINING(bs)); // <-- Make sure the consumed bits are always set to zero. Other parts of the library depend on this property. - bs->unalignedByteCount = 0; // <-- At this point the unaligned bytes have been moved into the cache and we thus have no more unaligned bytes. + bs->cache &= DRFLAC_CACHE_L1_SELECTION_MASK( + DRFLAC_CACHE_L1_BITS_REMAINING(bs)); // <-- Make sure the consumed bits are always set to zero. Other + // parts of the library depend on this property. + bs->unalignedByteCount = 0; // <-- At this point the unaligned bytes have been moved into the cache and we + // thus have no more unaligned bytes. #ifndef DR_FLAC_NO_CRC - bs->crc16Cache = bs->cache >> bs->consumedBits; + bs->crc16Cache = bs->cache >> bs->consumedBits; bs->crc16CacheIgnoredBytes = bs->consumedBits >> 3; #endif return DRFLAC_TRUE; @@ -1464,65 +1557,76 @@ static drflac_bool32 drflac__reload_cache(drflac_bs* bs) static void drflac__reset_cache(drflac_bs* bs) { - bs->nextL2Line = DRFLAC_CACHE_L2_LINE_COUNT(bs); // <-- This clears the L2 cache. - bs->consumedBits = DRFLAC_CACHE_L1_SIZE_BITS(bs); // <-- This clears the L1 cache. - bs->cache = 0; - bs->unalignedByteCount = 0; // <-- This clears the trailing unaligned bytes. - bs->unalignedCache = 0; + bs->nextL2Line = DRFLAC_CACHE_L2_LINE_COUNT(bs); // <-- This clears the L2 cache. + bs->consumedBits = DRFLAC_CACHE_L1_SIZE_BITS(bs); // <-- This clears the L1 cache. + bs->cache = 0; + bs->unalignedByteCount = 0; // <-- This clears the trailing unaligned bytes. + bs->unalignedCache = 0; #ifndef DR_FLAC_NO_CRC - bs->crc16Cache = 0; + bs->crc16Cache = 0; bs->crc16CacheIgnoredBytes = 0; #endif } - -static DRFLAC_INLINE drflac_bool32 drflac__read_uint32(drflac_bs* bs, unsigned int bitCount, drflac_uint32* pResultOut) +static DRFLAC_INLINE drflac_bool32 drflac__read_uint32(drflac_bs* bs, unsigned int bitCount, + drflac_uint32* pResultOut) { drflac_assert(bs != NULL); drflac_assert(pResultOut != NULL); drflac_assert(bitCount > 0); drflac_assert(bitCount <= 32); - if (bs->consumedBits == DRFLAC_CACHE_L1_SIZE_BITS(bs)) { - if (!drflac__reload_cache(bs)) { + if (bs->consumedBits == DRFLAC_CACHE_L1_SIZE_BITS(bs)) + { + if (!drflac__reload_cache(bs)) + { return DRFLAC_FALSE; } } - if (bitCount <= DRFLAC_CACHE_L1_BITS_REMAINING(bs)) { - // If we want to load all 32-bits from a 32-bit cache we need to do it slightly differently because we can't do - // a 32-bit shift on a 32-bit integer. This will never be the case on 64-bit caches, so we can have a slightly - // more optimal solution for this. + if (bitCount <= DRFLAC_CACHE_L1_BITS_REMAINING(bs)) + { + // If we want to load all 32-bits from a 32-bit cache we need to do it slightly differently because we + // can't do a 32-bit shift on a 32-bit integer. This will never be the case on 64-bit caches, so we + // can have a slightly more optimal solution for this. #ifdef DRFLAC_64BIT *pResultOut = (drflac_uint32)DRFLAC_CACHE_L1_SELECT_AND_SHIFT(bs, bitCount); bs->consumedBits += bitCount; bs->cache <<= bitCount; #else - if (bitCount < DRFLAC_CACHE_L1_SIZE_BITS(bs)) { + if (bitCount < DRFLAC_CACHE_L1_SIZE_BITS(bs)) + { *pResultOut = (drflac_uint32)DRFLAC_CACHE_L1_SELECT_AND_SHIFT(bs, bitCount); bs->consumedBits += bitCount; bs->cache <<= bitCount; - } else { + } + else + { // Cannot shift by 32-bits, so need to do it differently. - *pResultOut = (drflac_uint32)bs->cache; + *pResultOut = (drflac_uint32)bs->cache; bs->consumedBits = DRFLAC_CACHE_L1_SIZE_BITS(bs); - bs->cache = 0; + bs->cache = 0; } #endif return DRFLAC_TRUE; - } else { - // It straddles the cached data. It will never cover more than the next chunk. We just read the number in two parts and combine them. + } + else + { + // It straddles the cached data. It will never cover more than the next chunk. We just read the number + // in two parts and combine them. drflac_uint32 bitCountHi = DRFLAC_CACHE_L1_BITS_REMAINING(bs); drflac_uint32 bitCountLo = bitCount - bitCountHi; - drflac_uint32 resultHi = (drflac_uint32)DRFLAC_CACHE_L1_SELECT_AND_SHIFT(bs, bitCountHi); + drflac_uint32 resultHi = (drflac_uint32)DRFLAC_CACHE_L1_SELECT_AND_SHIFT(bs, bitCountHi); - if (!drflac__reload_cache(bs)) { + if (!drflac__reload_cache(bs)) + { return DRFLAC_FALSE; } - *pResultOut = (resultHi << bitCountLo) | (drflac_uint32)DRFLAC_CACHE_L1_SELECT_AND_SHIFT(bs, bitCountLo); + *pResultOut = + (resultHi << bitCountLo) | (drflac_uint32)DRFLAC_CACHE_L1_SELECT_AND_SHIFT(bs, bitCountLo); bs->consumedBits += bitCountLo; bs->cache <<= bitCountLo; return DRFLAC_TRUE; @@ -1537,11 +1641,12 @@ static drflac_bool32 drflac__read_int32(drflac_bs* bs, unsigned int bitCount, dr drflac_assert(bitCount <= 32); drflac_uint32 result; - if (!drflac__read_uint32(bs, bitCount, &result)) { + if (!drflac__read_uint32(bs, bitCount, &result)) + { return DRFLAC_FALSE; } - drflac_uint32 signbit = ((result >> (bitCount-1)) & 0x01); + drflac_uint32 signbit = ((result >> (bitCount - 1)) & 0x01); result |= (~signbit + 1) << bitCount; *pResult = (drflac_int32)result; @@ -1552,15 +1657,17 @@ static drflac_bool32 drflac__read_int32(drflac_bs* bs, unsigned int bitCount, dr static drflac_bool32 drflac__read_uint64(drflac_bs* bs, unsigned int bitCount, drflac_uint64* pResultOut) { drflac_assert(bitCount <= 64); - drflac_assert(bitCount > 32); + drflac_assert(bitCount > 32); drflac_uint32 resultHi; - if (!drflac__read_uint32(bs, bitCount - 32, &resultHi)) { + if (!drflac__read_uint32(bs, bitCount - 32, &resultHi)) + { return DRFLAC_FALSE; } drflac_uint32 resultLo; - if (!drflac__read_uint32(bs, 32, &resultLo)) { + if (!drflac__read_uint32(bs, 32, &resultLo)) + { return DRFLAC_FALSE; } @@ -1596,7 +1703,8 @@ static drflac_bool32 drflac__read_uint16(drflac_bs* bs, unsigned int bitCount, d drflac_assert(bitCount <= 16); drflac_uint32 result; - if (!drflac__read_uint32(bs, bitCount, &result)) { + if (!drflac__read_uint32(bs, bitCount, &result)) + { return DRFLAC_FALSE; } @@ -1630,7 +1738,8 @@ static drflac_bool32 drflac__read_uint8(drflac_bs* bs, unsigned int bitCount, dr drflac_assert(bitCount <= 8); drflac_uint32 result; - if (!drflac__read_uint32(bs, bitCount, &result)) { + if (!drflac__read_uint32(bs, bitCount, &result)) + { return DRFLAC_FALSE; } @@ -1646,7 +1755,8 @@ static drflac_bool32 drflac__read_int8(drflac_bs* bs, unsigned int bitCount, drf drflac_assert(bitCount <= 8); drflac_int32 result; - if (!drflac__read_int32(bs, bitCount, &result)) { + if (!drflac__read_int32(bs, bitCount, &result)) + { return DRFLAC_FALSE; } @@ -1654,32 +1764,39 @@ static drflac_bool32 drflac__read_int8(drflac_bs* bs, unsigned int bitCount, drf return DRFLAC_TRUE; } - static drflac_bool32 drflac__seek_bits(drflac_bs* bs, size_t bitsToSeek) { - if (bitsToSeek <= DRFLAC_CACHE_L1_BITS_REMAINING(bs)) { + if (bitsToSeek <= DRFLAC_CACHE_L1_BITS_REMAINING(bs)) + { bs->consumedBits += (drflac_uint32)bitsToSeek; bs->cache <<= bitsToSeek; return DRFLAC_TRUE; - } else { - // It straddles the cached data. This function isn't called too frequently so I'm favouring simplicity here. - bitsToSeek -= DRFLAC_CACHE_L1_BITS_REMAINING(bs); + } + else + { + // It straddles the cached data. This function isn't called too frequently so I'm favouring simplicity + // here. + bitsToSeek -= DRFLAC_CACHE_L1_BITS_REMAINING(bs); bs->consumedBits += DRFLAC_CACHE_L1_BITS_REMAINING(bs); - bs->cache = 0; + bs->cache = 0; // Simple case. Seek in groups of the same number as bits that fit within a cache line. #ifdef DRFLAC_64BIT - while (bitsToSeek >= DRFLAC_CACHE_L1_SIZE_BITS(bs)) { + while (bitsToSeek >= DRFLAC_CACHE_L1_SIZE_BITS(bs)) + { drflac_uint64 bin; - if (!drflac__read_uint64(bs, DRFLAC_CACHE_L1_SIZE_BITS(bs), &bin)) { + if (!drflac__read_uint64(bs, DRFLAC_CACHE_L1_SIZE_BITS(bs), &bin)) + { return DRFLAC_FALSE; } bitsToSeek -= DRFLAC_CACHE_L1_SIZE_BITS(bs); } #else - while (bitsToSeek >= DRFLAC_CACHE_L1_SIZE_BITS(bs)) { + while (bitsToSeek >= DRFLAC_CACHE_L1_SIZE_BITS(bs)) + { drflac_uint32 bin; - if (!drflac__read_uint32(bs, DRFLAC_CACHE_L1_SIZE_BITS(bs), &bin)) { + if (!drflac__read_uint32(bs, DRFLAC_CACHE_L1_SIZE_BITS(bs), &bin)) + { return DRFLAC_FALSE; } bitsToSeek -= DRFLAC_CACHE_L1_SIZE_BITS(bs); @@ -1687,18 +1804,22 @@ static drflac_bool32 drflac__seek_bits(drflac_bs* bs, size_t bitsToSeek) #endif // Whole leftover bytes. - while (bitsToSeek >= 8) { + while (bitsToSeek >= 8) + { drflac_uint8 bin; - if (!drflac__read_uint8(bs, 8, &bin)) { + if (!drflac__read_uint8(bs, 8, &bin)) + { return DRFLAC_FALSE; } bitsToSeek -= 8; } // Leftover bits. - if (bitsToSeek > 0) { + if (bitsToSeek > 0) + { drflac_uint8 bin; - if (!drflac__read_uint8(bs, (drflac_uint32)bitsToSeek, &bin)) { + if (!drflac__read_uint8(bs, (drflac_uint32)bitsToSeek, &bin)) + { return DRFLAC_FALSE; } bitsToSeek = 0; // <-- Necessary for the assert below. @@ -1709,38 +1830,47 @@ static drflac_bool32 drflac__seek_bits(drflac_bs* bs, size_t bitsToSeek) } } - -// This function moves the bit streamer to the first bit after the sync code (bit 15 of the of the frame header). It will also update the CRC-16. +// This function moves the bit streamer to the first bit after the sync code (bit 15 of the of the frame +// header). It will also update the CRC-16. static drflac_bool32 drflac__find_and_seek_to_next_sync_code(drflac_bs* bs) { drflac_assert(bs != NULL); - // The sync code is always aligned to 8 bits. This is convenient for us because it means we can do byte-aligned movements. The first - // thing to do is align to the next byte. - if (!drflac__seek_bits(bs, DRFLAC_CACHE_L1_BITS_REMAINING(bs) & 7)) { + // The sync code is always aligned to 8 bits. This is convenient for us because it means we can do + // byte-aligned movements. The first thing to do is align to the next byte. + if (!drflac__seek_bits(bs, DRFLAC_CACHE_L1_BITS_REMAINING(bs) & 7)) + { return DRFLAC_FALSE; } - for (;;) { + for (;;) + { #ifndef DR_FLAC_NO_CRC drflac__reset_crc16(bs); #endif drflac_uint8 hi; - if (!drflac__read_uint8(bs, 8, &hi)) { + if (!drflac__read_uint8(bs, 8, &hi)) + { return DRFLAC_FALSE; } - if (hi == 0xFF) { + if (hi == 0xFF) + { drflac_uint8 lo; - if (!drflac__read_uint8(bs, 6, &lo)) { + if (!drflac__read_uint8(bs, 6, &lo)) + { return DRFLAC_FALSE; } - if (lo == 0x3E) { + if (lo == 0x3E) + { return DRFLAC_TRUE; - } else { - if (!drflac__seek_bits(bs, DRFLAC_CACHE_L1_BITS_REMAINING(bs) & 7)) { + } + else + { + if (!drflac__seek_bits(bs, DRFLAC_CACHE_L1_BITS_REMAINING(bs) & 7)) + { return DRFLAC_FALSE; } } @@ -1748,40 +1878,62 @@ static drflac_bool32 drflac__find_and_seek_to_next_sync_code(drflac_bs* bs) } // Should never get here. - //return DRFLAC_FALSE; + // return DRFLAC_FALSE; } - #if !defined(DR_FLAC_NO_SIMD) && defined(DRFLAC_HAS_LZCNT_INTRINSIC) #define DRFLAC_IMPLEMENT_CLZ_LZCNT #endif -#if defined(_MSC_VER) && _MSC_VER >= 1400 && (defined(DRFLAC_X64) || defined(DRFLAC_X86)) +#if defined(_MSC_VER) && _MSC_VER >= 1400 && (defined(DRFLAC_X64) || defined(DRFLAC_X86)) #define DRFLAC_IMPLEMENT_CLZ_MSVC #endif static DRFLAC_INLINE drflac_uint32 drflac__clz_software(drflac_cache_t x) { - static drflac_uint32 clz_table_4[] = { - 0, - 4, - 3, 3, - 2, 2, 2, 2, - 1, 1, 1, 1, 1, 1, 1, 1 - }; + static drflac_uint32 clz_table_4[] = { 0, 4, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1 }; - drflac_uint32 n = clz_table_4[x >> (sizeof(x)*8 - 4)]; - if (n == 0) { + drflac_uint32 n = clz_table_4[x >> (sizeof(x) * 8 - 4)]; + if (n == 0) + { #ifdef DRFLAC_64BIT - if ((x & 0xFFFFFFFF00000000ULL) == 0) { n = 32; x <<= 32; } - if ((x & 0xFFFF000000000000ULL) == 0) { n += 16; x <<= 16; } - if ((x & 0xFF00000000000000ULL) == 0) { n += 8; x <<= 8; } - if ((x & 0xF000000000000000ULL) == 0) { n += 4; x <<= 4; } + if ((x & 0xFFFFFFFF00000000ULL) == 0) + { + n = 32; + x <<= 32; + } + if ((x & 0xFFFF000000000000ULL) == 0) + { + n += 16; + x <<= 16; + } + if ((x & 0xFF00000000000000ULL) == 0) + { + n += 8; + x <<= 8; + } + if ((x & 0xF000000000000000ULL) == 0) + { + n += 4; + x <<= 4; + } #else - if ((x & 0xFFFF0000) == 0) { n = 16; x <<= 16; } - if ((x & 0xFF000000) == 0) { n += 8; x <<= 8; } - if ((x & 0xF0000000) == 0) { n += 4; x <<= 4; } + if ((x & 0xFFFF0000) == 0) + { + n = 16; + x <<= 16; + } + if ((x & 0xFF000000) == 0) + { + n += 8; + x <<= 8; + } + if ((x & 0xF0000000) == 0) + { + n += 4; + x <<= 4; + } #endif - n += clz_table_4[x >> (sizeof(x)*8 - 4)]; + n += clz_table_4[x >> (sizeof(x) * 8 - 4)]; } return n - 1; @@ -1801,22 +1953,22 @@ static DRFLAC_INLINE drflac_bool32 drflac__is_lzcnt_supported() static DRFLAC_INLINE drflac_uint32 drflac__clz_lzcnt(drflac_cache_t x) { #if defined(_MSC_VER) && !defined(__clang__) - #ifdef DRFLAC_64BIT - return (drflac_uint32)__lzcnt64(x); - #else - return (drflac_uint32)__lzcnt(x); - #endif +#ifdef DRFLAC_64BIT + return (drflac_uint32)__lzcnt64(x); #else - #if defined(__GNUC__) || defined(__clang__) - #ifdef DRFLAC_64BIT - return (drflac_uint32)__builtin_clzll((unsigned long long)x); - #else - return (drflac_uint32)__builtin_clzl((unsigned long)x); - #endif - #else - // Unsupported compiler. - #error "This compiler does not support the lzcnt intrinsic." - #endif + return (drflac_uint32)__lzcnt(x); +#endif +#else +#if defined(__GNUC__) || defined(__clang__) +#ifdef DRFLAC_64BIT + return (drflac_uint32)__builtin_clzll((unsigned long long)x); +#else + return (drflac_uint32)__builtin_clzl((unsigned long)x); +#endif +#else +// Unsupported compiler. +#error "This compiler does not support the lzcnt intrinsic." +#endif #endif } #endif @@ -1832,17 +1984,20 @@ static DRFLAC_INLINE drflac_uint32 drflac__clz_msvc(drflac_cache_t x) #else _BitScanReverse((unsigned long*)&n, x); #endif - return sizeof(x)*8 - n - 1; + return sizeof(x) * 8 - n - 1; } #endif static DRFLAC_INLINE drflac_uint32 drflac__clz(drflac_cache_t x) { - // This function assumes at least one bit is set. Checking for 0 needs to be done at a higher level, outside this function. + // This function assumes at least one bit is set. Checking for 0 needs to be done at a higher level, + // outside this function. #ifdef DRFLAC_IMPLEMENT_CLZ_LZCNT - if (drflac__is_lzcnt_supported()) { + if (drflac__is_lzcnt_supported()) + { return drflac__clz_lzcnt(x); - } else + } + else #endif { #ifdef DRFLAC_IMPLEMENT_CLZ_MSVC @@ -1853,13 +2008,14 @@ static DRFLAC_INLINE drflac_uint32 drflac__clz(drflac_cache_t x) } } - static inline drflac_bool32 drflac__seek_past_next_set_bit(drflac_bs* bs, unsigned int* pOffsetOut) { drflac_uint32 zeroCounter = 0; - while (bs->cache == 0) { + while (bs->cache == 0) + { zeroCounter += (drflac_uint32)DRFLAC_CACHE_L1_BITS_REMAINING(bs); - if (!drflac__reload_cache(bs)) { + if (!drflac__reload_cache(bs)) + { return DRFLAC_FALSE; } } @@ -1874,37 +2030,45 @@ static inline drflac_bool32 drflac__seek_past_next_set_bit(drflac_bs* bs, unsign return DRFLAC_TRUE; } - - static drflac_bool32 drflac__seek_to_byte(drflac_bs* bs, drflac_uint64 offsetFromStart) { drflac_assert(bs != NULL); drflac_assert(offsetFromStart > 0); - // Seeking from the start is not quite as trivial as it sounds because the onSeek callback takes a signed 32-bit integer (which - // is intentional because it simplifies the implementation of the onSeek callbacks), however offsetFromStart is unsigned 64-bit. - // To resolve we just need to do an initial seek from the start, and then a series of offset seeks to make up the remainder. - if (offsetFromStart > 0x7FFFFFFF) { + // Seeking from the start is not quite as trivial as it sounds because the onSeek callback takes a signed + // 32-bit integer (which is intentional because it simplifies the implementation of the onSeek callbacks), + // however offsetFromStart is unsigned 64-bit. To resolve we just need to do an initial seek from the + // start, and then a series of offset seeks to make up the remainder. + if (offsetFromStart > 0x7FFFFFFF) + { drflac_uint64 bytesRemaining = offsetFromStart; - if (!bs->onSeek(bs->pUserData, 0x7FFFFFFF, drflac_seek_origin_start)) { + if (!bs->onSeek(bs->pUserData, 0x7FFFFFFF, drflac_seek_origin_start)) + { return DRFLAC_FALSE; } bytesRemaining -= 0x7FFFFFFF; - while (bytesRemaining > 0x7FFFFFFF) { - if (!bs->onSeek(bs->pUserData, 0x7FFFFFFF, drflac_seek_origin_current)) { + while (bytesRemaining > 0x7FFFFFFF) + { + if (!bs->onSeek(bs->pUserData, 0x7FFFFFFF, drflac_seek_origin_current)) + { return DRFLAC_FALSE; } bytesRemaining -= 0x7FFFFFFF; } - if (bytesRemaining > 0) { - if (!bs->onSeek(bs->pUserData, (int)bytesRemaining, drflac_seek_origin_current)) { + if (bytesRemaining > 0) + { + if (!bs->onSeek(bs->pUserData, (int)bytesRemaining, drflac_seek_origin_current)) + { return DRFLAC_FALSE; } } - } else { - if (!bs->onSeek(bs->pUserData, (int)offsetFromStart, drflac_seek_origin_start)) { + } + else + { + if (!bs->onSeek(bs->pUserData, (int)offsetFromStart, drflac_seek_origin_start)) + { return DRFLAC_FALSE; } } @@ -1914,51 +2078,68 @@ static drflac_bool32 drflac__seek_to_byte(drflac_bs* bs, drflac_uint64 offsetFro return DRFLAC_TRUE; } - -static drflac_result drflac__read_utf8_coded_number(drflac_bs* bs, drflac_uint64* pNumberOut, drflac_uint8* pCRCOut) +static drflac_result drflac__read_utf8_coded_number(drflac_bs* bs, drflac_uint64* pNumberOut, + drflac_uint8* pCRCOut) { drflac_assert(bs != NULL); drflac_assert(pNumberOut != NULL); drflac_uint8 crc = *pCRCOut; - unsigned char utf8[7] = {0}; - if (!drflac__read_uint8(bs, 8, utf8)) { + unsigned char utf8[7] = { 0 }; + if (!drflac__read_uint8(bs, 8, utf8)) + { *pNumberOut = 0; return DRFLAC_END_OF_STREAM; } crc = drflac_crc8(crc, utf8[0], 8); - if ((utf8[0] & 0x80) == 0) { + if ((utf8[0] & 0x80) == 0) + { *pNumberOut = utf8[0]; - *pCRCOut = crc; + *pCRCOut = crc; return DRFLAC_SUCCESS; } int byteCount = 1; - if ((utf8[0] & 0xE0) == 0xC0) { + if ((utf8[0] & 0xE0) == 0xC0) + { byteCount = 2; - } else if ((utf8[0] & 0xF0) == 0xE0) { + } + else if ((utf8[0] & 0xF0) == 0xE0) + { byteCount = 3; - } else if ((utf8[0] & 0xF8) == 0xF0) { + } + else if ((utf8[0] & 0xF8) == 0xF0) + { byteCount = 4; - } else if ((utf8[0] & 0xFC) == 0xF8) { + } + else if ((utf8[0] & 0xFC) == 0xF8) + { byteCount = 5; - } else if ((utf8[0] & 0xFE) == 0xFC) { + } + else if ((utf8[0] & 0xFE) == 0xFC) + { byteCount = 6; - } else if ((utf8[0] & 0xFF) == 0xFE) { + } + else if ((utf8[0] & 0xFF) == 0xFE) + { byteCount = 7; - } else { + } + else + { *pNumberOut = 0; - return DRFLAC_CRC_MISMATCH; // Bad UTF-8 encoding. + return DRFLAC_CRC_MISMATCH; // Bad UTF-8 encoding. } // Read extra bytes. drflac_assert(byteCount > 1); drflac_uint64 result = (drflac_uint64)(utf8[0] & (0xFF >> (byteCount + 1))); - for (int i = 1; i < byteCount; ++i) { - if (!drflac__read_uint8(bs, 8, utf8 + i)) { + for (int i = 1; i < byteCount; ++i) + { + if (!drflac__read_uint8(bs, 8, utf8 + i)) + { *pNumberOut = 0; return DRFLAC_END_OF_STREAM; } @@ -1968,18 +2149,18 @@ static drflac_result drflac__read_utf8_coded_number(drflac_bs* bs, drflac_uint64 } *pNumberOut = result; - *pCRCOut = crc; + *pCRCOut = crc; return DRFLAC_SUCCESS; } - - - // The next two functions are responsible for calculating the prediction. // -// When the bits per sample is >16 we need to use 64-bit integer arithmetic because otherwise we'll run out of precision. It's -// safe to assume this will be slower on 32-bit platforms so we use a more optimal solution when the bits per sample is <=16. -static DRFLAC_INLINE drflac_int32 drflac__calculate_prediction_32(drflac_uint32 order, drflac_int32 shift, const drflac_int32* coefficients, drflac_int32* pDecodedSamples) +// When the bits per sample is >16 we need to use 64-bit integer arithmetic because otherwise we'll run out of +// precision. It's safe to assume this will be slower on 32-bit platforms so we use a more optimal solution +// when the bits per sample is <=16. +static DRFLAC_INLINE drflac_int32 drflac__calculate_prediction_32(drflac_uint32 order, drflac_int32 shift, + const drflac_int32* coefficients, + drflac_int32* pDecodedSamples) { drflac_assert(order <= 32); @@ -1990,44 +2171,78 @@ static DRFLAC_INLINE drflac_int32 drflac__calculate_prediction_32(drflac_uint32 switch (order) { - case 32: prediction += coefficients[31] * pDecodedSamples[-32]; - case 31: prediction += coefficients[30] * pDecodedSamples[-31]; - case 30: prediction += coefficients[29] * pDecodedSamples[-30]; - case 29: prediction += coefficients[28] * pDecodedSamples[-29]; - case 28: prediction += coefficients[27] * pDecodedSamples[-28]; - case 27: prediction += coefficients[26] * pDecodedSamples[-27]; - case 26: prediction += coefficients[25] * pDecodedSamples[-26]; - case 25: prediction += coefficients[24] * pDecodedSamples[-25]; - case 24: prediction += coefficients[23] * pDecodedSamples[-24]; - case 23: prediction += coefficients[22] * pDecodedSamples[-23]; - case 22: prediction += coefficients[21] * pDecodedSamples[-22]; - case 21: prediction += coefficients[20] * pDecodedSamples[-21]; - case 20: prediction += coefficients[19] * pDecodedSamples[-20]; - case 19: prediction += coefficients[18] * pDecodedSamples[-19]; - case 18: prediction += coefficients[17] * pDecodedSamples[-18]; - case 17: prediction += coefficients[16] * pDecodedSamples[-17]; - case 16: prediction += coefficients[15] * pDecodedSamples[-16]; - case 15: prediction += coefficients[14] * pDecodedSamples[-15]; - case 14: prediction += coefficients[13] * pDecodedSamples[-14]; - case 13: prediction += coefficients[12] * pDecodedSamples[-13]; - case 12: prediction += coefficients[11] * pDecodedSamples[-12]; - case 11: prediction += coefficients[10] * pDecodedSamples[-11]; - case 10: prediction += coefficients[ 9] * pDecodedSamples[-10]; - case 9: prediction += coefficients[ 8] * pDecodedSamples[- 9]; - case 8: prediction += coefficients[ 7] * pDecodedSamples[- 8]; - case 7: prediction += coefficients[ 6] * pDecodedSamples[- 7]; - case 6: prediction += coefficients[ 5] * pDecodedSamples[- 6]; - case 5: prediction += coefficients[ 4] * pDecodedSamples[- 5]; - case 4: prediction += coefficients[ 3] * pDecodedSamples[- 4]; - case 3: prediction += coefficients[ 2] * pDecodedSamples[- 3]; - case 2: prediction += coefficients[ 1] * pDecodedSamples[- 2]; - case 1: prediction += coefficients[ 0] * pDecodedSamples[- 1]; + case 32: + prediction += coefficients[31] * pDecodedSamples[-32]; + case 31: + prediction += coefficients[30] * pDecodedSamples[-31]; + case 30: + prediction += coefficients[29] * pDecodedSamples[-30]; + case 29: + prediction += coefficients[28] * pDecodedSamples[-29]; + case 28: + prediction += coefficients[27] * pDecodedSamples[-28]; + case 27: + prediction += coefficients[26] * pDecodedSamples[-27]; + case 26: + prediction += coefficients[25] * pDecodedSamples[-26]; + case 25: + prediction += coefficients[24] * pDecodedSamples[-25]; + case 24: + prediction += coefficients[23] * pDecodedSamples[-24]; + case 23: + prediction += coefficients[22] * pDecodedSamples[-23]; + case 22: + prediction += coefficients[21] * pDecodedSamples[-22]; + case 21: + prediction += coefficients[20] * pDecodedSamples[-21]; + case 20: + prediction += coefficients[19] * pDecodedSamples[-20]; + case 19: + prediction += coefficients[18] * pDecodedSamples[-19]; + case 18: + prediction += coefficients[17] * pDecodedSamples[-18]; + case 17: + prediction += coefficients[16] * pDecodedSamples[-17]; + case 16: + prediction += coefficients[15] * pDecodedSamples[-16]; + case 15: + prediction += coefficients[14] * pDecodedSamples[-15]; + case 14: + prediction += coefficients[13] * pDecodedSamples[-14]; + case 13: + prediction += coefficients[12] * pDecodedSamples[-13]; + case 12: + prediction += coefficients[11] * pDecodedSamples[-12]; + case 11: + prediction += coefficients[10] * pDecodedSamples[-11]; + case 10: + prediction += coefficients[9] * pDecodedSamples[-10]; + case 9: + prediction += coefficients[8] * pDecodedSamples[-9]; + case 8: + prediction += coefficients[7] * pDecodedSamples[-8]; + case 7: + prediction += coefficients[6] * pDecodedSamples[-7]; + case 6: + prediction += coefficients[5] * pDecodedSamples[-6]; + case 5: + prediction += coefficients[4] * pDecodedSamples[-5]; + case 4: + prediction += coefficients[3] * pDecodedSamples[-4]; + case 3: + prediction += coefficients[2] * pDecodedSamples[-3]; + case 2: + prediction += coefficients[1] * pDecodedSamples[-2]; + case 1: + prediction += coefficients[0] * pDecodedSamples[-1]; } return (drflac_int32)(prediction >> shift); } -static DRFLAC_INLINE drflac_int32 drflac__calculate_prediction_64(drflac_uint32 order, drflac_int32 shift, const drflac_int32* coefficients, drflac_int32* pDecodedSamples) +static DRFLAC_INLINE drflac_int32 drflac__calculate_prediction_64(drflac_uint32 order, drflac_int32 shift, + const drflac_int32* coefficients, + drflac_int32* pDecodedSamples) { drflac_assert(order <= 32); @@ -2038,7 +2253,7 @@ static DRFLAC_INLINE drflac_int32 drflac__calculate_prediction_64(drflac_uint32 drflac_int64 prediction; if (order == 8) { - prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; + prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; @@ -2049,7 +2264,7 @@ static DRFLAC_INLINE drflac_int32 drflac__calculate_prediction_64(drflac_uint32 } else if (order == 7) { - prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; + prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; @@ -2059,13 +2274,13 @@ static DRFLAC_INLINE drflac_int32 drflac__calculate_prediction_64(drflac_uint32 } else if (order == 3) { - prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; + prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; } else if (order == 6) { - prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; + prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; @@ -2074,7 +2289,7 @@ static DRFLAC_INLINE drflac_int32 drflac__calculate_prediction_64(drflac_uint32 } else if (order == 5) { - prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; + prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; @@ -2082,29 +2297,29 @@ static DRFLAC_INLINE drflac_int32 drflac__calculate_prediction_64(drflac_uint32 } else if (order == 4) { - prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; + prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; } else if (order == 12) { - prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; - prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; - prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; - prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; - prediction += coefficients[4] * (drflac_int64)pDecodedSamples[-5]; - prediction += coefficients[5] * (drflac_int64)pDecodedSamples[-6]; - prediction += coefficients[6] * (drflac_int64)pDecodedSamples[-7]; - prediction += coefficients[7] * (drflac_int64)pDecodedSamples[-8]; - prediction += coefficients[8] * (drflac_int64)pDecodedSamples[-9]; - prediction += coefficients[9] * (drflac_int64)pDecodedSamples[-10]; + prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; + prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; + prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; + prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; + prediction += coefficients[4] * (drflac_int64)pDecodedSamples[-5]; + prediction += coefficients[5] * (drflac_int64)pDecodedSamples[-6]; + prediction += coefficients[6] * (drflac_int64)pDecodedSamples[-7]; + prediction += coefficients[7] * (drflac_int64)pDecodedSamples[-8]; + prediction += coefficients[8] * (drflac_int64)pDecodedSamples[-9]; + prediction += coefficients[9] * (drflac_int64)pDecodedSamples[-10]; prediction += coefficients[10] * (drflac_int64)pDecodedSamples[-11]; prediction += coefficients[11] * (drflac_int64)pDecodedSamples[-12]; } else if (order == 2) { - prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; + prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; } else if (order == 1) @@ -2113,91 +2328,125 @@ static DRFLAC_INLINE drflac_int32 drflac__calculate_prediction_64(drflac_uint32 } else if (order == 10) { - prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; - prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; - prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; - prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; - prediction += coefficients[4] * (drflac_int64)pDecodedSamples[-5]; - prediction += coefficients[5] * (drflac_int64)pDecodedSamples[-6]; - prediction += coefficients[6] * (drflac_int64)pDecodedSamples[-7]; - prediction += coefficients[7] * (drflac_int64)pDecodedSamples[-8]; - prediction += coefficients[8] * (drflac_int64)pDecodedSamples[-9]; - prediction += coefficients[9] * (drflac_int64)pDecodedSamples[-10]; + prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; + prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; + prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; + prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; + prediction += coefficients[4] * (drflac_int64)pDecodedSamples[-5]; + prediction += coefficients[5] * (drflac_int64)pDecodedSamples[-6]; + prediction += coefficients[6] * (drflac_int64)pDecodedSamples[-7]; + prediction += coefficients[7] * (drflac_int64)pDecodedSamples[-8]; + prediction += coefficients[8] * (drflac_int64)pDecodedSamples[-9]; + prediction += coefficients[9] * (drflac_int64)pDecodedSamples[-10]; } else if (order == 9) { - prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; - prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; - prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; - prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; - prediction += coefficients[4] * (drflac_int64)pDecodedSamples[-5]; - prediction += coefficients[5] * (drflac_int64)pDecodedSamples[-6]; - prediction += coefficients[6] * (drflac_int64)pDecodedSamples[-7]; - prediction += coefficients[7] * (drflac_int64)pDecodedSamples[-8]; - prediction += coefficients[8] * (drflac_int64)pDecodedSamples[-9]; + prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; + prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; + prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; + prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; + prediction += coefficients[4] * (drflac_int64)pDecodedSamples[-5]; + prediction += coefficients[5] * (drflac_int64)pDecodedSamples[-6]; + prediction += coefficients[6] * (drflac_int64)pDecodedSamples[-7]; + prediction += coefficients[7] * (drflac_int64)pDecodedSamples[-8]; + prediction += coefficients[8] * (drflac_int64)pDecodedSamples[-9]; } else if (order == 11) { - prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; - prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; - prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; - prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; - prediction += coefficients[4] * (drflac_int64)pDecodedSamples[-5]; - prediction += coefficients[5] * (drflac_int64)pDecodedSamples[-6]; - prediction += coefficients[6] * (drflac_int64)pDecodedSamples[-7]; - prediction += coefficients[7] * (drflac_int64)pDecodedSamples[-8]; - prediction += coefficients[8] * (drflac_int64)pDecodedSamples[-9]; - prediction += coefficients[9] * (drflac_int64)pDecodedSamples[-10]; + prediction = coefficients[0] * (drflac_int64)pDecodedSamples[-1]; + prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; + prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; + prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; + prediction += coefficients[4] * (drflac_int64)pDecodedSamples[-5]; + prediction += coefficients[5] * (drflac_int64)pDecodedSamples[-6]; + prediction += coefficients[6] * (drflac_int64)pDecodedSamples[-7]; + prediction += coefficients[7] * (drflac_int64)pDecodedSamples[-8]; + prediction += coefficients[8] * (drflac_int64)pDecodedSamples[-9]; + prediction += coefficients[9] * (drflac_int64)pDecodedSamples[-10]; prediction += coefficients[10] * (drflac_int64)pDecodedSamples[-11]; } else { prediction = 0; - for (int j = 0; j < (int)order; ++j) { - prediction += coefficients[j] * (drflac_int64)pDecodedSamples[-j-1]; + for (int j = 0; j < (int)order; ++j) + { + prediction += coefficients[j] * (drflac_int64)pDecodedSamples[-j - 1]; } } #endif - // VC++ optimizes this to a single jmp instruction, but only the 64-bit build. The 32-bit build generates less efficient code for some - // reason. The ugly version above is faster so we'll just switch between the two depending on the target platform. + // VC++ optimizes this to a single jmp instruction, but only the 64-bit build. The 32-bit build generates + // less efficient code for some reason. The ugly version above is faster so we'll just switch between the + // two depending on the target platform. #ifdef DRFLAC_64BIT drflac_int64 prediction = 0; switch (order) { - case 32: prediction += coefficients[31] * (drflac_int64)pDecodedSamples[-32]; - case 31: prediction += coefficients[30] * (drflac_int64)pDecodedSamples[-31]; - case 30: prediction += coefficients[29] * (drflac_int64)pDecodedSamples[-30]; - case 29: prediction += coefficients[28] * (drflac_int64)pDecodedSamples[-29]; - case 28: prediction += coefficients[27] * (drflac_int64)pDecodedSamples[-28]; - case 27: prediction += coefficients[26] * (drflac_int64)pDecodedSamples[-27]; - case 26: prediction += coefficients[25] * (drflac_int64)pDecodedSamples[-26]; - case 25: prediction += coefficients[24] * (drflac_int64)pDecodedSamples[-25]; - case 24: prediction += coefficients[23] * (drflac_int64)pDecodedSamples[-24]; - case 23: prediction += coefficients[22] * (drflac_int64)pDecodedSamples[-23]; - case 22: prediction += coefficients[21] * (drflac_int64)pDecodedSamples[-22]; - case 21: prediction += coefficients[20] * (drflac_int64)pDecodedSamples[-21]; - case 20: prediction += coefficients[19] * (drflac_int64)pDecodedSamples[-20]; - case 19: prediction += coefficients[18] * (drflac_int64)pDecodedSamples[-19]; - case 18: prediction += coefficients[17] * (drflac_int64)pDecodedSamples[-18]; - case 17: prediction += coefficients[16] * (drflac_int64)pDecodedSamples[-17]; - case 16: prediction += coefficients[15] * (drflac_int64)pDecodedSamples[-16]; - case 15: prediction += coefficients[14] * (drflac_int64)pDecodedSamples[-15]; - case 14: prediction += coefficients[13] * (drflac_int64)pDecodedSamples[-14]; - case 13: prediction += coefficients[12] * (drflac_int64)pDecodedSamples[-13]; - case 12: prediction += coefficients[11] * (drflac_int64)pDecodedSamples[-12]; - case 11: prediction += coefficients[10] * (drflac_int64)pDecodedSamples[-11]; - case 10: prediction += coefficients[ 9] * (drflac_int64)pDecodedSamples[-10]; - case 9: prediction += coefficients[ 8] * (drflac_int64)pDecodedSamples[- 9]; - case 8: prediction += coefficients[ 7] * (drflac_int64)pDecodedSamples[- 8]; - case 7: prediction += coefficients[ 6] * (drflac_int64)pDecodedSamples[- 7]; - case 6: prediction += coefficients[ 5] * (drflac_int64)pDecodedSamples[- 6]; - case 5: prediction += coefficients[ 4] * (drflac_int64)pDecodedSamples[- 5]; - case 4: prediction += coefficients[ 3] * (drflac_int64)pDecodedSamples[- 4]; - case 3: prediction += coefficients[ 2] * (drflac_int64)pDecodedSamples[- 3]; - case 2: prediction += coefficients[ 1] * (drflac_int64)pDecodedSamples[- 2]; - case 1: prediction += coefficients[ 0] * (drflac_int64)pDecodedSamples[- 1]; + case 32: + prediction += coefficients[31] * (drflac_int64)pDecodedSamples[-32]; + case 31: + prediction += coefficients[30] * (drflac_int64)pDecodedSamples[-31]; + case 30: + prediction += coefficients[29] * (drflac_int64)pDecodedSamples[-30]; + case 29: + prediction += coefficients[28] * (drflac_int64)pDecodedSamples[-29]; + case 28: + prediction += coefficients[27] * (drflac_int64)pDecodedSamples[-28]; + case 27: + prediction += coefficients[26] * (drflac_int64)pDecodedSamples[-27]; + case 26: + prediction += coefficients[25] * (drflac_int64)pDecodedSamples[-26]; + case 25: + prediction += coefficients[24] * (drflac_int64)pDecodedSamples[-25]; + case 24: + prediction += coefficients[23] * (drflac_int64)pDecodedSamples[-24]; + case 23: + prediction += coefficients[22] * (drflac_int64)pDecodedSamples[-23]; + case 22: + prediction += coefficients[21] * (drflac_int64)pDecodedSamples[-22]; + case 21: + prediction += coefficients[20] * (drflac_int64)pDecodedSamples[-21]; + case 20: + prediction += coefficients[19] * (drflac_int64)pDecodedSamples[-20]; + case 19: + prediction += coefficients[18] * (drflac_int64)pDecodedSamples[-19]; + case 18: + prediction += coefficients[17] * (drflac_int64)pDecodedSamples[-18]; + case 17: + prediction += coefficients[16] * (drflac_int64)pDecodedSamples[-17]; + case 16: + prediction += coefficients[15] * (drflac_int64)pDecodedSamples[-16]; + case 15: + prediction += coefficients[14] * (drflac_int64)pDecodedSamples[-15]; + case 14: + prediction += coefficients[13] * (drflac_int64)pDecodedSamples[-14]; + case 13: + prediction += coefficients[12] * (drflac_int64)pDecodedSamples[-13]; + case 12: + prediction += coefficients[11] * (drflac_int64)pDecodedSamples[-12]; + case 11: + prediction += coefficients[10] * (drflac_int64)pDecodedSamples[-11]; + case 10: + prediction += coefficients[9] * (drflac_int64)pDecodedSamples[-10]; + case 9: + prediction += coefficients[8] * (drflac_int64)pDecodedSamples[-9]; + case 8: + prediction += coefficients[7] * (drflac_int64)pDecodedSamples[-8]; + case 7: + prediction += coefficients[6] * (drflac_int64)pDecodedSamples[-7]; + case 6: + prediction += coefficients[5] * (drflac_int64)pDecodedSamples[-6]; + case 5: + prediction += coefficients[4] * (drflac_int64)pDecodedSamples[-5]; + case 4: + prediction += coefficients[3] * (drflac_int64)pDecodedSamples[-4]; + case 3: + prediction += coefficients[2] * (drflac_int64)pDecodedSamples[-3]; + case 2: + prediction += coefficients[1] * (drflac_int64)pDecodedSamples[-2]; + case 1: + prediction += coefficients[0] * (drflac_int64)pDecodedSamples[-1]; } #endif @@ -2288,16 +2537,22 @@ static drflac_bool32 drflac__read_rice_parts__reference(drflac_bs* bs, drflac_ui } #endif -static DRFLAC_INLINE drflac_bool32 drflac__read_rice_parts(drflac_bs* bs, drflac_uint8 riceParam, drflac_uint32* pZeroCounterOut, drflac_uint32* pRiceParamPartOut) +static DRFLAC_INLINE drflac_bool32 drflac__read_rice_parts(drflac_bs* bs, drflac_uint8 riceParam, + drflac_uint32* pZeroCounterOut, + drflac_uint32* pRiceParamPartOut) { - drflac_assert(riceParam > 0); // <-- riceParam should never be 0. drflac__read_rice_parts__param_equals_zero() should be used instead for this case. + drflac_assert(riceParam > + 0); // <-- riceParam should never be 0. drflac__read_rice_parts__param_equals_zero() should + // be used instead for this case. drflac_cache_t riceParamMask = DRFLAC_CACHE_L1_SELECTION_MASK(riceParam); drflac_uint32 zeroCounter = 0; - while (bs->cache == 0) { + while (bs->cache == 0) + { zeroCounter += (drflac_uint32)DRFLAC_CACHE_L1_BITS_REMAINING(bs); - if (!drflac__reload_cache(bs)) { + if (!drflac__reload_cache(bs)) + { return DRFLAC_FALSE; } } @@ -2306,34 +2561,47 @@ static DRFLAC_INLINE drflac_bool32 drflac__read_rice_parts(drflac_bs* bs, drflac zeroCounter += setBitOffsetPlus1; setBitOffsetPlus1 += 1; - drflac_uint32 riceParamPart; drflac_uint32 riceLength = setBitOffsetPlus1 + riceParam; - if (riceLength < DRFLAC_CACHE_L1_BITS_REMAINING(bs)) { - riceParamPart = (drflac_uint32)((bs->cache & (riceParamMask >> setBitOffsetPlus1)) >> DRFLAC_CACHE_L1_SELECTION_SHIFT(bs, riceLength)); + if (riceLength < DRFLAC_CACHE_L1_BITS_REMAINING(bs)) + { + riceParamPart = (drflac_uint32)((bs->cache & (riceParamMask >> setBitOffsetPlus1)) >> + DRFLAC_CACHE_L1_SELECTION_SHIFT(bs, riceLength)); bs->consumedBits += riceLength; bs->cache <<= riceLength; - } else { + } + else + { bs->consumedBits += riceLength; - bs->cache <<= setBitOffsetPlus1 & (DRFLAC_CACHE_L1_SIZE_BITS(bs)-1); // <-- Equivalent to "if (setBitOffsetPlus1 < DRFLAC_CACHE_L1_SIZE_BITS(bs)) { bs->cache <<= setBitOffsetPlus1; }" + bs->cache <<= + setBitOffsetPlus1 & (DRFLAC_CACHE_L1_SIZE_BITS(bs) - + 1); // <-- Equivalent to "if (setBitOffsetPlus1 < + // DRFLAC_CACHE_L1_SIZE_BITS(bs)) { bs->cache <<= setBitOffsetPlus1; }" - // It straddles the cached data. It will never cover more than the next chunk. We just read the number in two parts and combine them. + // It straddles the cached data. It will never cover more than the next chunk. We just read the number + // in two parts and combine them. drflac_uint32 bitCountLo = bs->consumedBits - DRFLAC_CACHE_L1_SIZE_BITS(bs); - drflac_cache_t resultHi = DRFLAC_CACHE_L1_SELECT_AND_SHIFT(bs, riceParam); // <-- Use DRFLAC_CACHE_L1_SELECT_AND_SHIFT_SAFE() if ever this function allows riceParam=0. + drflac_cache_t resultHi = DRFLAC_CACHE_L1_SELECT_AND_SHIFT( + bs, riceParam); // <-- Use DRFLAC_CACHE_L1_SELECT_AND_SHIFT_SAFE() if ever this function allows + // riceParam=0. - if (bs->nextL2Line < DRFLAC_CACHE_L2_LINE_COUNT(bs)) { + if (bs->nextL2Line < DRFLAC_CACHE_L2_LINE_COUNT(bs)) + { #ifndef DR_FLAC_NO_CRC drflac__update_crc16(bs); #endif - bs->cache = drflac__be2host__cache_line(bs->cacheL2[bs->nextL2Line++]); + bs->cache = drflac__be2host__cache_line(bs->cacheL2[bs->nextL2Line++]); bs->consumedBits = 0; #ifndef DR_FLAC_NO_CRC bs->crc16Cache = bs->cache; #endif - } else { + } + else + { // Slow path. We need to fetch more data from the client. - if (!drflac__reload_cache(bs)) { + if (!drflac__reload_cache(bs)) + { return DRFLAC_FALSE; } } @@ -2344,19 +2612,22 @@ static DRFLAC_INLINE drflac_bool32 drflac__read_rice_parts(drflac_bs* bs, drflac bs->cache <<= bitCountLo; } - *pZeroCounterOut = zeroCounter; + *pZeroCounterOut = zeroCounter; *pRiceParamPartOut = riceParamPart; return DRFLAC_TRUE; } -static DRFLAC_INLINE drflac_bool32 drflac__read_rice_parts__param_equals_zero(drflac_bs* bs, drflac_uint32* pZeroCounterOut, drflac_uint32* pRiceParamPartOut) +static DRFLAC_INLINE drflac_bool32 drflac__read_rice_parts__param_equals_zero( + drflac_bs* bs, drflac_uint32* pZeroCounterOut, drflac_uint32* pRiceParamPartOut) { drflac_cache_t riceParamMask = DRFLAC_CACHE_L1_SELECTION_MASK(0); drflac_uint32 zeroCounter = 0; - while (bs->cache == 0) { + while (bs->cache == 0) + { zeroCounter += (drflac_uint32)DRFLAC_CACHE_L1_BITS_REMAINING(bs); - if (!drflac__reload_cache(bs)) { + if (!drflac__reload_cache(bs)) + { return DRFLAC_FALSE; } } @@ -2365,30 +2636,38 @@ static DRFLAC_INLINE drflac_bool32 drflac__read_rice_parts__param_equals_zero(dr zeroCounter += setBitOffsetPlus1; setBitOffsetPlus1 += 1; - drflac_uint32 riceParamPart; drflac_uint32 riceLength = setBitOffsetPlus1; - if (riceLength < DRFLAC_CACHE_L1_BITS_REMAINING(bs)) { - riceParamPart = (drflac_uint32)((bs->cache & (riceParamMask >> setBitOffsetPlus1)) >> DRFLAC_CACHE_L1_SELECTION_SHIFT(bs, riceLength)); + if (riceLength < DRFLAC_CACHE_L1_BITS_REMAINING(bs)) + { + riceParamPart = (drflac_uint32)((bs->cache & (riceParamMask >> setBitOffsetPlus1)) >> + DRFLAC_CACHE_L1_SELECTION_SHIFT(bs, riceLength)); bs->consumedBits += riceLength; bs->cache <<= riceLength; - } else { - // It straddles the cached data. It will never cover more than the next chunk. We just read the number in two parts and combine them. + } + else + { + // It straddles the cached data. It will never cover more than the next chunk. We just read the number + // in two parts and combine them. drflac_uint32 bitCountLo = riceLength + bs->consumedBits - DRFLAC_CACHE_L1_SIZE_BITS(bs); - if (bs->nextL2Line < DRFLAC_CACHE_L2_LINE_COUNT(bs)) { + if (bs->nextL2Line < DRFLAC_CACHE_L2_LINE_COUNT(bs)) + { #ifndef DR_FLAC_NO_CRC drflac__update_crc16(bs); #endif - bs->cache = drflac__be2host__cache_line(bs->cacheL2[bs->nextL2Line++]); + bs->cache = drflac__be2host__cache_line(bs->cacheL2[bs->nextL2Line++]); bs->consumedBits = 0; #ifndef DR_FLAC_NO_CRC bs->crc16Cache = bs->cache; #endif - } else { + } + else + { // Slow path. We need to fetch more data from the client. - if (!drflac__reload_cache(bs)) { + if (!drflac__reload_cache(bs)) + { return DRFLAC_FALSE; } } @@ -2399,19 +2678,20 @@ static DRFLAC_INLINE drflac_bool32 drflac__read_rice_parts__param_equals_zero(dr bs->cache <<= bitCountLo; } - *pZeroCounterOut = zeroCounter; + *pZeroCounterOut = zeroCounter; *pRiceParamPartOut = riceParamPart; return DRFLAC_TRUE; } - -static drflac_bool32 drflac__decode_samples_with_residual__rice__simple(drflac_bs* bs, drflac_uint32 bitsPerSample, drflac_uint32 count, drflac_uint8 riceParam, drflac_uint32 order, drflac_int32 shift, const drflac_int32* coefficients, drflac_int32* pSamplesOut) +static drflac_bool32 drflac__decode_samples_with_residual__rice__simple( + drflac_bs* bs, drflac_uint32 bitsPerSample, drflac_uint32 count, drflac_uint8 riceParam, + drflac_uint32 order, drflac_int32 shift, const drflac_int32* coefficients, drflac_int32* pSamplesOut) { drflac_assert(bs != NULL); drflac_assert(count > 0); drflac_assert(pSamplesOut != NULL); - static drflac_uint32 t[2] = {0x00000000, 0xFFFFFFFF}; + static drflac_uint32 t[2] = { 0x00000000, 0xFFFFFFFF }; drflac_uint32 zeroCountPart0; drflac_uint32 zeroCountPart1; @@ -2421,14 +2701,16 @@ static drflac_bool32 drflac__decode_samples_with_residual__rice__simple(drflac_b drflac_uint32 riceParamPart1; drflac_uint32 riceParamPart2; drflac_uint32 riceParamPart3; - drflac_uint32 i4 = 0; + drflac_uint32 i4 = 0; drflac_uint32 count4 = count >> 2; - while (i4 < count4) { + while (i4 < count4) + { // Rice extraction. if (!drflac__read_rice_parts(bs, riceParam, &zeroCountPart0, &riceParamPart0) || !drflac__read_rice_parts(bs, riceParam, &zeroCountPart1, &riceParamPart1) || !drflac__read_rice_parts(bs, riceParam, &zeroCountPart2, &riceParamPart2) || - !drflac__read_rice_parts(bs, riceParam, &zeroCountPart3, &riceParamPart3)) { + !drflac__read_rice_parts(bs, riceParam, &zeroCountPart3, &riceParamPart3)) + { return DRFLAC_FALSE; } @@ -2437,21 +2719,32 @@ static drflac_bool32 drflac__decode_samples_with_residual__rice__simple(drflac_b riceParamPart2 |= (zeroCountPart2 << riceParam); riceParamPart3 |= (zeroCountPart3 << riceParam); - riceParamPart0 = (riceParamPart0 >> 1) ^ t[riceParamPart0 & 0x01]; - riceParamPart1 = (riceParamPart1 >> 1) ^ t[riceParamPart1 & 0x01]; - riceParamPart2 = (riceParamPart2 >> 1) ^ t[riceParamPart2 & 0x01]; - riceParamPart3 = (riceParamPart3 >> 1) ^ t[riceParamPart3 & 0x01]; + riceParamPart0 = (riceParamPart0 >> 1) ^ t[riceParamPart0 & 0x01]; + riceParamPart1 = (riceParamPart1 >> 1) ^ t[riceParamPart1 & 0x01]; + riceParamPart2 = (riceParamPart2 >> 1) ^ t[riceParamPart2 & 0x01]; + riceParamPart3 = (riceParamPart3 >> 1) ^ t[riceParamPart3 & 0x01]; - if (bitsPerSample > 16) { - pSamplesOut[0] = riceParamPart0 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 0); - pSamplesOut[1] = riceParamPart1 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 1); - pSamplesOut[2] = riceParamPart2 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 2); - pSamplesOut[3] = riceParamPart3 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 3); - } else { - pSamplesOut[0] = riceParamPart0 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 0); - pSamplesOut[1] = riceParamPart1 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 1); - pSamplesOut[2] = riceParamPart2 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 2); - pSamplesOut[3] = riceParamPart3 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 3); + if (bitsPerSample > 16) + { + pSamplesOut[0] = + riceParamPart0 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 0); + pSamplesOut[1] = + riceParamPart1 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 1); + pSamplesOut[2] = + riceParamPart2 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 2); + pSamplesOut[3] = + riceParamPart3 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 3); + } + else + { + pSamplesOut[0] = + riceParamPart0 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 0); + pSamplesOut[1] = + riceParamPart1 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 1); + pSamplesOut[2] = + riceParamPart2 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 2); + pSamplesOut[3] = + riceParamPart3 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 3); } i4 += 1; @@ -2459,22 +2752,29 @@ static drflac_bool32 drflac__decode_samples_with_residual__rice__simple(drflac_b } drflac_uint32 i = i4 << 2; - while (i < count) { + while (i < count) + { // Rice extraction. - if (!drflac__read_rice_parts(bs, riceParam, &zeroCountPart0, &riceParamPart0)) { + if (!drflac__read_rice_parts(bs, riceParam, &zeroCountPart0, &riceParamPart0)) + { return DRFLAC_FALSE; } // Rice reconstruction. riceParamPart0 |= (zeroCountPart0 << riceParam); - riceParamPart0 = (riceParamPart0 >> 1) ^ t[riceParamPart0 & 0x01]; - //riceParamPart0 = (riceParamPart0 >> 1) ^ (~(riceParamPart0 & 0x01) + 1); + riceParamPart0 = (riceParamPart0 >> 1) ^ t[riceParamPart0 & 0x01]; + // riceParamPart0 = (riceParamPart0 >> 1) ^ (~(riceParamPart0 & 0x01) + 1); // Sample reconstruction. - if (bitsPerSample > 16) { - pSamplesOut[0] = riceParamPart0 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 0); - } else { - pSamplesOut[0] = riceParamPart0 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 0); + if (bitsPerSample > 16) + { + pSamplesOut[0] = + riceParamPart0 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 0); + } + else + { + pSamplesOut[0] = + riceParamPart0 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 0); } i += 1; @@ -2484,13 +2784,15 @@ static drflac_bool32 drflac__decode_samples_with_residual__rice__simple(drflac_b return DRFLAC_TRUE; } -static drflac_bool32 drflac__decode_samples_with_residual__rice__param_equals_zero(drflac_bs* bs, drflac_uint32 bitsPerSample, drflac_uint32 count, drflac_uint32 order, drflac_int32 shift, const drflac_int32* coefficients, drflac_int32* pSamplesOut) +static drflac_bool32 drflac__decode_samples_with_residual__rice__param_equals_zero( + drflac_bs* bs, drflac_uint32 bitsPerSample, drflac_uint32 count, drflac_uint32 order, drflac_int32 shift, + const drflac_int32* coefficients, drflac_int32* pSamplesOut) { drflac_assert(bs != NULL); drflac_assert(count > 0); drflac_assert(pSamplesOut != NULL); - static drflac_uint32 t[2] = {0x00000000, 0xFFFFFFFF}; + static drflac_uint32 t[2] = { 0x00000000, 0xFFFFFFFF }; drflac_uint32 zeroCountPart0; drflac_uint32 zeroCountPart1; @@ -2500,14 +2802,16 @@ static drflac_bool32 drflac__decode_samples_with_residual__rice__param_equals_ze drflac_uint32 riceParamPart1; drflac_uint32 riceParamPart2; drflac_uint32 riceParamPart3; - drflac_uint32 i4 = 0; + drflac_uint32 i4 = 0; drflac_uint32 count4 = count >> 2; - while (i4 < count4) { + while (i4 < count4) + { // Rice extraction. if (!drflac__read_rice_parts__param_equals_zero(bs, &zeroCountPart0, &riceParamPart0) || !drflac__read_rice_parts__param_equals_zero(bs, &zeroCountPart1, &riceParamPart1) || !drflac__read_rice_parts__param_equals_zero(bs, &zeroCountPart2, &riceParamPart2) || - !drflac__read_rice_parts__param_equals_zero(bs, &zeroCountPart3, &riceParamPart3)) { + !drflac__read_rice_parts__param_equals_zero(bs, &zeroCountPart3, &riceParamPart3)) + { return DRFLAC_FALSE; } @@ -2516,21 +2820,32 @@ static drflac_bool32 drflac__decode_samples_with_residual__rice__param_equals_ze riceParamPart2 |= zeroCountPart2; riceParamPart3 |= zeroCountPart3; - riceParamPart0 = (riceParamPart0 >> 1) ^ t[riceParamPart0 & 0x01]; - riceParamPart1 = (riceParamPart1 >> 1) ^ t[riceParamPart1 & 0x01]; - riceParamPart2 = (riceParamPart2 >> 1) ^ t[riceParamPart2 & 0x01]; - riceParamPart3 = (riceParamPart3 >> 1) ^ t[riceParamPart3 & 0x01]; + riceParamPart0 = (riceParamPart0 >> 1) ^ t[riceParamPart0 & 0x01]; + riceParamPart1 = (riceParamPart1 >> 1) ^ t[riceParamPart1 & 0x01]; + riceParamPart2 = (riceParamPart2 >> 1) ^ t[riceParamPart2 & 0x01]; + riceParamPart3 = (riceParamPart3 >> 1) ^ t[riceParamPart3 & 0x01]; - if (bitsPerSample > 16) { - pSamplesOut[0] = riceParamPart0 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 0); - pSamplesOut[1] = riceParamPart1 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 1); - pSamplesOut[2] = riceParamPart2 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 2); - pSamplesOut[3] = riceParamPart3 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 3); - } else { - pSamplesOut[0] = riceParamPart0 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 0); - pSamplesOut[1] = riceParamPart1 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 1); - pSamplesOut[2] = riceParamPart2 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 2); - pSamplesOut[3] = riceParamPart3 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 3); + if (bitsPerSample > 16) + { + pSamplesOut[0] = + riceParamPart0 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 0); + pSamplesOut[1] = + riceParamPart1 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 1); + pSamplesOut[2] = + riceParamPart2 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 2); + pSamplesOut[3] = + riceParamPart3 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 3); + } + else + { + pSamplesOut[0] = + riceParamPart0 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 0); + pSamplesOut[1] = + riceParamPart1 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 1); + pSamplesOut[2] = + riceParamPart2 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 2); + pSamplesOut[3] = + riceParamPart3 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 3); } i4 += 1; @@ -2538,21 +2853,28 @@ static drflac_bool32 drflac__decode_samples_with_residual__rice__param_equals_ze } drflac_uint32 i = i4 << 2; - while (i < count) { + while (i < count) + { // Rice extraction. - if (!drflac__read_rice_parts__param_equals_zero(bs, &zeroCountPart0, &riceParamPart0)) { + if (!drflac__read_rice_parts__param_equals_zero(bs, &zeroCountPart0, &riceParamPart0)) + { return DRFLAC_FALSE; } // Rice reconstruction. riceParamPart0 |= zeroCountPart0; - riceParamPart0 = (riceParamPart0 >> 1) ^ t[riceParamPart0 & 0x01]; + riceParamPart0 = (riceParamPart0 >> 1) ^ t[riceParamPart0 & 0x01]; // Sample reconstruction. - if (bitsPerSample > 16) { - pSamplesOut[0] = riceParamPart0 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 0); - } else { - pSamplesOut[0] = riceParamPart0 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 0); + if (bitsPerSample > 16) + { + pSamplesOut[0] = + riceParamPart0 + drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + 0); + } + else + { + pSamplesOut[0] = + riceParamPart0 + drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + 0); } i += 1; @@ -2562,21 +2884,32 @@ static drflac_bool32 drflac__decode_samples_with_residual__rice__param_equals_ze return DRFLAC_TRUE; } -static drflac_bool32 drflac__decode_samples_with_residual__rice(drflac_bs* bs, drflac_uint32 bitsPerSample, drflac_uint32 count, drflac_uint8 riceParam, drflac_uint32 order, drflac_int32 shift, const drflac_int32* coefficients, drflac_int32* pSamplesOut) +static drflac_bool32 drflac__decode_samples_with_residual__rice(drflac_bs* bs, drflac_uint32 bitsPerSample, + drflac_uint32 count, drflac_uint8 riceParam, + drflac_uint32 order, drflac_int32 shift, + const drflac_int32* coefficients, + drflac_int32* pSamplesOut) { #if 0 return drflac__decode_samples_with_residual__rice__reference(bs, bitsPerSample, count, riceParam, order, shift, coefficients, pSamplesOut); #else - if (riceParam != 0) { - return drflac__decode_samples_with_residual__rice__simple(bs, bitsPerSample, count, riceParam, order, shift, coefficients, pSamplesOut); - } else { - return drflac__decode_samples_with_residual__rice__param_equals_zero(bs, bitsPerSample, count, order, shift, coefficients, pSamplesOut); + if (riceParam != 0) + { + return drflac__decode_samples_with_residual__rice__simple(bs, bitsPerSample, count, riceParam, order, + shift, coefficients, pSamplesOut); + } + else + { + return drflac__decode_samples_with_residual__rice__param_equals_zero( + bs, bitsPerSample, count, order, shift, coefficients, pSamplesOut); } #endif } -// Reads and seeks past a string of residual values as Rice codes. The decoder should be sitting on the first bit of the Rice codes. -static drflac_bool32 drflac__read_and_seek_residual__rice(drflac_bs* bs, drflac_uint32 count, drflac_uint8 riceParam) +// Reads and seeks past a string of residual values as Rice codes. The decoder should be sitting on the first +// bit of the Rice codes. +static drflac_bool32 drflac__read_and_seek_residual__rice(drflac_bs* bs, drflac_uint32 count, + drflac_uint8 riceParam) { drflac_assert(bs != NULL); drflac_assert(count > 0); @@ -2584,15 +2917,22 @@ static drflac_bool32 drflac__read_and_seek_residual__rice(drflac_bs* bs, drflac_ drflac_uint32 zeroCountPart; drflac_uint32 riceParamPart; - if (riceParam != 0) { - for (drflac_uint32 i = 0; i < count; ++i) { - if (!drflac__read_rice_parts(bs, riceParam, &zeroCountPart, &riceParamPart)) { + if (riceParam != 0) + { + for (drflac_uint32 i = 0; i < count; ++i) + { + if (!drflac__read_rice_parts(bs, riceParam, &zeroCountPart, &riceParamPart)) + { return DRFLAC_FALSE; } } - } else { - for (drflac_uint32 i = 0; i < count; ++i) { - if (!drflac__read_rice_parts__param_equals_zero(bs, &zeroCountPart, &riceParamPart)) { + } + else + { + for (drflac_uint32 i = 0; i < count; ++i) + { + if (!drflac__read_rice_parts__param_equals_zero(bs, &zeroCountPart, &riceParamPart)) + { return DRFLAC_FALSE; } } @@ -2601,25 +2941,36 @@ static drflac_bool32 drflac__read_and_seek_residual__rice(drflac_bs* bs, drflac_ return DRFLAC_TRUE; } -static drflac_bool32 drflac__decode_samples_with_residual__unencoded(drflac_bs* bs, drflac_uint32 bitsPerSample, drflac_uint32 count, drflac_uint8 unencodedBitsPerSample, drflac_uint32 order, drflac_int32 shift, const drflac_int32* coefficients, drflac_int32* pSamplesOut) +static drflac_bool32 drflac__decode_samples_with_residual__unencoded( + drflac_bs* bs, drflac_uint32 bitsPerSample, drflac_uint32 count, drflac_uint8 unencodedBitsPerSample, + drflac_uint32 order, drflac_int32 shift, const drflac_int32* coefficients, drflac_int32* pSamplesOut) { drflac_assert(bs != NULL); drflac_assert(count > 0); - drflac_assert(unencodedBitsPerSample <= 31); // <-- unencodedBitsPerSample is a 5 bit number, so cannot exceed 31. + drflac_assert(unencodedBitsPerSample <= + 31); // <-- unencodedBitsPerSample is a 5 bit number, so cannot exceed 31. drflac_assert(pSamplesOut != NULL); - for (unsigned int i = 0; i < count; ++i) { - if (unencodedBitsPerSample > 0) { - if (!drflac__read_int32(bs, unencodedBitsPerSample, pSamplesOut + i)) { + for (unsigned int i = 0; i < count; ++i) + { + if (unencodedBitsPerSample > 0) + { + if (!drflac__read_int32(bs, unencodedBitsPerSample, pSamplesOut + i)) + { return DRFLAC_FALSE; } - } else { + } + else + { pSamplesOut[i] = 0; } - if (bitsPerSample > 16) { + if (bitsPerSample > 16) + { pSamplesOut[i] += drflac__calculate_prediction_64(order, shift, coefficients, pSamplesOut + i); - } else { + } + else + { pSamplesOut[i] += drflac__calculate_prediction_32(order, shift, coefficients, pSamplesOut + i); } } @@ -2627,90 +2978,118 @@ static drflac_bool32 drflac__decode_samples_with_residual__unencoded(drflac_bs* return DRFLAC_TRUE; } - -// Reads and decodes the residual for the sub-frame the decoder is currently sitting on. This function should be called -// when the decoder is sitting at the very start of the RESIDUAL block. The first <order> residuals will be ignored. The -// <blockSize> and <order> parameters are used to determine how many residual values need to be decoded. -static drflac_bool32 drflac__decode_samples_with_residual(drflac_bs* bs, drflac_uint32 bitsPerSample, drflac_uint32 blockSize, drflac_uint32 order, drflac_int32 shift, const drflac_int32* coefficients, drflac_int32* pDecodedSamples) +// Reads and decodes the residual for the sub-frame the decoder is currently sitting on. This function should +// be called when the decoder is sitting at the very start of the RESIDUAL block. The first <order> residuals +// will be ignored. The <blockSize> and <order> parameters are used to determine how many residual values need +// to be decoded. +static drflac_bool32 drflac__decode_samples_with_residual(drflac_bs* bs, drflac_uint32 bitsPerSample, + drflac_uint32 blockSize, drflac_uint32 order, + drflac_int32 shift, + const drflac_int32* coefficients, + drflac_int32* pDecodedSamples) { drflac_assert(bs != NULL); drflac_assert(blockSize != 0); - drflac_assert(pDecodedSamples != NULL); // <-- Should we allow NULL, in which case we just seek past the residual rather than do a full decode? + drflac_assert(pDecodedSamples != NULL); // <-- Should we allow NULL, in which case we just seek past the + // residual rather than do a full decode? drflac_uint8 residualMethod; - if (!drflac__read_uint8(bs, 2, &residualMethod)) { + if (!drflac__read_uint8(bs, 2, &residualMethod)) + { return DRFLAC_FALSE; } - if (residualMethod != DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE && residualMethod != DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE2) { - return DRFLAC_FALSE; // Unknown or unsupported residual coding method. + if (residualMethod != DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE && + residualMethod != DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE2) + { + return DRFLAC_FALSE; // Unknown or unsupported residual coding method. } // Ignore the first <order> values. pDecodedSamples += order; - drflac_uint8 partitionOrder; - if (!drflac__read_uint8(bs, 4, &partitionOrder)) { + if (!drflac__read_uint8(bs, 4, &partitionOrder)) + { return DRFLAC_FALSE; } // From the FLAC spec: // The Rice partition order in a Rice-coded residual section must be less than or equal to 8. - if (partitionOrder > 8) { + if (partitionOrder > 8) + { return DRFLAC_FALSE; } // Validation check. - if ((blockSize / (1 << partitionOrder)) <= order) { + if ((blockSize / (1 << partitionOrder)) <= order) + { return DRFLAC_FALSE; } - drflac_uint32 samplesInPartition = (blockSize / (1 << partitionOrder)) - order; + drflac_uint32 samplesInPartition = (blockSize / (1 << partitionOrder)) - order; drflac_uint32 partitionsRemaining = (1 << partitionOrder); - for (;;) { + for (;;) + { drflac_uint8 riceParam = 0; - if (residualMethod == DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE) { - if (!drflac__read_uint8(bs, 4, &riceParam)) { + if (residualMethod == DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE) + { + if (!drflac__read_uint8(bs, 4, &riceParam)) + { return DRFLAC_FALSE; } - if (riceParam == 15) { + if (riceParam == 15) + { riceParam = 0xFF; } - } else if (residualMethod == DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE2) { - if (!drflac__read_uint8(bs, 5, &riceParam)) { + } + else if (residualMethod == DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE2) + { + if (!drflac__read_uint8(bs, 5, &riceParam)) + { return DRFLAC_FALSE; } - if (riceParam == 31) { + if (riceParam == 31) + { riceParam = 0xFF; } } - if (riceParam != 0xFF) { - if (!drflac__decode_samples_with_residual__rice(bs, bitsPerSample, samplesInPartition, riceParam, order, shift, coefficients, pDecodedSamples)) { + if (riceParam != 0xFF) + { + if (!drflac__decode_samples_with_residual__rice(bs, bitsPerSample, samplesInPartition, riceParam, + order, shift, coefficients, pDecodedSamples)) + { return DRFLAC_FALSE; } - } else { + } + else + { unsigned char unencodedBitsPerSample = 0; - if (!drflac__read_uint8(bs, 5, &unencodedBitsPerSample)) { + if (!drflac__read_uint8(bs, 5, &unencodedBitsPerSample)) + { return DRFLAC_FALSE; } - if (!drflac__decode_samples_with_residual__unencoded(bs, bitsPerSample, samplesInPartition, unencodedBitsPerSample, order, shift, coefficients, pDecodedSamples)) { + if (!drflac__decode_samples_with_residual__unencoded(bs, bitsPerSample, samplesInPartition, + unencodedBitsPerSample, order, shift, + coefficients, pDecodedSamples)) + { return DRFLAC_FALSE; } } pDecodedSamples += samplesInPartition; - - if (partitionsRemaining == 1) { + if (partitionsRemaining == 1) + { break; } partitionsRemaining -= 1; - if (partitionOrder != 0) { + if (partitionOrder != 0) + { samplesInPartition = blockSize / (1 << partitionOrder); } } @@ -2718,77 +3097,98 @@ static drflac_bool32 drflac__decode_samples_with_residual(drflac_bs* bs, drflac_ return DRFLAC_TRUE; } -// Reads and seeks past the residual for the sub-frame the decoder is currently sitting on. This function should be called -// when the decoder is sitting at the very start of the RESIDUAL block. The first <order> residuals will be set to 0. The -// <blockSize> and <order> parameters are used to determine how many residual values need to be decoded. -static drflac_bool32 drflac__read_and_seek_residual(drflac_bs* bs, drflac_uint32 blockSize, drflac_uint32 order) +// Reads and seeks past the residual for the sub-frame the decoder is currently sitting on. This function +// should be called when the decoder is sitting at the very start of the RESIDUAL block. The first <order> +// residuals will be set to 0. The <blockSize> and <order> parameters are used to determine how many residual +// values need to be decoded. +static drflac_bool32 drflac__read_and_seek_residual(drflac_bs* bs, drflac_uint32 blockSize, + drflac_uint32 order) { drflac_assert(bs != NULL); drflac_assert(blockSize != 0); drflac_uint8 residualMethod; - if (!drflac__read_uint8(bs, 2, &residualMethod)) { + if (!drflac__read_uint8(bs, 2, &residualMethod)) + { return DRFLAC_FALSE; } - if (residualMethod != DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE && residualMethod != DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE2) { - return DRFLAC_FALSE; // Unknown or unsupported residual coding method. + if (residualMethod != DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE && + residualMethod != DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE2) + { + return DRFLAC_FALSE; // Unknown or unsupported residual coding method. } drflac_uint8 partitionOrder; - if (!drflac__read_uint8(bs, 4, &partitionOrder)) { + if (!drflac__read_uint8(bs, 4, &partitionOrder)) + { return DRFLAC_FALSE; } // From the FLAC spec: // The Rice partition order in a Rice-coded residual section must be less than or equal to 8. - if (partitionOrder > 8) { + if (partitionOrder > 8) + { return DRFLAC_FALSE; } // Validation check. - if ((blockSize / (1 << partitionOrder)) <= order) { + if ((blockSize / (1 << partitionOrder)) <= order) + { return DRFLAC_FALSE; } - drflac_uint32 samplesInPartition = (blockSize / (1 << partitionOrder)) - order; + drflac_uint32 samplesInPartition = (blockSize / (1 << partitionOrder)) - order; drflac_uint32 partitionsRemaining = (1 << partitionOrder); for (;;) { drflac_uint8 riceParam = 0; - if (residualMethod == DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE) { - if (!drflac__read_uint8(bs, 4, &riceParam)) { + if (residualMethod == DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE) + { + if (!drflac__read_uint8(bs, 4, &riceParam)) + { return DRFLAC_FALSE; } - if (riceParam == 15) { + if (riceParam == 15) + { riceParam = 0xFF; } - } else if (residualMethod == DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE2) { - if (!drflac__read_uint8(bs, 5, &riceParam)) { + } + else if (residualMethod == DRFLAC_RESIDUAL_CODING_METHOD_PARTITIONED_RICE2) + { + if (!drflac__read_uint8(bs, 5, &riceParam)) + { return DRFLAC_FALSE; } - if (riceParam == 31) { + if (riceParam == 31) + { riceParam = 0xFF; } } - if (riceParam != 0xFF) { - if (!drflac__read_and_seek_residual__rice(bs, samplesInPartition, riceParam)) { + if (riceParam != 0xFF) + { + if (!drflac__read_and_seek_residual__rice(bs, samplesInPartition, riceParam)) + { return DRFLAC_FALSE; } - } else { + } + else + { unsigned char unencodedBitsPerSample = 0; - if (!drflac__read_uint8(bs, 5, &unencodedBitsPerSample)) { + if (!drflac__read_uint8(bs, 5, &unencodedBitsPerSample)) + { return DRFLAC_FALSE; } - if (!drflac__seek_bits(bs, unencodedBitsPerSample * samplesInPartition)) { + if (!drflac__seek_bits(bs, unencodedBitsPerSample * samplesInPartition)) + { return DRFLAC_FALSE; } } - - if (partitionsRemaining == 1) { + if (partitionsRemaining == 1) + { break; } @@ -2799,29 +3199,36 @@ static drflac_bool32 drflac__read_and_seek_residual(drflac_bs* bs, drflac_uint32 return DRFLAC_TRUE; } - -static drflac_bool32 drflac__decode_samples__constant(drflac_bs* bs, drflac_uint32 blockSize, drflac_uint32 bitsPerSample, drflac_int32* pDecodedSamples) +static drflac_bool32 drflac__decode_samples__constant(drflac_bs* bs, drflac_uint32 blockSize, + drflac_uint32 bitsPerSample, + drflac_int32* pDecodedSamples) { // Only a single sample needs to be decoded here. drflac_int32 sample; - if (!drflac__read_int32(bs, bitsPerSample, &sample)) { + if (!drflac__read_int32(bs, bitsPerSample, &sample)) + { return DRFLAC_FALSE; } - // We don't really need to expand this, but it does simplify the process of reading samples. If this becomes a performance issue (unlikely) - // we'll want to look at a more efficient way. - for (drflac_uint32 i = 0; i < blockSize; ++i) { + // We don't really need to expand this, but it does simplify the process of reading samples. If this + // becomes a performance issue (unlikely) we'll want to look at a more efficient way. + for (drflac_uint32 i = 0; i < blockSize; ++i) + { pDecodedSamples[i] = sample; } return DRFLAC_TRUE; } -static drflac_bool32 drflac__decode_samples__verbatim(drflac_bs* bs, drflac_uint32 blockSize, drflac_uint32 bitsPerSample, drflac_int32* pDecodedSamples) +static drflac_bool32 drflac__decode_samples__verbatim(drflac_bs* bs, drflac_uint32 blockSize, + drflac_uint32 bitsPerSample, + drflac_int32* pDecodedSamples) { - for (drflac_uint32 i = 0; i < blockSize; ++i) { + for (drflac_uint32 i = 0; i < blockSize; ++i) + { drflac_int32 sample; - if (!drflac__read_int32(bs, bitsPerSample, &sample)) { + if (!drflac__read_int32(bs, bitsPerSample, &sample)) + { return DRFLAC_FALSE; } @@ -2831,42 +3238,47 @@ static drflac_bool32 drflac__decode_samples__verbatim(drflac_bs* bs, drflac_uint return DRFLAC_TRUE; } -static drflac_bool32 drflac__decode_samples__fixed(drflac_bs* bs, drflac_uint32 blockSize, drflac_uint32 bitsPerSample, drflac_uint8 lpcOrder, drflac_int32* pDecodedSamples) +static drflac_bool32 drflac__decode_samples__fixed(drflac_bs* bs, drflac_uint32 blockSize, + drflac_uint32 bitsPerSample, drflac_uint8 lpcOrder, + drflac_int32* pDecodedSamples) { drflac_int32 lpcCoefficientsTable[5][4] = { - {0, 0, 0, 0}, - {1, 0, 0, 0}, - {2, -1, 0, 0}, - {3, -3, 1, 0}, - {4, -6, 4, -1} + { 0, 0, 0, 0 }, { 1, 0, 0, 0 }, { 2, -1, 0, 0 }, { 3, -3, 1, 0 }, { 4, -6, 4, -1 } }; // Warm up samples and coefficients. - for (drflac_uint32 i = 0; i < lpcOrder; ++i) { + for (drflac_uint32 i = 0; i < lpcOrder; ++i) + { drflac_int32 sample; - if (!drflac__read_int32(bs, bitsPerSample, &sample)) { + if (!drflac__read_int32(bs, bitsPerSample, &sample)) + { return DRFLAC_FALSE; } pDecodedSamples[i] = sample; } - - if (!drflac__decode_samples_with_residual(bs, bitsPerSample, blockSize, lpcOrder, 0, lpcCoefficientsTable[lpcOrder], pDecodedSamples)) { + if (!drflac__decode_samples_with_residual(bs, bitsPerSample, blockSize, lpcOrder, 0, + lpcCoefficientsTable[lpcOrder], pDecodedSamples)) + { return DRFLAC_FALSE; } return DRFLAC_TRUE; } -static drflac_bool32 drflac__decode_samples__lpc(drflac_bs* bs, drflac_uint32 blockSize, drflac_uint32 bitsPerSample, drflac_uint8 lpcOrder, drflac_int32* pDecodedSamples) +static drflac_bool32 drflac__decode_samples__lpc(drflac_bs* bs, drflac_uint32 blockSize, + drflac_uint32 bitsPerSample, drflac_uint8 lpcOrder, + drflac_int32* pDecodedSamples) { drflac_uint8 i; // Warm up samples. - for (i = 0; i < lpcOrder; ++i) { + for (i = 0; i < lpcOrder; ++i) + { drflac_int32 sample; - if (!drflac__read_int32(bs, bitsPerSample, &sample)) { + if (!drflac__read_int32(bs, bitsPerSample, &sample)) + { return DRFLAC_FALSE; } @@ -2874,202 +3286,251 @@ static drflac_bool32 drflac__decode_samples__lpc(drflac_bs* bs, drflac_uint32 bl } drflac_uint8 lpcPrecision; - if (!drflac__read_uint8(bs, 4, &lpcPrecision)) { + if (!drflac__read_uint8(bs, 4, &lpcPrecision)) + { return DRFLAC_FALSE; } - if (lpcPrecision == 15) { - return DRFLAC_FALSE; // Invalid. + if (lpcPrecision == 15) + { + return DRFLAC_FALSE; // Invalid. } lpcPrecision += 1; - drflac_int8 lpcShift; - if (!drflac__read_int8(bs, 5, &lpcShift)) { + if (!drflac__read_int8(bs, 5, &lpcShift)) + { return DRFLAC_FALSE; } - drflac_int32 coefficients[32]; - for (i = 0; i < lpcOrder; ++i) { - if (!drflac__read_int32(bs, lpcPrecision, coefficients + i)) { + for (i = 0; i < lpcOrder; ++i) + { + if (!drflac__read_int32(bs, lpcPrecision, coefficients + i)) + { return DRFLAC_FALSE; } } - if (!drflac__decode_samples_with_residual(bs, bitsPerSample, blockSize, lpcOrder, lpcShift, coefficients, pDecodedSamples)) { + if (!drflac__decode_samples_with_residual(bs, bitsPerSample, blockSize, lpcOrder, lpcShift, coefficients, + pDecodedSamples)) + { return DRFLAC_FALSE; } return DRFLAC_TRUE; } - -static drflac_bool32 drflac__read_next_frame_header(drflac_bs* bs, drflac_uint8 streaminfoBitsPerSample, drflac_frame_header* header) +static drflac_bool32 drflac__read_next_frame_header(drflac_bs* bs, drflac_uint8 streaminfoBitsPerSample, + drflac_frame_header* header) { drflac_assert(bs != NULL); drflac_assert(header != NULL); - const drflac_uint32 sampleRateTable[12] = {0, 88200, 176400, 192000, 8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000}; - const drflac_uint8 bitsPerSampleTable[8] = {0, 8, 12, (drflac_uint8)-1, 16, 20, 24, (drflac_uint8)-1}; // -1 = reserved. + const drflac_uint32 sampleRateTable[12] = { 0, 88200, 176400, 192000, 8000, 16000, + 22050, 24000, 32000, 44100, 48000, 96000 }; + const drflac_uint8 bitsPerSampleTable[8] = { + 0, 8, 12, (drflac_uint8)-1, 16, 20, 24, (drflac_uint8)-1 + }; // -1 = reserved. // Keep looping until we find a valid sync code. - for (;;) { - if (!drflac__find_and_seek_to_next_sync_code(bs)) { + for (;;) + { + if (!drflac__find_and_seek_to_next_sync_code(bs)) + { return DRFLAC_FALSE; } drflac_uint8 crc8 = 0xCE; // 0xCE = drflac_crc8(0, 0x3FFE, 14); drflac_uint8 reserved = 0; - if (!drflac__read_uint8(bs, 1, &reserved)) { + if (!drflac__read_uint8(bs, 1, &reserved)) + { return DRFLAC_FALSE; } - if (reserved == 1) { + if (reserved == 1) + { continue; } crc8 = drflac_crc8(crc8, reserved, 1); - drflac_uint8 blockingStrategy = 0; - if (!drflac__read_uint8(bs, 1, &blockingStrategy)) { + if (!drflac__read_uint8(bs, 1, &blockingStrategy)) + { return DRFLAC_FALSE; } crc8 = drflac_crc8(crc8, blockingStrategy, 1); - drflac_uint8 blockSize = 0; - if (!drflac__read_uint8(bs, 4, &blockSize)) { + if (!drflac__read_uint8(bs, 4, &blockSize)) + { return DRFLAC_FALSE; } - if (blockSize == 0) { + if (blockSize == 0) + { continue; } crc8 = drflac_crc8(crc8, blockSize, 4); - drflac_uint8 sampleRate = 0; - if (!drflac__read_uint8(bs, 4, &sampleRate)) { + if (!drflac__read_uint8(bs, 4, &sampleRate)) + { return DRFLAC_FALSE; } crc8 = drflac_crc8(crc8, sampleRate, 4); - drflac_uint8 channelAssignment = 0; - if (!drflac__read_uint8(bs, 4, &channelAssignment)) { + if (!drflac__read_uint8(bs, 4, &channelAssignment)) + { return DRFLAC_FALSE; } - if (channelAssignment > 10) { + if (channelAssignment > 10) + { continue; } crc8 = drflac_crc8(crc8, channelAssignment, 4); - drflac_uint8 bitsPerSample = 0; - if (!drflac__read_uint8(bs, 3, &bitsPerSample)) { + if (!drflac__read_uint8(bs, 3, &bitsPerSample)) + { return DRFLAC_FALSE; } - if (bitsPerSample == 3 || bitsPerSample == 7) { + if (bitsPerSample == 3 || bitsPerSample == 7) + { continue; } crc8 = drflac_crc8(crc8, bitsPerSample, 3); - - if (!drflac__read_uint8(bs, 1, &reserved)) { + if (!drflac__read_uint8(bs, 1, &reserved)) + { return DRFLAC_FALSE; } - if (reserved == 1) { + if (reserved == 1) + { continue; } crc8 = drflac_crc8(crc8, reserved, 1); - drflac_bool32 isVariableBlockSize = blockingStrategy == 1; - if (isVariableBlockSize) { + if (isVariableBlockSize) + { drflac_uint64 sampleNumber; drflac_result result = drflac__read_utf8_coded_number(bs, &sampleNumber, &crc8); - if (result != DRFLAC_SUCCESS) { - if (result == DRFLAC_END_OF_STREAM) { + if (result != DRFLAC_SUCCESS) + { + if (result == DRFLAC_END_OF_STREAM) + { return DRFLAC_FALSE; - } else { + } + else + { continue; } } header->frameNumber = 0; header->sampleNumber = sampleNumber; - } else { + } + else + { drflac_uint64 frameNumber = 0; - drflac_result result = drflac__read_utf8_coded_number(bs, &frameNumber, &crc8); - if (result != DRFLAC_SUCCESS) { - if (result == DRFLAC_END_OF_STREAM) { + drflac_result result = drflac__read_utf8_coded_number(bs, &frameNumber, &crc8); + if (result != DRFLAC_SUCCESS) + { + if (result == DRFLAC_END_OF_STREAM) + { return DRFLAC_FALSE; - } else { + } + else + { continue; } } - header->frameNumber = (drflac_uint32)frameNumber; // <-- Safe cast. + header->frameNumber = (drflac_uint32)frameNumber; // <-- Safe cast. header->sampleNumber = 0; } - - if (blockSize == 1) { + if (blockSize == 1) + { header->blockSize = 192; - } else if (blockSize >= 2 && blockSize <= 5) { + } + else if (blockSize >= 2 && blockSize <= 5) + { header->blockSize = 576 * (1 << (blockSize - 2)); - } else if (blockSize == 6) { - if (!drflac__read_uint16(bs, 8, &header->blockSize)) { + } + else if (blockSize == 6) + { + if (!drflac__read_uint16(bs, 8, &header->blockSize)) + { return DRFLAC_FALSE; } crc8 = drflac_crc8(crc8, header->blockSize, 8); header->blockSize += 1; - } else if (blockSize == 7) { - if (!drflac__read_uint16(bs, 16, &header->blockSize)) { + } + else if (blockSize == 7) + { + if (!drflac__read_uint16(bs, 16, &header->blockSize)) + { return DRFLAC_FALSE; } crc8 = drflac_crc8(crc8, header->blockSize, 16); header->blockSize += 1; - } else { + } + else + { header->blockSize = 256 * (1 << (blockSize - 8)); } - - if (sampleRate <= 11) { + if (sampleRate <= 11) + { header->sampleRate = sampleRateTable[sampleRate]; - } else if (sampleRate == 12) { - if (!drflac__read_uint32(bs, 8, &header->sampleRate)) { + } + else if (sampleRate == 12) + { + if (!drflac__read_uint32(bs, 8, &header->sampleRate)) + { return DRFLAC_FALSE; } crc8 = drflac_crc8(crc8, header->sampleRate, 8); header->sampleRate *= 1000; - } else if (sampleRate == 13) { - if (!drflac__read_uint32(bs, 16, &header->sampleRate)) { + } + else if (sampleRate == 13) + { + if (!drflac__read_uint32(bs, 16, &header->sampleRate)) + { return DRFLAC_FALSE; } crc8 = drflac_crc8(crc8, header->sampleRate, 16); - } else if (sampleRate == 14) { - if (!drflac__read_uint32(bs, 16, &header->sampleRate)) { + } + else if (sampleRate == 14) + { + if (!drflac__read_uint32(bs, 16, &header->sampleRate)) + { return DRFLAC_FALSE; } crc8 = drflac_crc8(crc8, header->sampleRate, 16); header->sampleRate *= 10; - } else { - continue; // Invalid. Assume an invalid block. } - + else + { + continue; // Invalid. Assume an invalid block. + } header->channelAssignment = channelAssignment; header->bitsPerSample = bitsPerSampleTable[bitsPerSample]; - if (header->bitsPerSample == 0) { + if (header->bitsPerSample == 0) + { header->bitsPerSample = streaminfoBitsPerSample; } - if (!drflac__read_uint8(bs, 8, &header->crc8)) { + if (!drflac__read_uint8(bs, 8, &header->crc8)) + { return DRFLAC_FALSE; } #ifndef DR_FLAC_NO_CRC - if (header->crc8 != crc8) { - continue; // CRC mismatch. Loop back to the top and find the next sync code. + if (header->crc8 != crc8) + { + continue; // CRC mismatch. Loop back to the top and find the next sync code. } #endif return DRFLAC_TRUE; @@ -3079,45 +3540,61 @@ static drflac_bool32 drflac__read_next_frame_header(drflac_bs* bs, drflac_uint8 static drflac_bool32 drflac__read_subframe_header(drflac_bs* bs, drflac_subframe* pSubframe) { drflac_uint8 header; - if (!drflac__read_uint8(bs, 8, &header)) { + if (!drflac__read_uint8(bs, 8, &header)) + { return DRFLAC_FALSE; } // First bit should always be 0. - if ((header & 0x80) != 0) { + if ((header & 0x80) != 0) + { return DRFLAC_FALSE; } int type = (header & 0x7E) >> 1; - if (type == 0) { + if (type == 0) + { pSubframe->subframeType = DRFLAC_SUBFRAME_CONSTANT; - } else if (type == 1) { + } + else if (type == 1) + { pSubframe->subframeType = DRFLAC_SUBFRAME_VERBATIM; - } else { - if ((type & 0x20) != 0) { + } + else + { + if ((type & 0x20) != 0) + { pSubframe->subframeType = DRFLAC_SUBFRAME_LPC; - pSubframe->lpcOrder = (type & 0x1F) + 1; - } else if ((type & 0x08) != 0) { + pSubframe->lpcOrder = (type & 0x1F) + 1; + } + else if ((type & 0x08) != 0) + { pSubframe->subframeType = DRFLAC_SUBFRAME_FIXED; - pSubframe->lpcOrder = (type & 0x07); - if (pSubframe->lpcOrder > 4) { + pSubframe->lpcOrder = (type & 0x07); + if (pSubframe->lpcOrder > 4) + { pSubframe->subframeType = DRFLAC_SUBFRAME_RESERVED; - pSubframe->lpcOrder = 0; + pSubframe->lpcOrder = 0; } - } else { + } + else + { pSubframe->subframeType = DRFLAC_SUBFRAME_RESERVED; } } - if (pSubframe->subframeType == DRFLAC_SUBFRAME_RESERVED) { + if (pSubframe->subframeType == DRFLAC_SUBFRAME_RESERVED) + { return DRFLAC_FALSE; } // Wasted bits per sample. pSubframe->wastedBitsPerSample = 0; - if ((header & 0x01) == 1) { + if ((header & 0x01) == 1) + { unsigned int wastedBitsPerSample; - if (!drflac__seek_past_next_set_bit(bs, &wastedBitsPerSample)) { + if (!drflac__seek_past_next_set_bit(bs, &wastedBitsPerSample)) + { return DRFLAC_FALSE; } pSubframe->wastedBitsPerSample = (unsigned char)wastedBitsPerSample + 1; @@ -3126,26 +3603,34 @@ static drflac_bool32 drflac__read_subframe_header(drflac_bs* bs, drflac_subframe return DRFLAC_TRUE; } -static drflac_bool32 drflac__decode_subframe(drflac_bs* bs, drflac_frame* frame, int subframeIndex, drflac_int32* pDecodedSamplesOut) +static drflac_bool32 drflac__decode_subframe(drflac_bs* bs, drflac_frame* frame, int subframeIndex, + drflac_int32* pDecodedSamplesOut) { drflac_assert(bs != NULL); drflac_assert(frame != NULL); drflac_subframe* pSubframe = frame->subframes + subframeIndex; - if (!drflac__read_subframe_header(bs, pSubframe)) { + if (!drflac__read_subframe_header(bs, pSubframe)) + { return DRFLAC_FALSE; } // Side channels require an extra bit per sample. Took a while to figure that one out... pSubframe->bitsPerSample = frame->header.bitsPerSample; - if ((frame->header.channelAssignment == DRFLAC_CHANNEL_ASSIGNMENT_LEFT_SIDE || frame->header.channelAssignment == DRFLAC_CHANNEL_ASSIGNMENT_MID_SIDE) && subframeIndex == 1) { + if ((frame->header.channelAssignment == DRFLAC_CHANNEL_ASSIGNMENT_LEFT_SIDE || + frame->header.channelAssignment == DRFLAC_CHANNEL_ASSIGNMENT_MID_SIDE) && + subframeIndex == 1) + { pSubframe->bitsPerSample += 1; - } else if (frame->header.channelAssignment == DRFLAC_CHANNEL_ASSIGNMENT_RIGHT_SIDE && subframeIndex == 0) { + } + else if (frame->header.channelAssignment == DRFLAC_CHANNEL_ASSIGNMENT_RIGHT_SIDE && subframeIndex == 0) + { pSubframe->bitsPerSample += 1; } // Need to handle wasted bits per sample. - if (pSubframe->wastedBitsPerSample >= pSubframe->bitsPerSample) { + if (pSubframe->wastedBitsPerSample >= pSubframe->bitsPerSample) + { return DRFLAC_FALSE; } pSubframe->bitsPerSample -= pSubframe->wastedBitsPerSample; @@ -3153,27 +3638,36 @@ static drflac_bool32 drflac__decode_subframe(drflac_bs* bs, drflac_frame* frame, switch (pSubframe->subframeType) { - case DRFLAC_SUBFRAME_CONSTANT: - { - drflac__decode_samples__constant(bs, frame->header.blockSize, pSubframe->bitsPerSample, pSubframe->pDecodedSamples); - } break; + case DRFLAC_SUBFRAME_CONSTANT: + { + drflac__decode_samples__constant(bs, frame->header.blockSize, pSubframe->bitsPerSample, + pSubframe->pDecodedSamples); + } + break; - case DRFLAC_SUBFRAME_VERBATIM: - { - drflac__decode_samples__verbatim(bs, frame->header.blockSize, pSubframe->bitsPerSample, pSubframe->pDecodedSamples); - } break; + case DRFLAC_SUBFRAME_VERBATIM: + { + drflac__decode_samples__verbatim(bs, frame->header.blockSize, pSubframe->bitsPerSample, + pSubframe->pDecodedSamples); + } + break; - case DRFLAC_SUBFRAME_FIXED: - { - drflac__decode_samples__fixed(bs, frame->header.blockSize, pSubframe->bitsPerSample, pSubframe->lpcOrder, pSubframe->pDecodedSamples); - } break; + case DRFLAC_SUBFRAME_FIXED: + { + drflac__decode_samples__fixed(bs, frame->header.blockSize, pSubframe->bitsPerSample, + pSubframe->lpcOrder, pSubframe->pDecodedSamples); + } + break; - case DRFLAC_SUBFRAME_LPC: - { - drflac__decode_samples__lpc(bs, frame->header.blockSize, pSubframe->bitsPerSample, pSubframe->lpcOrder, pSubframe->pDecodedSamples); - } break; + case DRFLAC_SUBFRAME_LPC: + { + drflac__decode_samples__lpc(bs, frame->header.blockSize, pSubframe->bitsPerSample, + pSubframe->lpcOrder, pSubframe->pDecodedSamples); + } + break; - default: return DRFLAC_FALSE; + default: + return DRFLAC_FALSE; } return DRFLAC_TRUE; @@ -3185,20 +3679,27 @@ static drflac_bool32 drflac__seek_subframe(drflac_bs* bs, drflac_frame* frame, i drflac_assert(frame != NULL); drflac_subframe* pSubframe = frame->subframes + subframeIndex; - if (!drflac__read_subframe_header(bs, pSubframe)) { + if (!drflac__read_subframe_header(bs, pSubframe)) + { return DRFLAC_FALSE; } // Side channels require an extra bit per sample. Took a while to figure that one out... pSubframe->bitsPerSample = frame->header.bitsPerSample; - if ((frame->header.channelAssignment == DRFLAC_CHANNEL_ASSIGNMENT_LEFT_SIDE || frame->header.channelAssignment == DRFLAC_CHANNEL_ASSIGNMENT_MID_SIDE) && subframeIndex == 1) { + if ((frame->header.channelAssignment == DRFLAC_CHANNEL_ASSIGNMENT_LEFT_SIDE || + frame->header.channelAssignment == DRFLAC_CHANNEL_ASSIGNMENT_MID_SIDE) && + subframeIndex == 1) + { pSubframe->bitsPerSample += 1; - } else if (frame->header.channelAssignment == DRFLAC_CHANNEL_ASSIGNMENT_RIGHT_SIDE && subframeIndex == 0) { + } + else if (frame->header.channelAssignment == DRFLAC_CHANNEL_ASSIGNMENT_RIGHT_SIDE && subframeIndex == 0) + { pSubframe->bitsPerSample += 1; } // Need to handle wasted bits per sample. - if (pSubframe->wastedBitsPerSample >= pSubframe->bitsPerSample) { + if (pSubframe->wastedBitsPerSample >= pSubframe->bitsPerSample) + { return DRFLAC_FALSE; } pSubframe->bitsPerSample -= pSubframe->wastedBitsPerSample; @@ -3206,72 +3707,85 @@ static drflac_bool32 drflac__seek_subframe(drflac_bs* bs, drflac_frame* frame, i switch (pSubframe->subframeType) { - case DRFLAC_SUBFRAME_CONSTANT: + case DRFLAC_SUBFRAME_CONSTANT: + { + if (!drflac__seek_bits(bs, pSubframe->bitsPerSample)) { - if (!drflac__seek_bits(bs, pSubframe->bitsPerSample)) { - return DRFLAC_FALSE; - } - } break; + return DRFLAC_FALSE; + } + } + break; - case DRFLAC_SUBFRAME_VERBATIM: + case DRFLAC_SUBFRAME_VERBATIM: + { + unsigned int bitsToSeek = frame->header.blockSize * pSubframe->bitsPerSample; + if (!drflac__seek_bits(bs, bitsToSeek)) { - unsigned int bitsToSeek = frame->header.blockSize * pSubframe->bitsPerSample; - if (!drflac__seek_bits(bs, bitsToSeek)) { - return DRFLAC_FALSE; - } - } break; + return DRFLAC_FALSE; + } + } + break; - case DRFLAC_SUBFRAME_FIXED: + case DRFLAC_SUBFRAME_FIXED: + { + unsigned int bitsToSeek = pSubframe->lpcOrder * pSubframe->bitsPerSample; + if (!drflac__seek_bits(bs, bitsToSeek)) { - unsigned int bitsToSeek = pSubframe->lpcOrder * pSubframe->bitsPerSample; - if (!drflac__seek_bits(bs, bitsToSeek)) { - return DRFLAC_FALSE; - } - - if (!drflac__read_and_seek_residual(bs, frame->header.blockSize, pSubframe->lpcOrder)) { - return DRFLAC_FALSE; - } - } break; + return DRFLAC_FALSE; + } - case DRFLAC_SUBFRAME_LPC: + if (!drflac__read_and_seek_residual(bs, frame->header.blockSize, pSubframe->lpcOrder)) { - unsigned int bitsToSeek = pSubframe->lpcOrder * pSubframe->bitsPerSample; - if (!drflac__seek_bits(bs, bitsToSeek)) { - return DRFLAC_FALSE; - } + return DRFLAC_FALSE; + } + } + break; - unsigned char lpcPrecision; - if (!drflac__read_uint8(bs, 4, &lpcPrecision)) { - return DRFLAC_FALSE; - } - if (lpcPrecision == 15) { - return DRFLAC_FALSE; // Invalid. - } - lpcPrecision += 1; + case DRFLAC_SUBFRAME_LPC: + { + unsigned int bitsToSeek = pSubframe->lpcOrder * pSubframe->bitsPerSample; + if (!drflac__seek_bits(bs, bitsToSeek)) + { + return DRFLAC_FALSE; + } + unsigned char lpcPrecision; + if (!drflac__read_uint8(bs, 4, &lpcPrecision)) + { + return DRFLAC_FALSE; + } + if (lpcPrecision == 15) + { + return DRFLAC_FALSE; // Invalid. + } + lpcPrecision += 1; - bitsToSeek = (pSubframe->lpcOrder * lpcPrecision) + 5; // +5 for shift. - if (!drflac__seek_bits(bs, bitsToSeek)) { - return DRFLAC_FALSE; - } + bitsToSeek = (pSubframe->lpcOrder * lpcPrecision) + 5; // +5 for shift. + if (!drflac__seek_bits(bs, bitsToSeek)) + { + return DRFLAC_FALSE; + } - if (!drflac__read_and_seek_residual(bs, frame->header.blockSize, pSubframe->lpcOrder)) { - return DRFLAC_FALSE; - } - } break; + if (!drflac__read_and_seek_residual(bs, frame->header.blockSize, pSubframe->lpcOrder)) + { + return DRFLAC_FALSE; + } + } + break; - default: return DRFLAC_FALSE; + default: + return DRFLAC_FALSE; } return DRFLAC_TRUE; } - -static DRFLAC_INLINE drflac_uint8 drflac__get_channel_count_from_channel_assignment(drflac_int8 channelAssignment) +static DRFLAC_INLINE drflac_uint8 +drflac__get_channel_count_from_channel_assignment(drflac_int8 channelAssignment) { drflac_assert(channelAssignment <= 10); - drflac_uint8 lookup[] = {1, 2, 3, 4, 5, 6, 7, 8, 2, 2, 2}; + drflac_uint8 lookup[] = { 1, 2, 3, 4, 5, 6, 7, 8, 2, 2, 2 }; return lookup[channelAssignment]; } @@ -3281,26 +3795,34 @@ static drflac_result drflac__decode_frame(drflac* pFlac) drflac_zero_memory(pFlac->currentFrame.subframes, sizeof(pFlac->currentFrame.subframes)); // The frame block size must never be larger than the maximum block size defined by the FLAC stream. - if (pFlac->currentFrame.header.blockSize > pFlac->maxBlockSize) { + if (pFlac->currentFrame.header.blockSize > pFlac->maxBlockSize) + { return DRFLAC_ERROR; } // The number of channels in the frame must match the channel count from the STREAMINFO block. - int channelCount = drflac__get_channel_count_from_channel_assignment(pFlac->currentFrame.header.channelAssignment); - if (channelCount != (int)pFlac->channels) { + int channelCount = + drflac__get_channel_count_from_channel_assignment(pFlac->currentFrame.header.channelAssignment); + if (channelCount != (int)pFlac->channels) + { return DRFLAC_ERROR; } - for (int i = 0; i < channelCount; ++i) { - if (!drflac__decode_subframe(&pFlac->bs, &pFlac->currentFrame, i, pFlac->pDecodedSamples + (pFlac->currentFrame.header.blockSize * i))) { + for (int i = 0; i < channelCount; ++i) + { + if (!drflac__decode_subframe(&pFlac->bs, &pFlac->currentFrame, i, + pFlac->pDecodedSamples + (pFlac->currentFrame.header.blockSize * i))) + { return DRFLAC_ERROR; } } drflac_uint8 paddingSizeInBits = DRFLAC_CACHE_L1_BITS_REMAINING(&pFlac->bs) & 7; - if (paddingSizeInBits > 0) { + if (paddingSizeInBits > 0) + { drflac_uint8 padding = 0; - if (!drflac__read_uint8(&pFlac->bs, paddingSizeInBits, &padding)) { + if (!drflac__read_uint8(&pFlac->bs, paddingSizeInBits, &padding)) + { return DRFLAC_END_OF_STREAM; } } @@ -3309,13 +3831,15 @@ static drflac_result drflac__decode_frame(drflac* pFlac) drflac_uint16 actualCRC16 = drflac__flush_crc16(&pFlac->bs); #endif drflac_uint16 desiredCRC16; - if (!drflac__read_uint16(&pFlac->bs, 16, &desiredCRC16)) { + if (!drflac__read_uint16(&pFlac->bs, 16, &desiredCRC16)) + { return DRFLAC_END_OF_STREAM; } #ifndef DR_FLAC_NO_CRC - if (actualCRC16 != desiredCRC16) { - return DRFLAC_CRC_MISMATCH; // CRC mismatch. + if (actualCRC16 != desiredCRC16) + { + return DRFLAC_CRC_MISMATCH; // CRC mismatch. } #endif @@ -3326,15 +3850,19 @@ static drflac_result drflac__decode_frame(drflac* pFlac) static drflac_result drflac__seek_frame(drflac* pFlac) { - int channelCount = drflac__get_channel_count_from_channel_assignment(pFlac->currentFrame.header.channelAssignment); - for (int i = 0; i < channelCount; ++i) { - if (!drflac__seek_subframe(&pFlac->bs, &pFlac->currentFrame, i)) { + int channelCount = + drflac__get_channel_count_from_channel_assignment(pFlac->currentFrame.header.channelAssignment); + for (int i = 0; i < channelCount; ++i) + { + if (!drflac__seek_subframe(&pFlac->bs, &pFlac->currentFrame, i)) + { return DRFLAC_ERROR; } } // Padding. - if (!drflac__seek_bits(&pFlac->bs, DRFLAC_CACHE_L1_BITS_REMAINING(&pFlac->bs) & 7)) { + if (!drflac__seek_bits(&pFlac->bs, DRFLAC_CACHE_L1_BITS_REMAINING(&pFlac->bs) & 7)) + { return DRFLAC_ERROR; } @@ -3343,13 +3871,15 @@ static drflac_result drflac__seek_frame(drflac* pFlac) drflac_uint16 actualCRC16 = drflac__flush_crc16(&pFlac->bs); #endif drflac_uint16 desiredCRC16; - if (!drflac__read_uint16(&pFlac->bs, 16, &desiredCRC16)) { + if (!drflac__read_uint16(&pFlac->bs, 16, &desiredCRC16)) + { return DRFLAC_END_OF_STREAM; } #ifndef DR_FLAC_NO_CRC - if (actualCRC16 != desiredCRC16) { - return DRFLAC_CRC_MISMATCH; // CRC mismatch. + if (actualCRC16 != desiredCRC16) + { + return DRFLAC_CRC_MISMATCH; // CRC mismatch. } #endif @@ -3360,16 +3890,22 @@ static drflac_bool32 drflac__read_and_decode_next_frame(drflac* pFlac) { drflac_assert(pFlac != NULL); - for (;;) { - if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) { + for (;;) + { + if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) + { return DRFLAC_FALSE; } drflac_result result = drflac__decode_frame(pFlac); - if (result != DRFLAC_SUCCESS) { - if (result == DRFLAC_CRC_MISMATCH) { - continue; // CRC mismatch. Skip to the next frame. - } else { + if (result != DRFLAC_SUCCESS) + { + if (result == DRFLAC_CRC_MISMATCH) + { + continue; // CRC mismatch. Skip to the next frame. + } + else + { return DRFLAC_FALSE; } } @@ -3378,25 +3914,31 @@ static drflac_bool32 drflac__read_and_decode_next_frame(drflac* pFlac) } } - -static void drflac__get_current_frame_sample_range(drflac* pFlac, drflac_uint64* pFirstSampleInFrameOut, drflac_uint64* pLastSampleInFrameOut) +static void drflac__get_current_frame_sample_range(drflac* pFlac, drflac_uint64* pFirstSampleInFrameOut, + drflac_uint64* pLastSampleInFrameOut) { drflac_assert(pFlac != NULL); - unsigned int channelCount = drflac__get_channel_count_from_channel_assignment(pFlac->currentFrame.header.channelAssignment); + unsigned int channelCount = + drflac__get_channel_count_from_channel_assignment(pFlac->currentFrame.header.channelAssignment); drflac_uint64 firstSampleInFrame = pFlac->currentFrame.header.sampleNumber; - if (firstSampleInFrame == 0) { - firstSampleInFrame = pFlac->currentFrame.header.frameNumber * pFlac->maxBlockSize*channelCount; + if (firstSampleInFrame == 0) + { + firstSampleInFrame = pFlac->currentFrame.header.frameNumber * pFlac->maxBlockSize * channelCount; } - drflac_uint64 lastSampleInFrame = firstSampleInFrame + (pFlac->currentFrame.header.blockSize*channelCount); - if (lastSampleInFrame > 0) { + drflac_uint64 lastSampleInFrame = + firstSampleInFrame + (pFlac->currentFrame.header.blockSize * channelCount); + if (lastSampleInFrame > 0) + { lastSampleInFrame -= 1; // Needs to be zero based. } - if (pFirstSampleInFrameOut) *pFirstSampleInFrameOut = firstSampleInFrame; - if (pLastSampleInFrameOut) *pLastSampleInFrameOut = lastSampleInFrame; + if (pFirstSampleInFrameOut) + *pFirstSampleInFrameOut = firstSampleInFrame; + if (pLastSampleInFrameOut) + *pLastSampleInFrameOut = lastSampleInFrame; } static drflac_bool32 drflac__seek_to_first_frame(drflac* pFlac) @@ -3413,7 +3955,8 @@ static drflac_bool32 drflac__seek_to_first_frame(drflac* pFlac) static DRFLAC_INLINE drflac_result drflac__seek_to_next_frame(drflac* pFlac) { - // This function should only ever be called while the decoder is sitting on the first byte past the FRAME_HEADER section. + // This function should only ever be called while the decoder is sitting on the first byte past the + // FRAME_HEADER section. drflac_assert(pFlac != NULL); return drflac__seek_frame(pFlac); } @@ -3424,210 +3967,286 @@ static drflac_bool32 drflac__seek_to_sample__brute_force(drflac* pFlac, drflac_u drflac_bool32 isMidFrame = DRFLAC_FALSE; - // If we are seeking forward we start from the current position. Otherwise we need to start all the way from the start of the file. + // If we are seeking forward we start from the current position. Otherwise we need to start all the way + // from the start of the file. drflac_uint64 runningSampleCount; - if (sampleIndex >= pFlac->currentSample) { + if (sampleIndex >= pFlac->currentSample) + { // Seeking forward. Need to seek from the current position. runningSampleCount = pFlac->currentSample; // The frame header for the first frame may not yet have been read. We need to do that if necessary. - if (pFlac->currentSample == 0 && pFlac->currentFrame.samplesRemaining == 0) { - if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) { + if (pFlac->currentSample == 0 && pFlac->currentFrame.samplesRemaining == 0) + { + if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, + &pFlac->currentFrame.header)) + { return DRFLAC_FALSE; } - } else { + } + else + { isMidFrame = DRFLAC_TRUE; } - } else { + } + else + { // Seeking backwards. Need to seek from the start of the file. runningSampleCount = 0; // Move back to the start. - if (!drflac__seek_to_first_frame(pFlac)) { + if (!drflac__seek_to_first_frame(pFlac)) + { return DRFLAC_FALSE; } // Decode the first frame in preparation for sample-exact seeking below. - if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) { + if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) + { return DRFLAC_FALSE; } } - // We need to as quickly as possible find the frame that contains the target sample. To do this, we iterate over each frame and inspect its - // header. If based on the header we can determine that the frame contains the sample, we do a full decode of that frame. - for (;;) { + // We need to as quickly as possible find the frame that contains the target sample. To do this, we + // iterate over each frame and inspect its header. If based on the header we can determine that the frame + // contains the sample, we do a full decode of that frame. + for (;;) + { drflac_uint64 firstSampleInFrame = 0; - drflac_uint64 lastSampleInFrame = 0; + drflac_uint64 lastSampleInFrame = 0; drflac__get_current_frame_sample_range(pFlac, &firstSampleInFrame, &lastSampleInFrame); drflac_uint64 sampleCountInThisFrame = (lastSampleInFrame - firstSampleInFrame) + 1; - if (sampleIndex < (runningSampleCount + sampleCountInThisFrame)) { - // The sample should be in this frame. We need to fully decode it, however if it's an invalid frame (a CRC mismatch), we need to pretend - // it never existed and keep iterating. + if (sampleIndex < (runningSampleCount + sampleCountInThisFrame)) + { + // The sample should be in this frame. We need to fully decode it, however if it's an invalid + // frame (a CRC mismatch), we need to pretend it never existed and keep iterating. drflac_uint64 samplesToDecode = sampleIndex - runningSampleCount; - if (!isMidFrame) { + if (!isMidFrame) + { drflac_result result = drflac__decode_frame(pFlac); - if (result == DRFLAC_SUCCESS) { + if (result == DRFLAC_SUCCESS) + { // The frame is valid. We just need to skip over some samples to ensure it's sample-exact. - return drflac_read_s32(pFlac, samplesToDecode, NULL) == samplesToDecode; // <-- If this fails, something bad has happened (it should never fail). - } else { - if (result == DRFLAC_CRC_MISMATCH) { - goto next_iteration; // CRC mismatch. Pretend this frame never existed. - } else { + return drflac_read_s32(pFlac, samplesToDecode, NULL) == + samplesToDecode; // <-- If this fails, something bad has happened (it should never + // fail). + } + else + { + if (result == DRFLAC_CRC_MISMATCH) + { + goto next_iteration; // CRC mismatch. Pretend this frame never existed. + } + else + { return DRFLAC_FALSE; } } - } else { + } + else + { // We started seeking mid-frame which means we need to skip the frame decoding part. return drflac_read_s32(pFlac, samplesToDecode, NULL) == samplesToDecode; } - } else { - // It's not in this frame. We need to seek past the frame, but check if there was a CRC mismatch. If so, we pretend this - // frame never existed and leave the running sample count untouched. - if (!isMidFrame) { + } + else + { + // It's not in this frame. We need to seek past the frame, but check if there was a CRC mismatch. + // If so, we pretend this frame never existed and leave the running sample count untouched. + if (!isMidFrame) + { drflac_result result = drflac__seek_to_next_frame(pFlac); - if (result == DRFLAC_SUCCESS) { + if (result == DRFLAC_SUCCESS) + { runningSampleCount += sampleCountInThisFrame; - } else { - if (result == DRFLAC_CRC_MISMATCH) { - goto next_iteration; // CRC mismatch. Pretend this frame never existed. - } else { + } + else + { + if (result == DRFLAC_CRC_MISMATCH) + { + goto next_iteration; // CRC mismatch. Pretend this frame never existed. + } + else + { return DRFLAC_FALSE; } } - } else { - // We started seeking mid-frame which means we need to seek by reading to the end of the frame instead of with - // drflac__seek_to_next_frame() which only works if the decoder is sitting on the byte just after the frame header. + } + else + { + // We started seeking mid-frame which means we need to seek by reading to the end of the frame + // instead of with drflac__seek_to_next_frame() which only works if the decoder is sitting on + // the byte just after the frame header. runningSampleCount += pFlac->currentFrame.samplesRemaining; pFlac->currentFrame.samplesRemaining = 0; - isMidFrame = DRFLAC_FALSE; + isMidFrame = DRFLAC_FALSE; } } next_iteration: // Grab the next frame in preparation for the next iteration. - if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) { + if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) + { return DRFLAC_FALSE; } } } - static drflac_bool32 drflac__seek_to_sample__seek_table(drflac* pFlac, drflac_uint64 sampleIndex) { drflac_assert(pFlac != NULL); - if (pFlac->pSeekpoints == NULL || pFlac->seekpointCount == 0) { + if (pFlac->pSeekpoints == NULL || pFlac->seekpointCount == 0) + { return DRFLAC_FALSE; } - drflac_uint32 iClosestSeekpoint = 0; - for (drflac_uint32 iSeekpoint = 0; iSeekpoint < pFlac->seekpointCount; ++iSeekpoint) { - if (pFlac->pSeekpoints[iSeekpoint].firstSample*pFlac->channels >= sampleIndex) { + for (drflac_uint32 iSeekpoint = 0; iSeekpoint < pFlac->seekpointCount; ++iSeekpoint) + { + if (pFlac->pSeekpoints[iSeekpoint].firstSample * pFlac->channels >= sampleIndex) + { break; } iClosestSeekpoint = iSeekpoint; } - drflac_bool32 isMidFrame = DRFLAC_FALSE; - // At this point we should have found the seekpoint closest to our sample. If we are seeking forward and the closest seekpoint is _before_ the current sample, we - // just seek forward from where we are. Otherwise we start seeking from the seekpoint's first sample. + // At this point we should have found the seekpoint closest to our sample. If we are seeking forward and + // the closest seekpoint is _before_ the current sample, we just seek forward from where we are. Otherwise + // we start seeking from the seekpoint's first sample. drflac_uint64 runningSampleCount; - if ((sampleIndex >= pFlac->currentSample) && (pFlac->pSeekpoints[iClosestSeekpoint].firstSample*pFlac->channels <= pFlac->currentSample)) { + if ((sampleIndex >= pFlac->currentSample) && + (pFlac->pSeekpoints[iClosestSeekpoint].firstSample * pFlac->channels <= pFlac->currentSample)) + { // Optimized case. Just seek forward from where we are. runningSampleCount = pFlac->currentSample; // The frame header for the first frame may not yet have been read. We need to do that if necessary. - if (pFlac->currentSample == 0 && pFlac->currentFrame.samplesRemaining == 0) { - if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) { + if (pFlac->currentSample == 0 && pFlac->currentFrame.samplesRemaining == 0) + { + if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, + &pFlac->currentFrame.header)) + { return DRFLAC_FALSE; } - } else { + } + else + { isMidFrame = DRFLAC_TRUE; } - } else { + } + else + { // Slower case. Seek to the start of the seekpoint and then seek forward from there. - runningSampleCount = pFlac->pSeekpoints[iClosestSeekpoint].firstSample*pFlac->channels; + runningSampleCount = pFlac->pSeekpoints[iClosestSeekpoint].firstSample * pFlac->channels; - if (!drflac__seek_to_byte(&pFlac->bs, pFlac->firstFramePos + pFlac->pSeekpoints[iClosestSeekpoint].frameOffset)) { + if (!drflac__seek_to_byte(&pFlac->bs, + pFlac->firstFramePos + pFlac->pSeekpoints[iClosestSeekpoint].frameOffset)) + { return DRFLAC_FALSE; } // Grab the frame the seekpoint is sitting on in preparation for the sample-exact seeking below. - if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) { + if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) + { return DRFLAC_FALSE; } } - for (;;) { + for (;;) + { drflac_uint64 firstSampleInFrame = 0; - drflac_uint64 lastSampleInFrame = 0; + drflac_uint64 lastSampleInFrame = 0; drflac__get_current_frame_sample_range(pFlac, &firstSampleInFrame, &lastSampleInFrame); drflac_uint64 sampleCountInThisFrame = (lastSampleInFrame - firstSampleInFrame) + 1; - if (sampleIndex < (runningSampleCount + sampleCountInThisFrame)) { - // The sample should be in this frame. We need to fully decode it, but if it's an invalid frame (a CRC mismatch) we need to pretend - // it never existed and keep iterating. + if (sampleIndex < (runningSampleCount + sampleCountInThisFrame)) + { + // The sample should be in this frame. We need to fully decode it, but if it's an invalid frame (a + // CRC mismatch) we need to pretend it never existed and keep iterating. drflac_uint64 samplesToDecode = sampleIndex - runningSampleCount; - if (!isMidFrame) { + if (!isMidFrame) + { drflac_result result = drflac__decode_frame(pFlac); - if (result == DRFLAC_SUCCESS) { + if (result == DRFLAC_SUCCESS) + { // The frame is valid. We just need to skip over some samples to ensure it's sample-exact. - return drflac_read_s32(pFlac, samplesToDecode, NULL) == samplesToDecode; // <-- If this fails, something bad has happened (it should never fail). - } else { - if (result == DRFLAC_CRC_MISMATCH) { - goto next_iteration; // CRC mismatch. Pretend this frame never existed. - } else { + return drflac_read_s32(pFlac, samplesToDecode, NULL) == + samplesToDecode; // <-- If this fails, something bad has happened (it should never + // fail). + } + else + { + if (result == DRFLAC_CRC_MISMATCH) + { + goto next_iteration; // CRC mismatch. Pretend this frame never existed. + } + else + { return DRFLAC_FALSE; } } - } else { + } + else + { // We started seeking mid-frame which means we need to skip the frame decoding part. return drflac_read_s32(pFlac, samplesToDecode, NULL) == samplesToDecode; } - } else { - // It's not in this frame. We need to seek past the frame, but check if there was a CRC mismatch. If so, we pretend this - // frame never existed and leave the running sample count untouched. - if (!isMidFrame) { + } + else + { + // It's not in this frame. We need to seek past the frame, but check if there was a CRC mismatch. + // If so, we pretend this frame never existed and leave the running sample count untouched. + if (!isMidFrame) + { drflac_result result = drflac__seek_to_next_frame(pFlac); - if (result == DRFLAC_SUCCESS) { + if (result == DRFLAC_SUCCESS) + { runningSampleCount += sampleCountInThisFrame; - } else { - if (result == DRFLAC_CRC_MISMATCH) { - goto next_iteration; // CRC mismatch. Pretend this frame never existed. - } else { + } + else + { + if (result == DRFLAC_CRC_MISMATCH) + { + goto next_iteration; // CRC mismatch. Pretend this frame never existed. + } + else + { return DRFLAC_FALSE; } } - } else { - // We started seeking mid-frame which means we need to seek by reading to the end of the frame instead of with - // drflac__seek_to_next_frame() which only works if the decoder is sitting on the byte just after the frame header. + } + else + { + // We started seeking mid-frame which means we need to seek by reading to the end of the frame + // instead of with drflac__seek_to_next_frame() which only works if the decoder is sitting on + // the byte just after the frame header. runningSampleCount += pFlac->currentFrame.samplesRemaining; pFlac->currentFrame.samplesRemaining = 0; - isMidFrame = DRFLAC_FALSE; + isMidFrame = DRFLAC_FALSE; } } next_iteration: // Grab the next frame in preparation for the next iteration. - if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) { + if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) + { return DRFLAC_FALSE; } } } - #ifndef DR_FLAC_NO_OGG typedef struct { - drflac_uint8 capturePattern[4]; // Should be "OggS" - drflac_uint8 structureVersion; // Always 0. + drflac_uint8 capturePattern[4]; // Should be "OggS" + drflac_uint8 structureVersion; // Always 0. drflac_uint8 headerType; drflac_uint64 granulePosition; drflac_uint32 serialNumber; @@ -3647,15 +4266,16 @@ typedef struct void* pUserData; void* pUserDataMD; drflac_uint32 sampleRate; - drflac_uint8 channels; - drflac_uint8 bitsPerSample; + drflac_uint8 channels; + drflac_uint8 bitsPerSample; drflac_uint64 totalSampleCount; drflac_uint16 maxBlockSize; drflac_uint64 runningFilePos; drflac_bool32 hasStreamInfoBlock; drflac_bool32 hasMetadataBlocks; - drflac_bs bs; // <-- A bit streamer is required for loading data during initialization. - drflac_frame_header firstFrameHeader; // <-- The header of the first frame that was read during relaxed initalization. Only set if there is no STREAMINFO block. + drflac_bs bs; // <-- A bit streamer is required for loading data during initialization. + drflac_frame_header firstFrameHeader; // <-- The header of the first frame that was read during relaxed + // initalization. Only set if there is no STREAMINFO block. #ifndef DR_FLAC_NO_OGG drflac_uint32 oggSerial; @@ -3664,18 +4284,24 @@ typedef struct #endif } drflac_init_info; -static DRFLAC_INLINE void drflac__decode_block_header(drflac_uint32 blockHeader, drflac_uint8* isLastBlock, drflac_uint8* blockType, drflac_uint32* blockSize) +static DRFLAC_INLINE void drflac__decode_block_header(drflac_uint32 blockHeader, drflac_uint8* isLastBlock, + drflac_uint8* blockType, drflac_uint32* blockSize) { - blockHeader = drflac__be2host_32(blockHeader); + blockHeader = drflac__be2host_32(blockHeader); *isLastBlock = (blockHeader & (0x01 << 31)) >> 31; *blockType = (blockHeader & (0x7F << 24)) >> 24; *blockSize = (blockHeader & 0xFFFFFF); } -static DRFLAC_INLINE drflac_bool32 drflac__read_and_decode_block_header(drflac_read_proc onRead, void* pUserData, drflac_uint8* isLastBlock, drflac_uint8* blockType, drflac_uint32* blockSize) +static DRFLAC_INLINE drflac_bool32 drflac__read_and_decode_block_header(drflac_read_proc onRead, + void* pUserData, + drflac_uint8* isLastBlock, + drflac_uint8* blockType, + drflac_uint32* blockSize) { drflac_uint32 blockHeader; - if (onRead(pUserData, &blockHeader, 4) != 4) { + if (onRead(pUserData, &blockHeader, 4) != 4) + { return DRFLAC_FALSE; } @@ -3683,29 +4309,34 @@ static DRFLAC_INLINE drflac_bool32 drflac__read_and_decode_block_header(drflac_r return DRFLAC_TRUE; } -drflac_bool32 drflac__read_streaminfo(drflac_read_proc onRead, void* pUserData, drflac_streaminfo* pStreamInfo) +drflac_bool32 drflac__read_streaminfo(drflac_read_proc onRead, void* pUserData, + drflac_streaminfo* pStreamInfo) { // min/max block size. drflac_uint32 blockSizes; - if (onRead(pUserData, &blockSizes, 4) != 4) { + if (onRead(pUserData, &blockSizes, 4) != 4) + { return DRFLAC_FALSE; } // min/max frame size. drflac_uint64 frameSizes = 0; - if (onRead(pUserData, &frameSizes, 6) != 6) { + if (onRead(pUserData, &frameSizes, 6) != 6) + { return DRFLAC_FALSE; } // Sample rate, channels, bits per sample and total sample count. drflac_uint64 importantProps; - if (onRead(pUserData, &importantProps, 8) != 8) { + if (onRead(pUserData, &importantProps, 8) != 8) + { return DRFLAC_FALSE; } // MD5 drflac_uint8 md5[16]; - if (onRead(pUserData, md5, sizeof(md5)) != sizeof(md5)) { + if (onRead(pUserData, md5, sizeof(md5)) != sizeof(md5)) + { return DRFLAC_FALSE; } @@ -3713,354 +4344,453 @@ drflac_bool32 drflac__read_streaminfo(drflac_read_proc onRead, void* pUserData, frameSizes = drflac__be2host_64(frameSizes); importantProps = drflac__be2host_64(importantProps); - pStreamInfo->minBlockSize = (blockSizes & 0xFFFF0000) >> 16; - pStreamInfo->maxBlockSize = blockSizes & 0x0000FFFF; - pStreamInfo->minFrameSize = (drflac_uint32)((frameSizes & (drflac_uint64)0xFFFFFF0000000000) >> 40); - pStreamInfo->maxFrameSize = (drflac_uint32)((frameSizes & (drflac_uint64)0x000000FFFFFF0000) >> 16); - pStreamInfo->sampleRate = (drflac_uint32)((importantProps & (drflac_uint64)0xFFFFF00000000000) >> 44); - pStreamInfo->channels = (drflac_uint8 )((importantProps & (drflac_uint64)0x00000E0000000000) >> 41) + 1; - pStreamInfo->bitsPerSample = (drflac_uint8 )((importantProps & (drflac_uint64)0x000001F000000000) >> 36) + 1; - pStreamInfo->totalSampleCount = (importantProps & (drflac_uint64)0x0000000FFFFFFFFF) * pStreamInfo->channels; + pStreamInfo->minBlockSize = (blockSizes & 0xFFFF0000) >> 16; + pStreamInfo->maxBlockSize = blockSizes & 0x0000FFFF; + pStreamInfo->minFrameSize = (drflac_uint32)((frameSizes & (drflac_uint64)0xFFFFFF0000000000) >> 40); + pStreamInfo->maxFrameSize = (drflac_uint32)((frameSizes & (drflac_uint64)0x000000FFFFFF0000) >> 16); + pStreamInfo->sampleRate = (drflac_uint32)((importantProps & (drflac_uint64)0xFFFFF00000000000) >> 44); + pStreamInfo->channels = (drflac_uint8)((importantProps & (drflac_uint64)0x00000E0000000000) >> 41) + 1; + pStreamInfo->bitsPerSample = + (drflac_uint8)((importantProps & (drflac_uint64)0x000001F000000000) >> 36) + 1; + pStreamInfo->totalSampleCount = + (importantProps & (drflac_uint64)0x0000000FFFFFFFFF) * pStreamInfo->channels; drflac_copy_memory(pStreamInfo->md5, md5, sizeof(md5)); return DRFLAC_TRUE; } -drflac_bool32 drflac__read_and_decode_metadata(drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_meta_proc onMeta, void* pUserData, void* pUserDataMD, drflac_uint64* pFirstFramePos, drflac_uint64* pSeektablePos, drflac_uint32* pSeektableSize) +drflac_bool32 drflac__read_and_decode_metadata(drflac_read_proc onRead, drflac_seek_proc onSeek, + drflac_meta_proc onMeta, void* pUserData, void* pUserDataMD, + drflac_uint64* pFirstFramePos, drflac_uint64* pSeektablePos, + drflac_uint32* pSeektableSize) { - // We want to keep track of the byte position in the stream of the seektable. At the time of calling this function we know that - // we'll be sitting on byte 42. + // We want to keep track of the byte position in the stream of the seektable. At the time of calling this + // function we know that we'll be sitting on byte 42. drflac_uint64 runningFilePos = 42; drflac_uint64 seektablePos = 0; drflac_uint32 seektableSize = 0; - for (;;) { + for (;;) + { drflac_uint8 isLastBlock = 0; drflac_uint8 blockType; drflac_uint32 blockSize; - if (!drflac__read_and_decode_block_header(onRead, pUserData, &isLastBlock, &blockType, &blockSize)) { + if (!drflac__read_and_decode_block_header(onRead, pUserData, &isLastBlock, &blockType, &blockSize)) + { return DRFLAC_FALSE; } runningFilePos += 4; - drflac_metadata metadata; - metadata.type = blockType; - metadata.pRawData = NULL; + metadata.type = blockType; + metadata.pRawData = NULL; metadata.rawDataSize = 0; switch (blockType) { - case DRFLAC_METADATA_BLOCK_TYPE_APPLICATION: + case DRFLAC_METADATA_BLOCK_TYPE_APPLICATION: + { + if (blockSize < 4) + { + return DRFLAC_FALSE; + } + + if (onMeta) { - if (blockSize < 4) { + void* pRawData = DRFLAC_MALLOC(blockSize); + if (pRawData == NULL) + { return DRFLAC_FALSE; } - if (onMeta) { - void* pRawData = DRFLAC_MALLOC(blockSize); - if (pRawData == NULL) { - return DRFLAC_FALSE; - } + if (onRead(pUserData, pRawData, blockSize) != blockSize) + { + DRFLAC_FREE(pRawData); + return DRFLAC_FALSE; + } - if (onRead(pUserData, pRawData, blockSize) != blockSize) { - DRFLAC_FREE(pRawData); - return DRFLAC_FALSE; - } + metadata.pRawData = pRawData; + metadata.rawDataSize = blockSize; + metadata.data.application.id = drflac__be2host_32(*(drflac_uint32*)pRawData); + metadata.data.application.pData = + (const void*)((drflac_uint8*)pRawData + sizeof(drflac_uint32)); + metadata.data.application.dataSize = blockSize - sizeof(drflac_uint32); + onMeta(pUserDataMD, &metadata); - metadata.pRawData = pRawData; - metadata.rawDataSize = blockSize; - metadata.data.application.id = drflac__be2host_32(*(drflac_uint32*)pRawData); - metadata.data.application.pData = (const void*)((drflac_uint8*)pRawData + sizeof(drflac_uint32)); - metadata.data.application.dataSize = blockSize - sizeof(drflac_uint32); - onMeta(pUserDataMD, &metadata); + DRFLAC_FREE(pRawData); + } + } + break; + + case DRFLAC_METADATA_BLOCK_TYPE_SEEKTABLE: + { + seektablePos = runningFilePos; + seektableSize = blockSize; + + if (onMeta) + { + void* pRawData = DRFLAC_MALLOC(blockSize); + if (pRawData == NULL) + { + return DRFLAC_FALSE; + } + if (onRead(pUserData, pRawData, blockSize) != blockSize) + { DRFLAC_FREE(pRawData); + return DRFLAC_FALSE; } - } break; - case DRFLAC_METADATA_BLOCK_TYPE_SEEKTABLE: - { - seektablePos = runningFilePos; - seektableSize = blockSize; + metadata.pRawData = pRawData; + metadata.rawDataSize = blockSize; + metadata.data.seektable.seekpointCount = blockSize / sizeof(drflac_seekpoint); + metadata.data.seektable.pSeekpoints = (const drflac_seekpoint*)pRawData; - if (onMeta) { - void* pRawData = DRFLAC_MALLOC(blockSize); - if (pRawData == NULL) { - return DRFLAC_FALSE; - } + // Endian swap. + for (drflac_uint32 iSeekpoint = 0; iSeekpoint < metadata.data.seektable.seekpointCount; + ++iSeekpoint) + { + drflac_seekpoint* pSeekpoint = (drflac_seekpoint*)pRawData + iSeekpoint; + pSeekpoint->firstSample = drflac__be2host_64(pSeekpoint->firstSample); + pSeekpoint->frameOffset = drflac__be2host_64(pSeekpoint->frameOffset); + pSeekpoint->sampleCount = drflac__be2host_16(pSeekpoint->sampleCount); + } - if (onRead(pUserData, pRawData, blockSize) != blockSize) { - DRFLAC_FREE(pRawData); - return DRFLAC_FALSE; - } + onMeta(pUserDataMD, &metadata); - metadata.pRawData = pRawData; - metadata.rawDataSize = blockSize; - metadata.data.seektable.seekpointCount = blockSize/sizeof(drflac_seekpoint); - metadata.data.seektable.pSeekpoints = (const drflac_seekpoint*)pRawData; + DRFLAC_FREE(pRawData); + } + } + break; - // Endian swap. - for (drflac_uint32 iSeekpoint = 0; iSeekpoint < metadata.data.seektable.seekpointCount; ++iSeekpoint) { - drflac_seekpoint* pSeekpoint = (drflac_seekpoint*)pRawData + iSeekpoint; - pSeekpoint->firstSample = drflac__be2host_64(pSeekpoint->firstSample); - pSeekpoint->frameOffset = drflac__be2host_64(pSeekpoint->frameOffset); - pSeekpoint->sampleCount = drflac__be2host_16(pSeekpoint->sampleCount); - } + case DRFLAC_METADATA_BLOCK_TYPE_VORBIS_COMMENT: + { + if (blockSize < 8) + { + return DRFLAC_FALSE; + } - onMeta(pUserDataMD, &metadata); + if (onMeta) + { + void* pRawData = DRFLAC_MALLOC(blockSize); + if (pRawData == NULL) + { + return DRFLAC_FALSE; + } + if (onRead(pUserData, pRawData, blockSize) != blockSize) + { DRFLAC_FREE(pRawData); + return DRFLAC_FALSE; } - } break; - case DRFLAC_METADATA_BLOCK_TYPE_VORBIS_COMMENT: - { - if (blockSize < 8) { + metadata.pRawData = pRawData; + metadata.rawDataSize = blockSize; + + const char* pRunningData = (const char*)pRawData; + const char* const pRunningDataEnd = (const char*)pRawData + blockSize; + + metadata.data.vorbis_comment.vendorLength = + drflac__le2host_32(*(const drflac_uint32*)pRunningData); + pRunningData += 4; + + // Need space for the rest of the block + if ((pRunningDataEnd - pRunningData) - 4 < + (drflac_int64)metadata.data.vorbis_comment.vendorLength) + { // <-- Note the order of operations to avoid overflow to a valid value + DRFLAC_FREE(pRawData); return DRFLAC_FALSE; } + metadata.data.vorbis_comment.vendor = pRunningData; + pRunningData += metadata.data.vorbis_comment.vendorLength; + metadata.data.vorbis_comment.commentCount = + drflac__le2host_32(*(const drflac_uint32*)pRunningData); + pRunningData += 4; + + // Need space for 'commentCount' comments after the block, which at minimum is a drflac_uint32 + // per comment + if ((pRunningDataEnd - pRunningData) / sizeof(drflac_uint32) < + metadata.data.vorbis_comment.commentCount) + { // <-- Note the order of operations to avoid overflow to a valid value + DRFLAC_FREE(pRawData); + return DRFLAC_FALSE; + } + metadata.data.vorbis_comment.pComments = pRunningData; - if (onMeta) { - void* pRawData = DRFLAC_MALLOC(blockSize); - if (pRawData == NULL) { - return DRFLAC_FALSE; - } - - if (onRead(pUserData, pRawData, blockSize) != blockSize) { + // Check that the comments section is valid before passing it to the callback + for (drflac_uint32 i = 0; i < metadata.data.vorbis_comment.commentCount; ++i) + { + if (pRunningDataEnd - pRunningData < 4) + { DRFLAC_FREE(pRawData); return DRFLAC_FALSE; } - - metadata.pRawData = pRawData; - metadata.rawDataSize = blockSize; - - const char* pRunningData = (const char*)pRawData; - const char* const pRunningDataEnd = (const char*)pRawData + blockSize; - - metadata.data.vorbis_comment.vendorLength = drflac__le2host_32(*(const drflac_uint32*)pRunningData); pRunningData += 4; - - // Need space for the rest of the block - if ((pRunningDataEnd - pRunningData) - 4 < (drflac_int64)metadata.data.vorbis_comment.vendorLength) { // <-- Note the order of operations to avoid overflow to a valid value + const drflac_uint32 commentLength = + drflac__le2host_32(*(const drflac_uint32*)pRunningData); + pRunningData += 4; + if (pRunningDataEnd - pRunningData < (drflac_int64)commentLength) + { // <-- Note the order of operations to avoid overflow to a valid value DRFLAC_FREE(pRawData); return DRFLAC_FALSE; } - metadata.data.vorbis_comment.vendor = pRunningData; pRunningData += metadata.data.vorbis_comment.vendorLength; - metadata.data.vorbis_comment.commentCount = drflac__le2host_32(*(const drflac_uint32*)pRunningData); pRunningData += 4; + pRunningData += commentLength; + } - // Need space for 'commentCount' comments after the block, which at minimum is a drflac_uint32 per comment - if ((pRunningDataEnd - pRunningData) / sizeof(drflac_uint32) < metadata.data.vorbis_comment.commentCount) { // <-- Note the order of operations to avoid overflow to a valid value - DRFLAC_FREE(pRawData); - return DRFLAC_FALSE; - } - metadata.data.vorbis_comment.pComments = pRunningData; + onMeta(pUserDataMD, &metadata); - // Check that the comments section is valid before passing it to the callback - for (drflac_uint32 i = 0; i < metadata.data.vorbis_comment.commentCount; ++i) { - if (pRunningDataEnd - pRunningData < 4) { - DRFLAC_FREE(pRawData); - return DRFLAC_FALSE; - } - const drflac_uint32 commentLength = drflac__le2host_32(*(const drflac_uint32*)pRunningData); pRunningData += 4; - if (pRunningDataEnd - pRunningData < (drflac_int64)commentLength) { // <-- Note the order of operations to avoid overflow to a valid value - DRFLAC_FREE(pRawData); - return DRFLAC_FALSE; - } - pRunningData += commentLength; - } + DRFLAC_FREE(pRawData); + } + } + break; - onMeta(pUserDataMD, &metadata); + case DRFLAC_METADATA_BLOCK_TYPE_CUESHEET: + { + if (blockSize < 396) + { + return DRFLAC_FALSE; + } - DRFLAC_FREE(pRawData); + if (onMeta) + { + void* pRawData = DRFLAC_MALLOC(blockSize); + if (pRawData == NULL) + { + return DRFLAC_FALSE; } - } break; - case DRFLAC_METADATA_BLOCK_TYPE_CUESHEET: - { - if (blockSize < 396) { + if (onRead(pUserData, pRawData, blockSize) != blockSize) + { + DRFLAC_FREE(pRawData); return DRFLAC_FALSE; } - if (onMeta) { - void* pRawData = DRFLAC_MALLOC(blockSize); - if (pRawData == NULL) { + metadata.pRawData = pRawData; + metadata.rawDataSize = blockSize; + + char* pRunningData = (char*)pRawData; + const char* const pRunningDataEnd = (const char*)pRawData + blockSize; + + drflac_copy_memory(metadata.data.cuesheet.catalog, pRunningData, 128); + pRunningData += 128; + metadata.data.cuesheet.leadInSampleCount = + drflac__be2host_64(*(const drflac_uint64*)pRunningData); + pRunningData += 8; + metadata.data.cuesheet.isCD = (pRunningData[0] & 0x80) != 0; + pRunningData += 259; + metadata.data.cuesheet.trackCount = pRunningData[0]; + pRunningData += 1; + metadata.data.cuesheet.pTrackData = pRunningData; + + // Check that the cuesheet tracks are valid before passing it to the callback + for (drflac_uint8 i = 0; i < metadata.data.cuesheet.trackCount; ++i) + { + if (pRunningDataEnd - pRunningData < 36) + { + DRFLAC_FREE(pRawData); return DRFLAC_FALSE; } - if (onRead(pUserData, pRawData, blockSize) != blockSize) { + // Skip to the index point count + pRunningData += 35; + const drflac_uint8 indexCount = pRunningData[0]; + pRunningData += 1; + const drflac_uint32 indexPointSize = indexCount * sizeof(drflac_cuesheet_track_index); + if (pRunningDataEnd - pRunningData < (drflac_int64)indexPointSize) + { DRFLAC_FREE(pRawData); return DRFLAC_FALSE; } - metadata.pRawData = pRawData; - metadata.rawDataSize = blockSize; - - char* pRunningData = (char*)pRawData; - const char* const pRunningDataEnd = (const char*)pRawData + blockSize; - - drflac_copy_memory(metadata.data.cuesheet.catalog, pRunningData, 128); pRunningData += 128; - metadata.data.cuesheet.leadInSampleCount = drflac__be2host_64(*(const drflac_uint64*)pRunningData); pRunningData += 8; - metadata.data.cuesheet.isCD = (pRunningData[0] & 0x80) != 0; pRunningData += 259; - metadata.data.cuesheet.trackCount = pRunningData[0]; pRunningData += 1; - metadata.data.cuesheet.pTrackData = pRunningData; - - // Check that the cuesheet tracks are valid before passing it to the callback - for (drflac_uint8 i = 0; i < metadata.data.cuesheet.trackCount; ++i) { - if (pRunningDataEnd - pRunningData < 36) { - DRFLAC_FREE(pRawData); - return DRFLAC_FALSE; - } + // Endian swap. + for (drflac_uint8 index = 0; index < indexCount; ++index) + { + drflac_cuesheet_track_index* pTrack = (drflac_cuesheet_track_index*)pRunningData; + pRunningData += sizeof(drflac_cuesheet_track_index); + pTrack->offset = drflac__be2host_64(pTrack->offset); + } + } - // Skip to the index point count - pRunningData += 35; - const drflac_uint8 indexCount = pRunningData[0]; pRunningData += 1; - const drflac_uint32 indexPointSize = indexCount * sizeof(drflac_cuesheet_track_index); - if (pRunningDataEnd - pRunningData < (drflac_int64)indexPointSize) { - DRFLAC_FREE(pRawData); - return DRFLAC_FALSE; - } + onMeta(pUserDataMD, &metadata); - // Endian swap. - for (drflac_uint8 index = 0; index < indexCount; ++index) { - drflac_cuesheet_track_index* pTrack = (drflac_cuesheet_track_index*)pRunningData; - pRunningData += sizeof(drflac_cuesheet_track_index); - pTrack->offset = drflac__be2host_64(pTrack->offset); - } - } + DRFLAC_FREE(pRawData); + } + } + break; - onMeta(pUserDataMD, &metadata); + case DRFLAC_METADATA_BLOCK_TYPE_PICTURE: + { + if (blockSize < 32) + { + return DRFLAC_FALSE; + } - DRFLAC_FREE(pRawData); + if (onMeta) + { + void* pRawData = DRFLAC_MALLOC(blockSize); + if (pRawData == NULL) + { + return DRFLAC_FALSE; } - } break; - case DRFLAC_METADATA_BLOCK_TYPE_PICTURE: - { - if (blockSize < 32) { + if (onRead(pUserData, pRawData, blockSize) != blockSize) + { + DRFLAC_FREE(pRawData); return DRFLAC_FALSE; } - if (onMeta) { - void* pRawData = DRFLAC_MALLOC(blockSize); - if (pRawData == NULL) { - return DRFLAC_FALSE; - } + metadata.pRawData = pRawData; + metadata.rawDataSize = blockSize; - if (onRead(pUserData, pRawData, blockSize) != blockSize) { - DRFLAC_FREE(pRawData); - return DRFLAC_FALSE; - } + const char* pRunningData = (const char*)pRawData; + const char* const pRunningDataEnd = (const char*)pRawData + blockSize; - metadata.pRawData = pRawData; - metadata.rawDataSize = blockSize; + metadata.data.picture.type = drflac__be2host_32(*(const drflac_uint32*)pRunningData); + pRunningData += 4; + metadata.data.picture.mimeLength = drflac__be2host_32(*(const drflac_uint32*)pRunningData); + pRunningData += 4; - const char* pRunningData = (const char*)pRawData; - const char* const pRunningDataEnd = (const char*)pRawData + blockSize; + // Need space for the rest of the block + if ((pRunningDataEnd - pRunningData) - 24 < (drflac_int64)metadata.data.picture.mimeLength) + { // <-- Note the order of operations to avoid overflow to a valid value + DRFLAC_FREE(pRawData); + return DRFLAC_FALSE; + } + metadata.data.picture.mime = pRunningData; + pRunningData += metadata.data.picture.mimeLength; + metadata.data.picture.descriptionLength = + drflac__be2host_32(*(const drflac_uint32*)pRunningData); + pRunningData += 4; + + // Need space for the rest of the block + if ((pRunningDataEnd - pRunningData) - 20 < + (drflac_int64)metadata.data.picture.descriptionLength) + { // <-- Note the order of operations to avoid overflow to a valid value + DRFLAC_FREE(pRawData); + return DRFLAC_FALSE; + } + metadata.data.picture.description = pRunningData; + pRunningData += metadata.data.picture.descriptionLength; + metadata.data.picture.width = drflac__be2host_32(*(const drflac_uint32*)pRunningData); + pRunningData += 4; + metadata.data.picture.height = drflac__be2host_32(*(const drflac_uint32*)pRunningData); + pRunningData += 4; + metadata.data.picture.colorDepth = drflac__be2host_32(*(const drflac_uint32*)pRunningData); + pRunningData += 4; + metadata.data.picture.indexColorCount = + drflac__be2host_32(*(const drflac_uint32*)pRunningData); + pRunningData += 4; + metadata.data.picture.pictureDataSize = + drflac__be2host_32(*(const drflac_uint32*)pRunningData); + pRunningData += 4; + metadata.data.picture.pPictureData = (const drflac_uint8*)pRunningData; + + // Need space for the picture after the block + if (pRunningDataEnd - pRunningData < (drflac_int64)metadata.data.picture.pictureDataSize) + { // <-- Note the order of operations to avoid overflow to a valid value + DRFLAC_FREE(pRawData); + return DRFLAC_FALSE; + } - metadata.data.picture.type = drflac__be2host_32(*(const drflac_uint32*)pRunningData); pRunningData += 4; - metadata.data.picture.mimeLength = drflac__be2host_32(*(const drflac_uint32*)pRunningData); pRunningData += 4; + onMeta(pUserDataMD, &metadata); - // Need space for the rest of the block - if ((pRunningDataEnd - pRunningData) - 24 < (drflac_int64)metadata.data.picture.mimeLength) { // <-- Note the order of operations to avoid overflow to a valid value - DRFLAC_FREE(pRawData); - return DRFLAC_FALSE; - } - metadata.data.picture.mime = pRunningData; pRunningData += metadata.data.picture.mimeLength; - metadata.data.picture.descriptionLength = drflac__be2host_32(*(const drflac_uint32*)pRunningData); pRunningData += 4; + DRFLAC_FREE(pRawData); + } + } + break; - // Need space for the rest of the block - if ((pRunningDataEnd - pRunningData) - 20 < (drflac_int64)metadata.data.picture.descriptionLength) { // <-- Note the order of operations to avoid overflow to a valid value - DRFLAC_FREE(pRawData); - return DRFLAC_FALSE; - } - metadata.data.picture.description = pRunningData; pRunningData += metadata.data.picture.descriptionLength; - metadata.data.picture.width = drflac__be2host_32(*(const drflac_uint32*)pRunningData); pRunningData += 4; - metadata.data.picture.height = drflac__be2host_32(*(const drflac_uint32*)pRunningData); pRunningData += 4; - metadata.data.picture.colorDepth = drflac__be2host_32(*(const drflac_uint32*)pRunningData); pRunningData += 4; - metadata.data.picture.indexColorCount = drflac__be2host_32(*(const drflac_uint32*)pRunningData); pRunningData += 4; - metadata.data.picture.pictureDataSize = drflac__be2host_32(*(const drflac_uint32*)pRunningData); pRunningData += 4; - metadata.data.picture.pPictureData = (const drflac_uint8*)pRunningData; - - // Need space for the picture after the block - if (pRunningDataEnd - pRunningData < (drflac_int64)metadata.data.picture.pictureDataSize) { // <-- Note the order of operations to avoid overflow to a valid value - DRFLAC_FREE(pRawData); - return DRFLAC_FALSE; - } + case DRFLAC_METADATA_BLOCK_TYPE_PADDING: + { + if (onMeta) + { + metadata.data.padding.unused = 0; + // Padding doesn't have anything meaningful in it, so just skip over it, but make sure the + // caller is aware of it by firing the callback. + if (!onSeek(pUserData, blockSize, drflac_seek_origin_current)) + { + isLastBlock = + DRFLAC_TRUE; // An error occurred while seeking. Attempt to recover by treating this + // as the last block which will in turn terminate the loop. + } + else + { onMeta(pUserDataMD, &metadata); - - DRFLAC_FREE(pRawData); } - } break; + } + } + break; - case DRFLAC_METADATA_BLOCK_TYPE_PADDING: + case DRFLAC_METADATA_BLOCK_TYPE_INVALID: + { + // Invalid chunk. Just skip over this one. + if (onMeta) { - if (onMeta) { - metadata.data.padding.unused = 0; - - // Padding doesn't have anything meaningful in it, so just skip over it, but make sure the caller is aware of it by firing the callback. - if (!onSeek(pUserData, blockSize, drflac_seek_origin_current)) { - isLastBlock = DRFLAC_TRUE; // An error occurred while seeking. Attempt to recover by treating this as the last block which will in turn terminate the loop. - } else { - onMeta(pUserDataMD, &metadata); - } + if (!onSeek(pUserData, blockSize, drflac_seek_origin_current)) + { + isLastBlock = + DRFLAC_TRUE; // An error occurred while seeking. Attempt to recover by treating this + // as the last block which will in turn terminate the loop. } - } break; + } + } + break; - case DRFLAC_METADATA_BLOCK_TYPE_INVALID: + default: + { + // It's an unknown chunk, but not necessarily invalid. There's a chance more metadata blocks might + // be defined later on, so we can at the very least report the chunk to the application and let it + // look at the raw data. + if (onMeta) { - // Invalid chunk. Just skip over this one. - if (onMeta) { - if (!onSeek(pUserData, blockSize, drflac_seek_origin_current)) { - isLastBlock = DRFLAC_TRUE; // An error occurred while seeking. Attempt to recover by treating this as the last block which will in turn terminate the loop. - } + void* pRawData = DRFLAC_MALLOC(blockSize); + if (pRawData == NULL) + { + return DRFLAC_FALSE; } - } break; - - default: - { - // It's an unknown chunk, but not necessarily invalid. There's a chance more metadata blocks might be defined later on, so we - // can at the very least report the chunk to the application and let it look at the raw data. - if (onMeta) { - void* pRawData = DRFLAC_MALLOC(blockSize); - if (pRawData == NULL) { - return DRFLAC_FALSE; - } - - if (onRead(pUserData, pRawData, blockSize) != blockSize) { - DRFLAC_FREE(pRawData); - return DRFLAC_FALSE; - } - - metadata.pRawData = pRawData; - metadata.rawDataSize = blockSize; - onMeta(pUserDataMD, &metadata); + if (onRead(pUserData, pRawData, blockSize) != blockSize) + { DRFLAC_FREE(pRawData); + return DRFLAC_FALSE; } - } break; + + metadata.pRawData = pRawData; + metadata.rawDataSize = blockSize; + onMeta(pUserDataMD, &metadata); + + DRFLAC_FREE(pRawData); + } + } + break; } - // If we're not handling metadata, just skip over the block. If we are, it will have been handled earlier in the switch statement above. - if (onMeta == NULL && blockSize > 0) { - if (!onSeek(pUserData, blockSize, drflac_seek_origin_current)) { + // If we're not handling metadata, just skip over the block. If we are, it will have been handled + // earlier in the switch statement above. + if (onMeta == NULL && blockSize > 0) + { + if (!onSeek(pUserData, blockSize, drflac_seek_origin_current)) + { isLastBlock = DRFLAC_TRUE; } } runningFilePos += blockSize; - if (isLastBlock) { + if (isLastBlock) + { break; } } - *pSeektablePos = seektablePos; + *pSeektablePos = seektablePos; *pSeektableSize = seektableSize; *pFirstFramePos = runningFilePos; return DRFLAC_TRUE; } -drflac_bool32 drflac__init_private__native(drflac_init_info* pInit, drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_meta_proc onMeta, void* pUserData, void* pUserDataMD, drflac_bool32 relaxed) +drflac_bool32 drflac__init_private__native(drflac_init_info* pInit, drflac_read_proc onRead, + drflac_seek_proc onSeek, drflac_meta_proc onMeta, void* pUserData, + void* pUserDataMD, drflac_bool32 relaxed) { (void)onSeek; @@ -4072,37 +4802,50 @@ drflac_bool32 drflac__init_private__native(drflac_init_info* pInit, drflac_read_ drflac_uint8 isLastBlock; drflac_uint8 blockType; drflac_uint32 blockSize; - if (!drflac__read_and_decode_block_header(onRead, pUserData, &isLastBlock, &blockType, &blockSize)) { + if (!drflac__read_and_decode_block_header(onRead, pUserData, &isLastBlock, &blockType, &blockSize)) + { return DRFLAC_FALSE; } - if (blockType != DRFLAC_METADATA_BLOCK_TYPE_STREAMINFO || blockSize != 34) { - if (!relaxed) { + if (blockType != DRFLAC_METADATA_BLOCK_TYPE_STREAMINFO || blockSize != 34) + { + if (!relaxed) + { // We're opening in strict mode and the first block is not the STREAMINFO block. Error. return DRFLAC_FALSE; - } else { - // Relaxed mode. To open from here we need to just find the first frame and set the sample rate, etc. to whatever is defined - // for that frame. + } + else + { + // Relaxed mode. To open from here we need to just find the first frame and set the sample rate, + // etc. to whatever is defined for that frame. pInit->hasStreamInfoBlock = DRFLAC_FALSE; pInit->hasMetadataBlocks = DRFLAC_FALSE; - if (!drflac__read_next_frame_header(&pInit->bs, 0, &pInit->firstFrameHeader)) { - return DRFLAC_FALSE; // Couldn't find a frame. + if (!drflac__read_next_frame_header(&pInit->bs, 0, &pInit->firstFrameHeader)) + { + return DRFLAC_FALSE; // Couldn't find a frame. } - if (pInit->firstFrameHeader.bitsPerSample == 0) { - return DRFLAC_FALSE; // Failed to initialize because the first frame depends on the STREAMINFO block, which does not exist. + if (pInit->firstFrameHeader.bitsPerSample == 0) + { + return DRFLAC_FALSE; // Failed to initialize because the first frame depends on the STREAMINFO + // block, which does not exist. } - pInit->sampleRate = pInit->firstFrameHeader.sampleRate; - pInit->channels = drflac__get_channel_count_from_channel_assignment(pInit->firstFrameHeader.channelAssignment); + pInit->sampleRate = pInit->firstFrameHeader.sampleRate; + pInit->channels = + drflac__get_channel_count_from_channel_assignment(pInit->firstFrameHeader.channelAssignment); pInit->bitsPerSample = pInit->firstFrameHeader.bitsPerSample; - pInit->maxBlockSize = 65535; // <-- See notes here: https://xiph.org/flac/format.html#metadata_block_streaminfo + pInit->maxBlockSize = + 65535; // <-- See notes here: https://xiph.org/flac/format.html#metadata_block_streaminfo return DRFLAC_TRUE; } - } else { + } + else + { drflac_streaminfo streaminfo; - if (!drflac__read_streaminfo(onRead, pUserData, &streaminfo)) { + if (!drflac__read_streaminfo(onRead, pUserData, &streaminfo)) + { return DRFLAC_FALSE; } @@ -4111,14 +4854,17 @@ drflac_bool32 drflac__init_private__native(drflac_init_info* pInit, drflac_read_ pInit->channels = streaminfo.channels; pInit->bitsPerSample = streaminfo.bitsPerSample; pInit->totalSampleCount = streaminfo.totalSampleCount; - pInit->maxBlockSize = streaminfo.maxBlockSize; // Don't care about the min block size - only the max (used for determining the size of the memory allocation). + pInit->maxBlockSize = + streaminfo.maxBlockSize; // Don't care about the min block size - only the max (used for + // determining the size of the memory allocation). pInit->hasMetadataBlocks = !isLastBlock; - if (onMeta) { + if (onMeta) + { drflac_metadata metadata; - metadata.type = DRFLAC_METADATA_BLOCK_TYPE_STREAMINFO; - metadata.pRawData = NULL; - metadata.rawDataSize = 0; + metadata.type = DRFLAC_METADATA_BLOCK_TYPE_STREAMINFO; + metadata.pRawData = NULL; + metadata.rawDataSize = 0; metadata.data.streaminfo = streaminfo; onMeta(pUserDataMD, &metadata); } @@ -4128,8 +4874,8 @@ drflac_bool32 drflac__init_private__native(drflac_init_info* pInit, drflac_read_ } #ifndef DR_FLAC_NO_OGG -#define DRFLAC_OGG_MAX_PAGE_SIZE 65307 -#define DRFLAC_OGG_CAPTURE_PATTERN_CRC32 1605413199 // CRC-32 of "OggS". +#define DRFLAC_OGG_MAX_PAGE_SIZE 65307 +#define DRFLAC_OGG_CAPTURE_PATTERN_CRC32 1605413199 // CRC-32 of "OggS". typedef enum { @@ -4137,72 +4883,39 @@ typedef enum drflac_ogg_fail_on_crc_mismatch } drflac_ogg_crc_mismatch_recovery; - static drflac_uint32 drflac__crc32_table[] = { - 0x00000000L, 0x04C11DB7L, 0x09823B6EL, 0x0D4326D9L, - 0x130476DCL, 0x17C56B6BL, 0x1A864DB2L, 0x1E475005L, - 0x2608EDB8L, 0x22C9F00FL, 0x2F8AD6D6L, 0x2B4BCB61L, - 0x350C9B64L, 0x31CD86D3L, 0x3C8EA00AL, 0x384FBDBDL, - 0x4C11DB70L, 0x48D0C6C7L, 0x4593E01EL, 0x4152FDA9L, - 0x5F15ADACL, 0x5BD4B01BL, 0x569796C2L, 0x52568B75L, - 0x6A1936C8L, 0x6ED82B7FL, 0x639B0DA6L, 0x675A1011L, - 0x791D4014L, 0x7DDC5DA3L, 0x709F7B7AL, 0x745E66CDL, - 0x9823B6E0L, 0x9CE2AB57L, 0x91A18D8EL, 0x95609039L, - 0x8B27C03CL, 0x8FE6DD8BL, 0x82A5FB52L, 0x8664E6E5L, - 0xBE2B5B58L, 0xBAEA46EFL, 0xB7A96036L, 0xB3687D81L, - 0xAD2F2D84L, 0xA9EE3033L, 0xA4AD16EAL, 0xA06C0B5DL, - 0xD4326D90L, 0xD0F37027L, 0xDDB056FEL, 0xD9714B49L, - 0xC7361B4CL, 0xC3F706FBL, 0xCEB42022L, 0xCA753D95L, - 0xF23A8028L, 0xF6FB9D9FL, 0xFBB8BB46L, 0xFF79A6F1L, - 0xE13EF6F4L, 0xE5FFEB43L, 0xE8BCCD9AL, 0xEC7DD02DL, - 0x34867077L, 0x30476DC0L, 0x3D044B19L, 0x39C556AEL, - 0x278206ABL, 0x23431B1CL, 0x2E003DC5L, 0x2AC12072L, - 0x128E9DCFL, 0x164F8078L, 0x1B0CA6A1L, 0x1FCDBB16L, - 0x018AEB13L, 0x054BF6A4L, 0x0808D07DL, 0x0CC9CDCAL, - 0x7897AB07L, 0x7C56B6B0L, 0x71159069L, 0x75D48DDEL, - 0x6B93DDDBL, 0x6F52C06CL, 0x6211E6B5L, 0x66D0FB02L, - 0x5E9F46BFL, 0x5A5E5B08L, 0x571D7DD1L, 0x53DC6066L, - 0x4D9B3063L, 0x495A2DD4L, 0x44190B0DL, 0x40D816BAL, - 0xACA5C697L, 0xA864DB20L, 0xA527FDF9L, 0xA1E6E04EL, - 0xBFA1B04BL, 0xBB60ADFCL, 0xB6238B25L, 0xB2E29692L, - 0x8AAD2B2FL, 0x8E6C3698L, 0x832F1041L, 0x87EE0DF6L, - 0x99A95DF3L, 0x9D684044L, 0x902B669DL, 0x94EA7B2AL, - 0xE0B41DE7L, 0xE4750050L, 0xE9362689L, 0xEDF73B3EL, - 0xF3B06B3BL, 0xF771768CL, 0xFA325055L, 0xFEF34DE2L, - 0xC6BCF05FL, 0xC27DEDE8L, 0xCF3ECB31L, 0xCBFFD686L, - 0xD5B88683L, 0xD1799B34L, 0xDC3ABDEDL, 0xD8FBA05AL, - 0x690CE0EEL, 0x6DCDFD59L, 0x608EDB80L, 0x644FC637L, - 0x7A089632L, 0x7EC98B85L, 0x738AAD5CL, 0x774BB0EBL, - 0x4F040D56L, 0x4BC510E1L, 0x46863638L, 0x42472B8FL, - 0x5C007B8AL, 0x58C1663DL, 0x558240E4L, 0x51435D53L, - 0x251D3B9EL, 0x21DC2629L, 0x2C9F00F0L, 0x285E1D47L, - 0x36194D42L, 0x32D850F5L, 0x3F9B762CL, 0x3B5A6B9BL, - 0x0315D626L, 0x07D4CB91L, 0x0A97ED48L, 0x0E56F0FFL, - 0x1011A0FAL, 0x14D0BD4DL, 0x19939B94L, 0x1D528623L, - 0xF12F560EL, 0xF5EE4BB9L, 0xF8AD6D60L, 0xFC6C70D7L, - 0xE22B20D2L, 0xE6EA3D65L, 0xEBA91BBCL, 0xEF68060BL, - 0xD727BBB6L, 0xD3E6A601L, 0xDEA580D8L, 0xDA649D6FL, - 0xC423CD6AL, 0xC0E2D0DDL, 0xCDA1F604L, 0xC960EBB3L, - 0xBD3E8D7EL, 0xB9FF90C9L, 0xB4BCB610L, 0xB07DABA7L, - 0xAE3AFBA2L, 0xAAFBE615L, 0xA7B8C0CCL, 0xA379DD7BL, - 0x9B3660C6L, 0x9FF77D71L, 0x92B45BA8L, 0x9675461FL, - 0x8832161AL, 0x8CF30BADL, 0x81B02D74L, 0x857130C3L, - 0x5D8A9099L, 0x594B8D2EL, 0x5408ABF7L, 0x50C9B640L, - 0x4E8EE645L, 0x4A4FFBF2L, 0x470CDD2BL, 0x43CDC09CL, - 0x7B827D21L, 0x7F436096L, 0x7200464FL, 0x76C15BF8L, - 0x68860BFDL, 0x6C47164AL, 0x61043093L, 0x65C52D24L, - 0x119B4BE9L, 0x155A565EL, 0x18197087L, 0x1CD86D30L, - 0x029F3D35L, 0x065E2082L, 0x0B1D065BL, 0x0FDC1BECL, - 0x3793A651L, 0x3352BBE6L, 0x3E119D3FL, 0x3AD08088L, - 0x2497D08DL, 0x2056CD3AL, 0x2D15EBE3L, 0x29D4F654L, - 0xC5A92679L, 0xC1683BCEL, 0xCC2B1D17L, 0xC8EA00A0L, - 0xD6AD50A5L, 0xD26C4D12L, 0xDF2F6BCBL, 0xDBEE767CL, - 0xE3A1CBC1L, 0xE760D676L, 0xEA23F0AFL, 0xEEE2ED18L, - 0xF0A5BD1DL, 0xF464A0AAL, 0xF9278673L, 0xFDE69BC4L, - 0x89B8FD09L, 0x8D79E0BEL, 0x803AC667L, 0x84FBDBD0L, - 0x9ABC8BD5L, 0x9E7D9662L, 0x933EB0BBL, 0x97FFAD0CL, - 0xAFB010B1L, 0xAB710D06L, 0xA6322BDFL, 0xA2F33668L, - 0xBCB4666DL, 0xB8757BDAL, 0xB5365D03L, 0xB1F740B4L + 0x00000000L, 0x04C11DB7L, 0x09823B6EL, 0x0D4326D9L, 0x130476DCL, 0x17C56B6BL, 0x1A864DB2L, 0x1E475005L, + 0x2608EDB8L, 0x22C9F00FL, 0x2F8AD6D6L, 0x2B4BCB61L, 0x350C9B64L, 0x31CD86D3L, 0x3C8EA00AL, 0x384FBDBDL, + 0x4C11DB70L, 0x48D0C6C7L, 0x4593E01EL, 0x4152FDA9L, 0x5F15ADACL, 0x5BD4B01BL, 0x569796C2L, 0x52568B75L, + 0x6A1936C8L, 0x6ED82B7FL, 0x639B0DA6L, 0x675A1011L, 0x791D4014L, 0x7DDC5DA3L, 0x709F7B7AL, 0x745E66CDL, + 0x9823B6E0L, 0x9CE2AB57L, 0x91A18D8EL, 0x95609039L, 0x8B27C03CL, 0x8FE6DD8BL, 0x82A5FB52L, 0x8664E6E5L, + 0xBE2B5B58L, 0xBAEA46EFL, 0xB7A96036L, 0xB3687D81L, 0xAD2F2D84L, 0xA9EE3033L, 0xA4AD16EAL, 0xA06C0B5DL, + 0xD4326D90L, 0xD0F37027L, 0xDDB056FEL, 0xD9714B49L, 0xC7361B4CL, 0xC3F706FBL, 0xCEB42022L, 0xCA753D95L, + 0xF23A8028L, 0xF6FB9D9FL, 0xFBB8BB46L, 0xFF79A6F1L, 0xE13EF6F4L, 0xE5FFEB43L, 0xE8BCCD9AL, 0xEC7DD02DL, + 0x34867077L, 0x30476DC0L, 0x3D044B19L, 0x39C556AEL, 0x278206ABL, 0x23431B1CL, 0x2E003DC5L, 0x2AC12072L, + 0x128E9DCFL, 0x164F8078L, 0x1B0CA6A1L, 0x1FCDBB16L, 0x018AEB13L, 0x054BF6A4L, 0x0808D07DL, 0x0CC9CDCAL, + 0x7897AB07L, 0x7C56B6B0L, 0x71159069L, 0x75D48DDEL, 0x6B93DDDBL, 0x6F52C06CL, 0x6211E6B5L, 0x66D0FB02L, + 0x5E9F46BFL, 0x5A5E5B08L, 0x571D7DD1L, 0x53DC6066L, 0x4D9B3063L, 0x495A2DD4L, 0x44190B0DL, 0x40D816BAL, + 0xACA5C697L, 0xA864DB20L, 0xA527FDF9L, 0xA1E6E04EL, 0xBFA1B04BL, 0xBB60ADFCL, 0xB6238B25L, 0xB2E29692L, + 0x8AAD2B2FL, 0x8E6C3698L, 0x832F1041L, 0x87EE0DF6L, 0x99A95DF3L, 0x9D684044L, 0x902B669DL, 0x94EA7B2AL, + 0xE0B41DE7L, 0xE4750050L, 0xE9362689L, 0xEDF73B3EL, 0xF3B06B3BL, 0xF771768CL, 0xFA325055L, 0xFEF34DE2L, + 0xC6BCF05FL, 0xC27DEDE8L, 0xCF3ECB31L, 0xCBFFD686L, 0xD5B88683L, 0xD1799B34L, 0xDC3ABDEDL, 0xD8FBA05AL, + 0x690CE0EEL, 0x6DCDFD59L, 0x608EDB80L, 0x644FC637L, 0x7A089632L, 0x7EC98B85L, 0x738AAD5CL, 0x774BB0EBL, + 0x4F040D56L, 0x4BC510E1L, 0x46863638L, 0x42472B8FL, 0x5C007B8AL, 0x58C1663DL, 0x558240E4L, 0x51435D53L, + 0x251D3B9EL, 0x21DC2629L, 0x2C9F00F0L, 0x285E1D47L, 0x36194D42L, 0x32D850F5L, 0x3F9B762CL, 0x3B5A6B9BL, + 0x0315D626L, 0x07D4CB91L, 0x0A97ED48L, 0x0E56F0FFL, 0x1011A0FAL, 0x14D0BD4DL, 0x19939B94L, 0x1D528623L, + 0xF12F560EL, 0xF5EE4BB9L, 0xF8AD6D60L, 0xFC6C70D7L, 0xE22B20D2L, 0xE6EA3D65L, 0xEBA91BBCL, 0xEF68060BL, + 0xD727BBB6L, 0xD3E6A601L, 0xDEA580D8L, 0xDA649D6FL, 0xC423CD6AL, 0xC0E2D0DDL, 0xCDA1F604L, 0xC960EBB3L, + 0xBD3E8D7EL, 0xB9FF90C9L, 0xB4BCB610L, 0xB07DABA7L, 0xAE3AFBA2L, 0xAAFBE615L, 0xA7B8C0CCL, 0xA379DD7BL, + 0x9B3660C6L, 0x9FF77D71L, 0x92B45BA8L, 0x9675461FL, 0x8832161AL, 0x8CF30BADL, 0x81B02D74L, 0x857130C3L, + 0x5D8A9099L, 0x594B8D2EL, 0x5408ABF7L, 0x50C9B640L, 0x4E8EE645L, 0x4A4FFBF2L, 0x470CDD2BL, 0x43CDC09CL, + 0x7B827D21L, 0x7F436096L, 0x7200464FL, 0x76C15BF8L, 0x68860BFDL, 0x6C47164AL, 0x61043093L, 0x65C52D24L, + 0x119B4BE9L, 0x155A565EL, 0x18197087L, 0x1CD86D30L, 0x029F3D35L, 0x065E2082L, 0x0B1D065BL, 0x0FDC1BECL, + 0x3793A651L, 0x3352BBE6L, 0x3E119D3FL, 0x3AD08088L, 0x2497D08DL, 0x2056CD3AL, 0x2D15EBE3L, 0x29D4F654L, + 0xC5A92679L, 0xC1683BCEL, 0xCC2B1D17L, 0xC8EA00A0L, 0xD6AD50A5L, 0xD26C4D12L, 0xDF2F6BCBL, 0xDBEE767CL, + 0xE3A1CBC1L, 0xE760D676L, 0xEA23F0AFL, 0xEEE2ED18L, 0xF0A5BD1DL, 0xF464A0AAL, 0xF9278673L, 0xFDE69BC4L, + 0x89B8FD09L, 0x8D79E0BEL, 0x803AC667L, 0x84FBDBD0L, 0x9ABC8BD5L, 0x9E7D9662L, 0x933EB0BBL, 0x97FFAD0CL, + 0xAFB010B1L, 0xAB710D06L, 0xA6322BDFL, 0xA2F33668L, 0xBCB4666DL, 0xB8757BDAL, 0xB5365D03L, 0xB1F740B4L }; static DRFLAC_INLINE drflac_uint32 drflac_crc32_byte(drflac_uint32 crc32, drflac_uint8 data) @@ -4233,16 +4946,17 @@ static DRFLAC_INLINE drflac_uint32 drflac_crc32_uint64(drflac_uint32 crc32, drfl } #endif -static DRFLAC_INLINE drflac_uint32 drflac_crc32_buffer(drflac_uint32 crc32, drflac_uint8* pData, drflac_uint32 dataSize) +static DRFLAC_INLINE drflac_uint32 drflac_crc32_buffer(drflac_uint32 crc32, drflac_uint8* pData, + drflac_uint32 dataSize) { // This can be optimized. - for (drflac_uint32 i = 0; i < dataSize; ++i) { + for (drflac_uint32 i = 0; i < dataSize; ++i) + { crc32 = drflac_crc32_byte(crc32, pData[i]); } return crc32; } - static DRFLAC_INLINE drflac_bool32 drflac_ogg__is_capture_pattern(drflac_uint8 pattern[4]) { return pattern[0] == 'O' && pattern[1] == 'g' && pattern[2] == 'g' && pattern[3] == 'S'; @@ -4256,30 +4970,35 @@ static DRFLAC_INLINE drflac_uint32 drflac_ogg__get_page_header_size(drflac_ogg_p static DRFLAC_INLINE drflac_uint32 drflac_ogg__get_page_body_size(drflac_ogg_page_header* pHeader) { drflac_uint32 pageBodySize = 0; - for (int i = 0; i < pHeader->segmentCount; ++i) { + for (int i = 0; i < pHeader->segmentCount; ++i) + { pageBodySize += pHeader->segmentTable[i]; } return pageBodySize; } -drflac_result drflac_ogg__read_page_header_after_capture_pattern(drflac_read_proc onRead, void* pUserData, drflac_ogg_page_header* pHeader, drflac_uint32* pBytesRead, drflac_uint32* pCRC32) +drflac_result drflac_ogg__read_page_header_after_capture_pattern(drflac_read_proc onRead, void* pUserData, + drflac_ogg_page_header* pHeader, + drflac_uint32* pBytesRead, + drflac_uint32* pCRC32) { drflac_assert(*pCRC32 == DRFLAC_OGG_CAPTURE_PATTERN_CRC32); drflac_uint8 data[23]; - if (onRead(pUserData, data, 23) != 23) { + if (onRead(pUserData, data, 23) != 23) + { return DRFLAC_END_OF_STREAM; } *pBytesRead += 23; pHeader->structureVersion = data[0]; pHeader->headerType = data[1]; - drflac_copy_memory(&pHeader->granulePosition, &data[ 2], 8); - drflac_copy_memory(&pHeader->serialNumber, &data[10], 4); - drflac_copy_memory(&pHeader->sequenceNumber, &data[14], 4); - drflac_copy_memory(&pHeader->checksum, &data[18], 4); - pHeader->segmentCount = data[22]; + drflac_copy_memory(&pHeader->granulePosition, &data[2], 8); + drflac_copy_memory(&pHeader->serialNumber, &data[10], 4); + drflac_copy_memory(&pHeader->sequenceNumber, &data[14], 4); + drflac_copy_memory(&pHeader->checksum, &data[18], 4); + pHeader->segmentCount = data[22]; // Calculate the CRC. Note that for the calculation the checksum part of the page needs to be set to 0. data[18] = 0; @@ -4288,54 +5007,71 @@ drflac_result drflac_ogg__read_page_header_after_capture_pattern(drflac_read_pro data[21] = 0; drflac_uint32 i; - for (i = 0; i < 23; ++i) { + for (i = 0; i < 23; ++i) + { *pCRC32 = drflac_crc32_byte(*pCRC32, data[i]); } - - if (onRead(pUserData, pHeader->segmentTable, pHeader->segmentCount) != pHeader->segmentCount) { + if (onRead(pUserData, pHeader->segmentTable, pHeader->segmentCount) != pHeader->segmentCount) + { return DRFLAC_END_OF_STREAM; } *pBytesRead += pHeader->segmentCount; - for (i = 0; i < pHeader->segmentCount; ++i) { + for (i = 0; i < pHeader->segmentCount; ++i) + { *pCRC32 = drflac_crc32_byte(*pCRC32, pHeader->segmentTable[i]); } return DRFLAC_SUCCESS; } -drflac_result drflac_ogg__read_page_header(drflac_read_proc onRead, void* pUserData, drflac_ogg_page_header* pHeader, drflac_uint32* pBytesRead, drflac_uint32* pCRC32) +drflac_result drflac_ogg__read_page_header(drflac_read_proc onRead, void* pUserData, + drflac_ogg_page_header* pHeader, drflac_uint32* pBytesRead, + drflac_uint32* pCRC32) { *pBytesRead = 0; drflac_uint8 id[4]; - if (onRead(pUserData, id, 4) != 4) { + if (onRead(pUserData, id, 4) != 4) + { return DRFLAC_END_OF_STREAM; } *pBytesRead += 4; // We need to read byte-by-byte until we find the OggS capture pattern. - for (;;) { - if (drflac_ogg__is_capture_pattern(id)) { + for (;;) + { + if (drflac_ogg__is_capture_pattern(id)) + { *pCRC32 = DRFLAC_OGG_CAPTURE_PATTERN_CRC32; - drflac_result result = drflac_ogg__read_page_header_after_capture_pattern(onRead, pUserData, pHeader, pBytesRead, pCRC32); - if (result == DRFLAC_SUCCESS) { + drflac_result result = drflac_ogg__read_page_header_after_capture_pattern( + onRead, pUserData, pHeader, pBytesRead, pCRC32); + if (result == DRFLAC_SUCCESS) + { return DRFLAC_SUCCESS; - } else { - if (result == DRFLAC_CRC_MISMATCH) { + } + else + { + if (result == DRFLAC_CRC_MISMATCH) + { continue; - } else { + } + else + { return result; } } - } else { + } + else + { // The first 4 bytes did not equal the capture pattern. Read the next byte and try again. id[0] = id[1]; id[1] = id[2]; id[2] = id[3]; - if (onRead(pUserData, &id[3], 1) != 1) { + if (onRead(pUserData, &id[3], 1) != 1) + { return DRFLAC_END_OF_STREAM; } *pBytesRead += 1; @@ -4343,21 +5079,25 @@ drflac_result drflac_ogg__read_page_header(drflac_read_proc onRead, void* pUserD } } - -// The main part of the Ogg encapsulation is the conversion from the physical Ogg bitstream to the native FLAC bitstream. It works -// in three general stages: Ogg Physical Bitstream -> Ogg/FLAC Logical Bitstream -> FLAC Native Bitstream. dr_flac is designed -// in such a way that the core sections assume everything is delivered in native format. Therefore, for each encapsulation type -// dr_flac is supporting there needs to be a layer sitting on top of the onRead and onSeek callbacks that ensures the bits read from -// the physical Ogg bitstream are converted and delivered in native FLAC format. +// The main part of the Ogg encapsulation is the conversion from the physical Ogg bitstream to the native FLAC +// bitstream. It works in three general stages: Ogg Physical Bitstream -> Ogg/FLAC Logical Bitstream -> FLAC +// Native Bitstream. dr_flac is designed in such a way that the core sections assume everything is delivered +// in native format. Therefore, for each encapsulation type dr_flac is supporting there needs to be a layer +// sitting on top of the onRead and onSeek callbacks that ensures the bits read from the physical Ogg +// bitstream are converted and delivered in native FLAC format. typedef struct { - drflac_read_proc onRead; // The original onRead callback from drflac_open() and family. - drflac_seek_proc onSeek; // The original onSeek callback from drflac_open() and family. - void* pUserData; // The user data passed on onRead and onSeek. This is the user data that was passed on drflac_open() and family. - drflac_uint64 currentBytePos; // The position of the byte we are sitting on in the physical byte stream. Used for efficient seeking. - drflac_uint64 firstBytePos; // The position of the first byte in the physical bitstream. Points to the start of the "OggS" identifier of the FLAC bos page. - drflac_uint32 serialNumber; // The serial number of the FLAC audio pages. This is determined by the initial header page that was read during initialization. - drflac_ogg_page_header bosPageHeader; // Used for seeking. + drflac_read_proc onRead; // The original onRead callback from drflac_open() and family. + drflac_seek_proc onSeek; // The original onSeek callback from drflac_open() and family. + void* pUserData; // The user data passed on onRead and onSeek. This is the user data that was passed on + // drflac_open() and family. + drflac_uint64 currentBytePos; // The position of the byte we are sitting on in the physical byte stream. + // Used for efficient seeking. + drflac_uint64 firstBytePos; // The position of the first byte in the physical bitstream. Points to the + // start of the "OggS" identifier of the FLAC bos page. + drflac_uint32 serialNumber; // The serial number of the FLAC audio pages. This is determined by the + // initial header page that was read during initialization. + drflac_ogg_page_header bosPageHeader; // Used for seeking. drflac_ogg_page_header currentPageHeader; drflac_uint32 bytesRemainingInPage; drflac_uint32 pageDataSize; @@ -4372,34 +5112,46 @@ static size_t drflac_oggbs__read_physical(drflac_oggbs* oggbs, void* bufferOut, return bytesActuallyRead; } -static drflac_bool32 drflac_oggbs__seek_physical(drflac_oggbs* oggbs, drflac_uint64 offset, drflac_seek_origin origin) +static drflac_bool32 drflac_oggbs__seek_physical(drflac_oggbs* oggbs, drflac_uint64 offset, + drflac_seek_origin origin) { - if (origin == drflac_seek_origin_start) { - if (offset <= 0x7FFFFFFF) { - if (!oggbs->onSeek(oggbs->pUserData, (int)offset, drflac_seek_origin_start)) { + if (origin == drflac_seek_origin_start) + { + if (offset <= 0x7FFFFFFF) + { + if (!oggbs->onSeek(oggbs->pUserData, (int)offset, drflac_seek_origin_start)) + { return DRFLAC_FALSE; } oggbs->currentBytePos = offset; return DRFLAC_TRUE; - } else { - if (!oggbs->onSeek(oggbs->pUserData, 0x7FFFFFFF, drflac_seek_origin_start)) { + } + else + { + if (!oggbs->onSeek(oggbs->pUserData, 0x7FFFFFFF, drflac_seek_origin_start)) + { return DRFLAC_FALSE; } oggbs->currentBytePos = offset; return drflac_oggbs__seek_physical(oggbs, offset - 0x7FFFFFFF, drflac_seek_origin_current); } - } else { - while (offset > 0x7FFFFFFF) { - if (!oggbs->onSeek(oggbs->pUserData, 0x7FFFFFFF, drflac_seek_origin_current)) { + } + else + { + while (offset > 0x7FFFFFFF) + { + if (!oggbs->onSeek(oggbs->pUserData, 0x7FFFFFFF, drflac_seek_origin_current)) + { return DRFLAC_FALSE; } oggbs->currentBytePos += 0x7FFFFFFF; offset -= 0x7FFFFFFF; } - if (!oggbs->onSeek(oggbs->pUserData, (int)offset, drflac_seek_origin_current)) { // <-- Safe cast thanks to the loop above. + if (!oggbs->onSeek(oggbs->pUserData, (int)offset, drflac_seek_origin_current)) + { // <-- Safe cast thanks to the loop above. return DRFLAC_FALSE; } oggbs->currentBytePos += offset; @@ -4408,55 +5160,68 @@ static drflac_bool32 drflac_oggbs__seek_physical(drflac_oggbs* oggbs, drflac_uin } } -static drflac_bool32 drflac_oggbs__goto_next_page(drflac_oggbs* oggbs, drflac_ogg_crc_mismatch_recovery recoveryMethod) +static drflac_bool32 drflac_oggbs__goto_next_page(drflac_oggbs* oggbs, + drflac_ogg_crc_mismatch_recovery recoveryMethod) { drflac_ogg_page_header header; - for (;;) { + for (;;) + { drflac_uint32 crc32 = 0; drflac_uint32 bytesRead; - if (drflac_ogg__read_page_header(oggbs->onRead, oggbs->pUserData, &header, &bytesRead, &crc32) != DRFLAC_SUCCESS) { + if (drflac_ogg__read_page_header(oggbs->onRead, oggbs->pUserData, &header, &bytesRead, &crc32) != + DRFLAC_SUCCESS) + { return DRFLAC_FALSE; } oggbs->currentBytePos += bytesRead; drflac_uint32 pageBodySize = drflac_ogg__get_page_body_size(&header); - if (pageBodySize > DRFLAC_OGG_MAX_PAGE_SIZE) { - continue; // Invalid page size. Assume it's corrupted and just move to the next page. + if (pageBodySize > DRFLAC_OGG_MAX_PAGE_SIZE) + { + continue; // Invalid page size. Assume it's corrupted and just move to the next page. } - if (header.serialNumber != oggbs->serialNumber) { + if (header.serialNumber != oggbs->serialNumber) + { // It's not a FLAC page. Skip it. - if (pageBodySize > 0 && !drflac_oggbs__seek_physical(oggbs, pageBodySize, drflac_seek_origin_current)) { + if (pageBodySize > 0 && + !drflac_oggbs__seek_physical(oggbs, pageBodySize, drflac_seek_origin_current)) + { return DRFLAC_FALSE; } continue; } - - // We need to read the entire page and then do a CRC check on it. If there's a CRC mismatch we need to skip this page. - if (drflac_oggbs__read_physical(oggbs, oggbs->pageData, pageBodySize) != pageBodySize) { + // We need to read the entire page and then do a CRC check on it. If there's a CRC mismatch we need to + // skip this page. + if (drflac_oggbs__read_physical(oggbs, oggbs->pageData, pageBodySize) != pageBodySize) + { return DRFLAC_FALSE; } oggbs->pageDataSize = pageBodySize; #ifndef DR_FLAC_NO_CRC drflac_uint32 actualCRC32 = drflac_crc32_buffer(crc32, oggbs->pageData, oggbs->pageDataSize); - if (actualCRC32 != header.checksum) { - if (recoveryMethod == drflac_ogg_recover_on_crc_mismatch) { - continue; // CRC mismatch. Skip this page. - } else { - // Even though we are failing on a CRC mismatch, we still want our stream to be in a good state. Therefore we - // go to the next valid page to ensure we're in a good state, but return false to let the caller know that the - // seek did not fully complete. + if (actualCRC32 != header.checksum) + { + if (recoveryMethod == drflac_ogg_recover_on_crc_mismatch) + { + continue; // CRC mismatch. Skip this page. + } + else + { + // Even though we are failing on a CRC mismatch, we still want our stream to be in a good + // state. Therefore we go to the next valid page to ensure we're in a good state, but return + // false to let the caller know that the seek did not fully complete. drflac_oggbs__goto_next_page(oggbs, drflac_ogg_recover_on_crc_mismatch); return DRFLAC_FALSE; } } #else - (void)recoveryMethod; // <-- Silence a warning. + (void)recoveryMethod; // <-- Silence a warning. #endif - oggbs->currentPageHeader = header; + oggbs->currentPageHeader = header; oggbs->bytesRemainingInPage = pageBodySize; return DRFLAC_TRUE; } @@ -4547,27 +5312,35 @@ static size_t drflac__on_read_ogg(void* pUserData, void* bufferOut, size_t bytes // Reading is done page-by-page. If we've run out of bytes in the page we need to move to the next one. size_t bytesRead = 0; - while (bytesRead < bytesToRead) { + while (bytesRead < bytesToRead) + { size_t bytesRemainingToRead = bytesToRead - bytesRead; - if (oggbs->bytesRemainingInPage >= bytesRemainingToRead) { - drflac_copy_memory(pRunningBufferOut, oggbs->pageData + (oggbs->pageDataSize - oggbs->bytesRemainingInPage), bytesRemainingToRead); + if (oggbs->bytesRemainingInPage >= bytesRemainingToRead) + { + drflac_copy_memory(pRunningBufferOut, + oggbs->pageData + (oggbs->pageDataSize - oggbs->bytesRemainingInPage), + bytesRemainingToRead); bytesRead += bytesRemainingToRead; oggbs->bytesRemainingInPage -= (drflac_uint32)bytesRemainingToRead; break; } // If we get here it means some of the requested data is contained in the next pages. - if (oggbs->bytesRemainingInPage > 0) { - drflac_copy_memory(pRunningBufferOut, oggbs->pageData + (oggbs->pageDataSize - oggbs->bytesRemainingInPage), oggbs->bytesRemainingInPage); + if (oggbs->bytesRemainingInPage > 0) + { + drflac_copy_memory(pRunningBufferOut, + oggbs->pageData + (oggbs->pageDataSize - oggbs->bytesRemainingInPage), + oggbs->bytesRemainingInPage); bytesRead += oggbs->bytesRemainingInPage; pRunningBufferOut += oggbs->bytesRemainingInPage; oggbs->bytesRemainingInPage = 0; } drflac_assert(bytesRemainingToRead > 0); - if (!drflac_oggbs__goto_next_page(oggbs, drflac_ogg_recover_on_crc_mismatch)) { - break; // Failed to go to the next page. Might have simply hit the end of the stream. + if (!drflac_oggbs__goto_next_page(oggbs, drflac_ogg_recover_on_crc_mismatch)) + { + break; // Failed to go to the next page. Might have simply hit the end of the stream. } } @@ -4578,43 +5351,49 @@ static drflac_bool32 drflac__on_seek_ogg(void* pUserData, int offset, drflac_see { drflac_oggbs* oggbs = (drflac_oggbs*)pUserData; drflac_assert(oggbs != NULL); - drflac_assert(offset >= 0); // <-- Never seek backwards. + drflac_assert(offset >= 0); // <-- Never seek backwards. // Seeking is always forward which makes things a lot simpler. - if (origin == drflac_seek_origin_start) { - if (!drflac_oggbs__seek_physical(oggbs, (int)oggbs->firstBytePos, drflac_seek_origin_start)) { + if (origin == drflac_seek_origin_start) + { + if (!drflac_oggbs__seek_physical(oggbs, (int)oggbs->firstBytePos, drflac_seek_origin_start)) + { return DRFLAC_FALSE; } - if (!drflac_oggbs__goto_next_page(oggbs, drflac_ogg_fail_on_crc_mismatch)) { + if (!drflac_oggbs__goto_next_page(oggbs, drflac_ogg_fail_on_crc_mismatch)) + { return DRFLAC_FALSE; } return drflac__on_seek_ogg(pUserData, offset, drflac_seek_origin_current); } - drflac_assert(origin == drflac_seek_origin_current); int bytesSeeked = 0; - while (bytesSeeked < offset) { + while (bytesSeeked < offset) + { int bytesRemainingToSeek = offset - bytesSeeked; drflac_assert(bytesRemainingToSeek >= 0); - if (oggbs->bytesRemainingInPage >= (size_t)bytesRemainingToSeek) { + if (oggbs->bytesRemainingInPage >= (size_t)bytesRemainingToSeek) + { bytesSeeked += bytesRemainingToSeek; oggbs->bytesRemainingInPage -= bytesRemainingToSeek; break; } // If we get here it means some of the requested data is contained in the next pages. - if (oggbs->bytesRemainingInPage > 0) { + if (oggbs->bytesRemainingInPage > 0) + { bytesSeeked += (int)oggbs->bytesRemainingInPage; oggbs->bytesRemainingInPage = 0; } drflac_assert(bytesRemainingToSeek > 0); - if (!drflac_oggbs__goto_next_page(oggbs, drflac_ogg_fail_on_crc_mismatch)) { + if (!drflac_oggbs__goto_next_page(oggbs, drflac_ogg_fail_on_crc_mismatch)) + { // Failed to go to the next page. We either hit the end of the stream or had a CRC mismatch. return DRFLAC_FALSE; } @@ -4627,38 +5406,46 @@ drflac_bool32 drflac_ogg__seek_to_sample(drflac* pFlac, drflac_uint64 sampleInde { drflac_oggbs* oggbs = (drflac_oggbs*)pFlac->_oggbs; - drflac_uint64 originalBytePos = oggbs->currentBytePos; // For recovery. + drflac_uint64 originalBytePos = oggbs->currentBytePos; // For recovery. // First seek to the first frame. - if (!drflac__seek_to_byte(&pFlac->bs, pFlac->firstFramePos)) { + if (!drflac__seek_to_byte(&pFlac->bs, pFlac->firstFramePos)) + { return DRFLAC_FALSE; } oggbs->bytesRemainingInPage = 0; drflac_uint64 runningGranulePosition = 0; - drflac_uint64 runningFrameBytePos = oggbs->currentBytePos; // <-- Points to the OggS identifier. - for (;;) { - if (!drflac_oggbs__goto_next_page(oggbs, drflac_ogg_recover_on_crc_mismatch)) { + drflac_uint64 runningFrameBytePos = oggbs->currentBytePos; // <-- Points to the OggS identifier. + for (;;) + { + if (!drflac_oggbs__goto_next_page(oggbs, drflac_ogg_recover_on_crc_mismatch)) + { drflac_oggbs__seek_physical(oggbs, originalBytePos, drflac_seek_origin_start); - return DRFLAC_FALSE; // Never did find that sample... + return DRFLAC_FALSE; // Never did find that sample... } - runningFrameBytePos = oggbs->currentBytePos - drflac_ogg__get_page_header_size(&oggbs->currentPageHeader) - oggbs->pageDataSize; - if (oggbs->currentPageHeader.granulePosition*pFlac->channels >= sampleIndex) { + runningFrameBytePos = oggbs->currentBytePos - + drflac_ogg__get_page_header_size(&oggbs->currentPageHeader) - + oggbs->pageDataSize; + if (oggbs->currentPageHeader.granulePosition * pFlac->channels >= sampleIndex) + { break; // The sample is somewhere in the previous page. } - - // At this point we know the sample is not in the previous page. It could possibly be in this page. For simplicity we - // disregard any pages that do not begin a fresh packet. - if ((oggbs->currentPageHeader.headerType & 0x01) == 0) { // <-- Is it a fresh page? - if (oggbs->currentPageHeader.segmentTable[0] >= 2) { + // At this point we know the sample is not in the previous page. It could possibly be in this page. + // For simplicity we disregard any pages that do not begin a fresh packet. + if ((oggbs->currentPageHeader.headerType & 0x01) == 0) + { // <-- Is it a fresh page? + if (oggbs->currentPageHeader.segmentTable[0] >= 2) + { drflac_uint8 firstBytesInPage[2]; firstBytesInPage[0] = oggbs->pageData[0]; firstBytesInPage[1] = oggbs->pageData[1]; - if ((firstBytesInPage[0] == 0xFF) && (firstBytesInPage[1] & 0xFC) == 0xF8) { // <-- Does the page begin with a frame's sync code? - runningGranulePosition = oggbs->currentPageHeader.granulePosition*pFlac->channels; + if ((firstBytesInPage[0] == 0xFF) && (firstBytesInPage[1] & 0xFC) == 0xF8) + { // <-- Does the page begin with a frame's sync code? + runningGranulePosition = oggbs->currentPageHeader.granulePosition * pFlac->channels; } continue; @@ -4666,79 +5453,102 @@ drflac_bool32 drflac_ogg__seek_to_sample(drflac* pFlac, drflac_uint64 sampleInde } } - - // We found the page that that is closest to the sample, so now we need to find it. The first thing to do is seek to the - // start of that page. In the loop above we checked that it was a fresh page which means this page is also the start of - // a new frame. This property means that after we've seeked to the page we can immediately start looping over frames until - // we find the one containing the target sample. - if (!drflac_oggbs__seek_physical(oggbs, runningFrameBytePos, drflac_seek_origin_start)) { + // We found the page that that is closest to the sample, so now we need to find it. The first thing to do + // is seek to the start of that page. In the loop above we checked that it was a fresh page which means + // this page is also the start of a new frame. This property means that after we've seeked to the page we + // can immediately start looping over frames until we find the one containing the target sample. + if (!drflac_oggbs__seek_physical(oggbs, runningFrameBytePos, drflac_seek_origin_start)) + { return DRFLAC_FALSE; } - if (!drflac_oggbs__goto_next_page(oggbs, drflac_ogg_recover_on_crc_mismatch)) { + if (!drflac_oggbs__goto_next_page(oggbs, drflac_ogg_recover_on_crc_mismatch)) + { return DRFLAC_FALSE; } - - // At this point we'll be sitting on the first byte of the frame header of the first frame in the page. We just keep - // looping over these frames until we find the one containing the sample we're after. + // At this point we'll be sitting on the first byte of the frame header of the first frame in the page. We + // just keep looping over these frames until we find the one containing the sample we're after. drflac_uint64 runningSampleCount = runningGranulePosition; - for (;;) { + for (;;) + { // There are two ways to find the sample and seek past irrelevant frames: // 1) Use the native FLAC decoder. // 2) Use Ogg's framing system. // - // Both of these options have their own pros and cons. Using the native FLAC decoder is slower because it needs to - // do a full decode of the frame. Using Ogg's framing system is faster, but more complicated and involves some code - // duplication for the decoding of frame headers. + // Both of these options have their own pros and cons. Using the native FLAC decoder is slower because + // it needs to do a full decode of the frame. Using Ogg's framing system is faster, but more + // complicated and involves some code duplication for the decoding of frame headers. // - // Another thing to consider is that using the Ogg framing system will perform direct seeking of the physical Ogg - // bitstream. This is important to consider because it means we cannot read data from the drflac_bs object using the - // standard drflac__*() APIs because that will read in extra data for its own internal caching which in turn breaks - // the positioning of the read pointer of the physical Ogg bitstream. Therefore, anything that would normally be read - // using the native FLAC decoding APIs, such as drflac__read_next_frame_header(), need to be re-implemented so as to - // avoid the use of the drflac_bs object. + // Another thing to consider is that using the Ogg framing system will perform direct seeking of the + // physical Ogg bitstream. This is important to consider because it means we cannot read data from the + // drflac_bs object using the standard drflac__*() APIs because that will read in extra data for its + // own internal caching which in turn breaks the positioning of the read pointer of the physical Ogg + // bitstream. Therefore, anything that would normally be read using the native FLAC decoding APIs, + // such as drflac__read_next_frame_header(), need to be re-implemented so as to avoid the use of the + // drflac_bs object. // - // Considering these issues, I have decided to use the slower native FLAC decoding method for the following reasons: + // Considering these issues, I have decided to use the slower native FLAC decoding method for the + // following reasons: // 1) Seeking is already partially accelerated using Ogg's paging system in the code block above. // 2) Seeking in an Ogg encapsulated FLAC stream is probably quite uncommon. // 3) Simplicity. - if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) { + if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) + { return DRFLAC_FALSE; } drflac_uint64 firstSampleInFrame = 0; - drflac_uint64 lastSampleInFrame = 0; + drflac_uint64 lastSampleInFrame = 0; drflac__get_current_frame_sample_range(pFlac, &firstSampleInFrame, &lastSampleInFrame); drflac_uint64 sampleCountInThisFrame = (lastSampleInFrame - firstSampleInFrame) + 1; - if (sampleIndex < (runningSampleCount + sampleCountInThisFrame)) { - // The sample should be in this frame. We need to fully decode it, however if it's an invalid frame (a CRC mismatch), we need to pretend - // it never existed and keep iterating. + if (sampleIndex < (runningSampleCount + sampleCountInThisFrame)) + { + // The sample should be in this frame. We need to fully decode it, however if it's an invalid + // frame (a CRC mismatch), we need to pretend it never existed and keep iterating. drflac_result result = drflac__decode_frame(pFlac); - if (result == DRFLAC_SUCCESS) { + if (result == DRFLAC_SUCCESS) + { // The frame is valid. We just need to skip over some samples to ensure it's sample-exact. - drflac_uint64 samplesToDecode = (size_t)(sampleIndex - runningSampleCount); // <-- Safe cast because the maximum number of samples in a frame is 65535. - if (samplesToDecode == 0) { + drflac_uint64 samplesToDecode = + (size_t)(sampleIndex - runningSampleCount); // <-- Safe cast because the maximum number of + // samples in a frame is 65535. + if (samplesToDecode == 0) + { return DRFLAC_TRUE; } - return drflac_read_s32(pFlac, samplesToDecode, NULL) != 0; // <-- If this fails, something bad has happened (it should never fail). - } else { - if (result == DRFLAC_CRC_MISMATCH) { - continue; // CRC mismatch. Pretend this frame never existed. - } else { + return drflac_read_s32(pFlac, samplesToDecode, NULL) != + 0; // <-- If this fails, something bad has happened (it should never fail). + } + else + { + if (result == DRFLAC_CRC_MISMATCH) + { + continue; // CRC mismatch. Pretend this frame never existed. + } + else + { return DRFLAC_FALSE; } } - } else { - // It's not in this frame. We need to seek past the frame, but check if there was a CRC mismatch. If so, we pretend this - // frame never existed and leave the running sample count untouched. + } + else + { + // It's not in this frame. We need to seek past the frame, but check if there was a CRC mismatch. + // If so, we pretend this frame never existed and leave the running sample count untouched. drflac_result result = drflac__seek_to_next_frame(pFlac); - if (result == DRFLAC_SUCCESS) { + if (result == DRFLAC_SUCCESS) + { runningSampleCount += sampleCountInThisFrame; - } else { - if (result == DRFLAC_CRC_MISMATCH) { - continue; // CRC mismatch. Pretend this frame never existed. - } else { + } + else + { + if (result == DRFLAC_CRC_MISMATCH) + { + continue; // CRC mismatch. Pretend this frame never existed. + } + else + { return DRFLAC_FALSE; } } @@ -4746,91 +5556,112 @@ drflac_bool32 drflac_ogg__seek_to_sample(drflac* pFlac, drflac_uint64 sampleInde } } - -drflac_bool32 drflac__init_private__ogg(drflac_init_info* pInit, drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_meta_proc onMeta, void* pUserData, void* pUserDataMD, drflac_bool32 relaxed) +drflac_bool32 drflac__init_private__ogg(drflac_init_info* pInit, drflac_read_proc onRead, + drflac_seek_proc onSeek, drflac_meta_proc onMeta, void* pUserData, + void* pUserDataMD, drflac_bool32 relaxed) { // Pre: The bit stream should be sitting just past the 4-byte OggS capture pattern. (void)relaxed; - pInit->container = drflac_container_ogg; + pInit->container = drflac_container_ogg; pInit->oggFirstBytePos = 0; - // We'll get here if the first 4 bytes of the stream were the OggS capture pattern, however it doesn't necessarily mean the - // stream includes FLAC encoded audio. To check for this we need to scan the beginning-of-stream page markers and check if - // any match the FLAC specification. Important to keep in mind that the stream may be multiplexed. + // We'll get here if the first 4 bytes of the stream were the OggS capture pattern, however it doesn't + // necessarily mean the stream includes FLAC encoded audio. To check for this we need to scan the + // beginning-of-stream page markers and check if any match the FLAC specification. Important to keep in + // mind that the stream may be multiplexed. drflac_ogg_page_header header; - drflac_uint32 crc32 = DRFLAC_OGG_CAPTURE_PATTERN_CRC32; + drflac_uint32 crc32 = DRFLAC_OGG_CAPTURE_PATTERN_CRC32; drflac_uint32 bytesRead = 0; - if (drflac_ogg__read_page_header_after_capture_pattern(onRead, pUserData, &header, &bytesRead, &crc32) != DRFLAC_SUCCESS) { + if (drflac_ogg__read_page_header_after_capture_pattern(onRead, pUserData, &header, &bytesRead, &crc32) != + DRFLAC_SUCCESS) + { return DRFLAC_FALSE; } pInit->runningFilePos += bytesRead; - for (;;) { + for (;;) + { // Break if we're past the beginning of stream page. - if ((header.headerType & 0x02) == 0) { + if ((header.headerType & 0x02) == 0) + { return DRFLAC_FALSE; } - // Check if it's a FLAC header. int pageBodySize = drflac_ogg__get_page_body_size(&header); - if (pageBodySize == 51) { // 51 = the lacing value of the FLAC header packet. + if (pageBodySize == 51) + { // 51 = the lacing value of the FLAC header packet. // It could be a FLAC page... drflac_uint32 bytesRemainingInPage = pageBodySize; drflac_uint8 packetType; - if (onRead(pUserData, &packetType, 1) != 1) { + if (onRead(pUserData, &packetType, 1) != 1) + { return DRFLAC_FALSE; } bytesRemainingInPage -= 1; - if (packetType == 0x7F) { + if (packetType == 0x7F) + { // Increasingly more likely to be a FLAC page... drflac_uint8 sig[4]; - if (onRead(pUserData, sig, 4) != 4) { + if (onRead(pUserData, sig, 4) != 4) + { return DRFLAC_FALSE; } bytesRemainingInPage -= 4; - if (sig[0] == 'F' && sig[1] == 'L' && sig[2] == 'A' && sig[3] == 'C') { + if (sig[0] == 'F' && sig[1] == 'L' && sig[2] == 'A' && sig[3] == 'C') + { // Almost certainly a FLAC page... drflac_uint8 mappingVersion[2]; - if (onRead(pUserData, mappingVersion, 2) != 2) { + if (onRead(pUserData, mappingVersion, 2) != 2) + { return DRFLAC_FALSE; } - if (mappingVersion[0] != 1) { - return DRFLAC_FALSE; // Only supporting version 1.x of the Ogg mapping. + if (mappingVersion[0] != 1) + { + return DRFLAC_FALSE; // Only supporting version 1.x of the Ogg mapping. } - // The next 2 bytes are the non-audio packets, not including this one. We don't care about this because we're going to - // be handling it in a generic way based on the serial number and packet types. - if (!onSeek(pUserData, 2, drflac_seek_origin_current)) { + // The next 2 bytes are the non-audio packets, not including this one. We don't care about + // this because we're going to be handling it in a generic way based on the serial number + // and packet types. + if (!onSeek(pUserData, 2, drflac_seek_origin_current)) + { return DRFLAC_FALSE; } // Expecting the native FLAC signature "fLaC". - if (onRead(pUserData, sig, 4) != 4) { + if (onRead(pUserData, sig, 4) != 4) + { return DRFLAC_FALSE; } - if (sig[0] == 'f' && sig[1] == 'L' && sig[2] == 'a' && sig[3] == 'C') { + if (sig[0] == 'f' && sig[1] == 'L' && sig[2] == 'a' && sig[3] == 'C') + { // The remaining data in the page should be the STREAMINFO block. drflac_uint8 isLastBlock; drflac_uint8 blockType; drflac_uint32 blockSize; - if (!drflac__read_and_decode_block_header(onRead, pUserData, &isLastBlock, &blockType, &blockSize)) { + if (!drflac__read_and_decode_block_header(onRead, pUserData, &isLastBlock, &blockType, + &blockSize)) + { return DRFLAC_FALSE; } - if (blockType != DRFLAC_METADATA_BLOCK_TYPE_STREAMINFO || blockSize != 34) { - return DRFLAC_FALSE; // Invalid block type. First block must be the STREAMINFO block. + if (blockType != DRFLAC_METADATA_BLOCK_TYPE_STREAMINFO || blockSize != 34) + { + return DRFLAC_FALSE; // Invalid block type. First block must be the STREAMINFO + // block. } drflac_streaminfo streaminfo; - if (drflac__read_streaminfo(onRead, pUserData, &streaminfo)) { + if (drflac__read_streaminfo(onRead, pUserData, &streaminfo)) + { // Success! pInit->hasStreamInfoBlock = DRFLAC_TRUE; pInit->sampleRate = streaminfo.sampleRate; @@ -4840,137 +5671,168 @@ drflac_bool32 drflac__init_private__ogg(drflac_init_info* pInit, drflac_read_pro pInit->maxBlockSize = streaminfo.maxBlockSize; pInit->hasMetadataBlocks = !isLastBlock; - if (onMeta) { + if (onMeta) + { drflac_metadata metadata; - metadata.type = DRFLAC_METADATA_BLOCK_TYPE_STREAMINFO; - metadata.pRawData = NULL; - metadata.rawDataSize = 0; + metadata.type = DRFLAC_METADATA_BLOCK_TYPE_STREAMINFO; + metadata.pRawData = NULL; + metadata.rawDataSize = 0; metadata.data.streaminfo = streaminfo; onMeta(pUserDataMD, &metadata); } - pInit->runningFilePos += pageBodySize; - pInit->oggFirstBytePos = pInit->runningFilePos - 79; // Subtracting 79 will place us right on top of the "OggS" identifier of the FLAC bos page. - pInit->oggSerial = header.serialNumber; - pInit->oggBosHeader = header; + pInit->runningFilePos += pageBodySize; + pInit->oggFirstBytePos = + pInit->runningFilePos - 79; // Subtracting 79 will place us right on top of + // the "OggS" identifier of the FLAC bos page. + pInit->oggSerial = header.serialNumber; + pInit->oggBosHeader = header; break; - } else { + } + else + { // Failed to read STREAMINFO block. Aww, so close... return DRFLAC_FALSE; } - } else { + } + else + { // Invalid file. return DRFLAC_FALSE; } - } else { + } + else + { // Not a FLAC header. Skip it. - if (!onSeek(pUserData, bytesRemainingInPage, drflac_seek_origin_current)) { + if (!onSeek(pUserData, bytesRemainingInPage, drflac_seek_origin_current)) + { return DRFLAC_FALSE; } } - } else { + } + else + { // Not a FLAC header. Seek past the entire page and move on to the next. - if (!onSeek(pUserData, bytesRemainingInPage, drflac_seek_origin_current)) { + if (!onSeek(pUserData, bytesRemainingInPage, drflac_seek_origin_current)) + { return DRFLAC_FALSE; } } - } else { - if (!onSeek(pUserData, pageBodySize, drflac_seek_origin_current)) { + } + else + { + if (!onSeek(pUserData, pageBodySize, drflac_seek_origin_current)) + { return DRFLAC_FALSE; } } pInit->runningFilePos += pageBodySize; - // Read the header of the next page. - if (drflac_ogg__read_page_header(onRead, pUserData, &header, &bytesRead, &crc32) != DRFLAC_SUCCESS) { + if (drflac_ogg__read_page_header(onRead, pUserData, &header, &bytesRead, &crc32) != DRFLAC_SUCCESS) + { return DRFLAC_FALSE; } pInit->runningFilePos += bytesRead; } - - // If we get here it means we found a FLAC audio stream. We should be sitting on the first byte of the header of the next page. The next - // packets in the FLAC logical stream contain the metadata. The only thing left to do in the initialization phase for Ogg is to create the - // Ogg bistream object. - pInit->hasMetadataBlocks = DRFLAC_TRUE; // <-- Always have at least VORBIS_COMMENT metadata block. + // If we get here it means we found a FLAC audio stream. We should be sitting on the first byte of the + // header of the next page. The next packets in the FLAC logical stream contain the metadata. The only + // thing left to do in the initialization phase for Ogg is to create the Ogg bistream object. + pInit->hasMetadataBlocks = DRFLAC_TRUE; // <-- Always have at least VORBIS_COMMENT metadata block. return DRFLAC_TRUE; } #endif -drflac_bool32 drflac__init_private(drflac_init_info* pInit, drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_meta_proc onMeta, drflac_container container, void* pUserData, void* pUserDataMD) +drflac_bool32 drflac__init_private(drflac_init_info* pInit, drflac_read_proc onRead, drflac_seek_proc onSeek, + drflac_meta_proc onMeta, drflac_container container, void* pUserData, + void* pUserDataMD) { - if (pInit == NULL || onRead == NULL || onSeek == NULL) { + if (pInit == NULL || onRead == NULL || onSeek == NULL) + { return DRFLAC_FALSE; } drflac_zero_memory(pInit, sizeof(*pInit)); - pInit->onRead = onRead; - pInit->onSeek = onSeek; - pInit->onMeta = onMeta; - pInit->container = container; - pInit->pUserData = pUserData; - pInit->pUserDataMD = pUserDataMD; + pInit->onRead = onRead; + pInit->onSeek = onSeek; + pInit->onMeta = onMeta; + pInit->container = container; + pInit->pUserData = pUserData; + pInit->pUserDataMD = pUserDataMD; pInit->bs.onRead = onRead; pInit->bs.onSeek = onSeek; pInit->bs.pUserData = pUserData; drflac__reset_cache(&pInit->bs); - // If the container is explicitly defined then we can try opening in relaxed mode. drflac_bool32 relaxed = container != drflac_container_unknown; drflac_uint8 id[4]; // Skip over any ID3 tags. - for (;;) { - if (onRead(pUserData, id, 4) != 4) { - return DRFLAC_FALSE; // Ran out of data. + for (;;) + { + if (onRead(pUserData, id, 4) != 4) + { + return DRFLAC_FALSE; // Ran out of data. } pInit->runningFilePos += 4; - if (id[0] == 'I' && id[1] == 'D' && id[2] == '3') { + if (id[0] == 'I' && id[1] == 'D' && id[2] == '3') + { drflac_uint8 header[6]; - if (onRead(pUserData, header, 6) != 6) { - return DRFLAC_FALSE; // Ran out of data. + if (onRead(pUserData, header, 6) != 6) + { + return DRFLAC_FALSE; // Ran out of data. } pInit->runningFilePos += 6; drflac_uint8 flags = header[1]; drflac_uint32 headerSize; - drflac_copy_memory(&headerSize, header+2, 4); + drflac_copy_memory(&headerSize, header + 2, 4); headerSize = drflac__unsynchsafe_32(drflac__be2host_32(headerSize)); - if (flags & 0x10) { + if (flags & 0x10) + { headerSize += 10; } - if (!onSeek(pUserData, headerSize, drflac_seek_origin_current)) { - return DRFLAC_FALSE; // Failed to seek past the tag. + if (!onSeek(pUserData, headerSize, drflac_seek_origin_current)) + { + return DRFLAC_FALSE; // Failed to seek past the tag. } pInit->runningFilePos += headerSize; - } else { + } + else + { break; } } - if (id[0] == 'f' && id[1] == 'L' && id[2] == 'a' && id[3] == 'C') { + if (id[0] == 'f' && id[1] == 'L' && id[2] == 'a' && id[3] == 'C') + { return drflac__init_private__native(pInit, onRead, onSeek, onMeta, pUserData, pUserDataMD, relaxed); } #ifndef DR_FLAC_NO_OGG - if (id[0] == 'O' && id[1] == 'g' && id[2] == 'g' && id[3] == 'S') { + if (id[0] == 'O' && id[1] == 'g' && id[2] == 'g' && id[3] == 'S') + { return drflac__init_private__ogg(pInit, onRead, onSeek, onMeta, pUserData, pUserDataMD, relaxed); } #endif // If we get here it means we likely don't have a header. Try opening in relaxed mode, if applicable. - if (relaxed) { - if (container == drflac_container_native) { - return drflac__init_private__native(pInit, onRead, onSeek, onMeta, pUserData, pUserDataMD, relaxed); + if (relaxed) + { + if (container == drflac_container_native) + { + return drflac__init_private__native(pInit, onRead, onSeek, onMeta, pUserData, pUserDataMD, + relaxed); } #ifndef DR_FLAC_NO_OGG - if (container == drflac_container_ogg) { + if (container == drflac_container_ogg) + { return drflac__init_private__ogg(pInit, onRead, onSeek, onMeta, pUserData, pUserDataMD, relaxed); } #endif @@ -4997,7 +5859,9 @@ void drflac__init_from_info(drflac* pFlac, drflac_init_info* pInit) pFlac->container = pInit->container; } -drflac* drflac_open_with_metadata_private(drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_meta_proc onMeta, drflac_container container, void* pUserData, void* pUserDataMD) +drflac* drflac_open_with_metadata_private(drflac_read_proc onRead, drflac_seek_proc onSeek, + drflac_meta_proc onMeta, drflac_container container, + void* pUserData, void* pUserDataMD) { #ifndef DRFLAC_NO_CPUID // CPU support first. @@ -5005,7 +5869,8 @@ drflac* drflac_open_with_metadata_private(drflac_read_proc onRead, drflac_seek_p #endif drflac_init_info init; - if (!drflac__init_private(&init, onRead, onSeek, onMeta, container, pUserData, pUserDataMD)) { + if (!drflac__init_private(&init, onRead, onSeek, onMeta, container, pUserData, pUserDataMD)) + { return NULL; } @@ -5014,154 +5879,193 @@ drflac* drflac_open_with_metadata_private(drflac_read_proc onRead, drflac_seek_p // 2) A block of memory large enough to store the decoded samples of the largest frame in the stream // 3) If the container is Ogg, a drflac_oggbs object // - // The complicated part of the allocation is making sure there's enough room the decoded samples, taking into consideration - // the different SIMD instruction sets. + // The complicated part of the allocation is making sure there's enough room the decoded samples, taking + // into consideration the different SIMD instruction sets. drflac_uint32 allocationSize = sizeof(drflac); - // The allocation size for decoded frames depends on the number of 32-bit integers that fit inside the largest SIMD vector - // we are supporting. + // The allocation size for decoded frames depends on the number of 32-bit integers that fit inside the + // largest SIMD vector we are supporting. drflac_uint32 wholeSIMDVectorCountPerChannel; - if ((init.maxBlockSize % (DRFLAC_MAX_SIMD_VECTOR_SIZE / sizeof(drflac_int32))) == 0) { - wholeSIMDVectorCountPerChannel = (init.maxBlockSize / (DRFLAC_MAX_SIMD_VECTOR_SIZE / sizeof(drflac_int32))); - } else { - wholeSIMDVectorCountPerChannel = (init.maxBlockSize / (DRFLAC_MAX_SIMD_VECTOR_SIZE / sizeof(drflac_int32))) + 1; + if ((init.maxBlockSize % (DRFLAC_MAX_SIMD_VECTOR_SIZE / sizeof(drflac_int32))) == 0) + { + wholeSIMDVectorCountPerChannel = + (init.maxBlockSize / (DRFLAC_MAX_SIMD_VECTOR_SIZE / sizeof(drflac_int32))); + } + else + { + wholeSIMDVectorCountPerChannel = + (init.maxBlockSize / (DRFLAC_MAX_SIMD_VECTOR_SIZE / sizeof(drflac_int32))) + 1; } - drflac_uint32 decodedSamplesAllocationSize = wholeSIMDVectorCountPerChannel * DRFLAC_MAX_SIMD_VECTOR_SIZE * init.channels; + drflac_uint32 decodedSamplesAllocationSize = + wholeSIMDVectorCountPerChannel * DRFLAC_MAX_SIMD_VECTOR_SIZE * init.channels; allocationSize += decodedSamplesAllocationSize; - allocationSize += DRFLAC_MAX_SIMD_VECTOR_SIZE; // Allocate extra bytes to ensure we have enough for alignment. + allocationSize += + DRFLAC_MAX_SIMD_VECTOR_SIZE; // Allocate extra bytes to ensure we have enough for alignment. #ifndef DR_FLAC_NO_OGG // There's additional data required for Ogg streams. drflac_uint32 oggbsAllocationSize = 0; - if (init.container == drflac_container_ogg) { + if (init.container == drflac_container_ogg) + { oggbsAllocationSize = sizeof(drflac_oggbs); allocationSize += oggbsAllocationSize; } drflac_oggbs oggbs; drflac_zero_memory(&oggbs, sizeof(oggbs)); - if (init.container == drflac_container_ogg) { - oggbs.onRead = onRead; - oggbs.onSeek = onSeek; - oggbs.pUserData = pUserData; - oggbs.currentBytePos = init.oggFirstBytePos; - oggbs.firstBytePos = init.oggFirstBytePos; - oggbs.serialNumber = init.oggSerial; - oggbs.bosPageHeader = init.oggBosHeader; + if (init.container == drflac_container_ogg) + { + oggbs.onRead = onRead; + oggbs.onSeek = onSeek; + oggbs.pUserData = pUserData; + oggbs.currentBytePos = init.oggFirstBytePos; + oggbs.firstBytePos = init.oggFirstBytePos; + oggbs.serialNumber = init.oggSerial; + oggbs.bosPageHeader = init.oggBosHeader; oggbs.bytesRemainingInPage = 0; } #endif - // This part is a bit awkward. We need to load the seektable so that it can be referenced in-memory, but I want the drflac object to - // consist of only a single heap allocation. To this, the size of the seek table needs to be known, which we determine when reading - // and decoding the metadata. - drflac_uint64 firstFramePos = 42; // <-- We know we are at byte 42 at this point. + // This part is a bit awkward. We need to load the seektable so that it can be referenced in-memory, but I + // want the drflac object to consist of only a single heap allocation. To this, the size of the seek table + // needs to be known, which we determine when reading and decoding the metadata. + drflac_uint64 firstFramePos = 42; // <-- We know we are at byte 42 at this point. drflac_uint64 seektablePos = 0; drflac_uint32 seektableSize = 0; - if (init.hasMetadataBlocks) { + if (init.hasMetadataBlocks) + { drflac_read_proc onReadOverride = onRead; drflac_seek_proc onSeekOverride = onSeek; - void* pUserDataOverride = pUserData; + void* pUserDataOverride = pUserData; #ifndef DR_FLAC_NO_OGG - if (init.container == drflac_container_ogg) { - onReadOverride = drflac__on_read_ogg; - onSeekOverride = drflac__on_seek_ogg; + if (init.container == drflac_container_ogg) + { + onReadOverride = drflac__on_read_ogg; + onSeekOverride = drflac__on_seek_ogg; pUserDataOverride = (void*)&oggbs; } #endif - if (!drflac__read_and_decode_metadata(onReadOverride, onSeekOverride, onMeta, pUserDataOverride, pUserDataMD, &firstFramePos, &seektablePos, &seektableSize)) { + if (!drflac__read_and_decode_metadata(onReadOverride, onSeekOverride, onMeta, pUserDataOverride, + pUserDataMD, &firstFramePos, &seektablePos, &seektableSize)) + { return NULL; } allocationSize += seektableSize; } - drflac* pFlac = (drflac*)DRFLAC_MALLOC(allocationSize); drflac__init_from_info(pFlac, &init); - pFlac->pDecodedSamples = (drflac_int32*)drflac_align((size_t)pFlac->pExtraData, DRFLAC_MAX_SIMD_VECTOR_SIZE); + pFlac->pDecodedSamples = + (drflac_int32*)drflac_align((size_t)pFlac->pExtraData, DRFLAC_MAX_SIMD_VECTOR_SIZE); #ifndef DR_FLAC_NO_OGG - if (init.container == drflac_container_ogg) { - drflac_oggbs* pInternalOggbs = (drflac_oggbs*)((drflac_uint8*)pFlac->pDecodedSamples + decodedSamplesAllocationSize + seektableSize); - *pInternalOggbs = oggbs; + if (init.container == drflac_container_ogg) + { + drflac_oggbs* pInternalOggbs = (drflac_oggbs*)((drflac_uint8*)pFlac->pDecodedSamples + + decodedSamplesAllocationSize + seektableSize); + *pInternalOggbs = oggbs; // The Ogg bistream needs to be layered on top of the original bitstream. - pFlac->bs.onRead = drflac__on_read_ogg; - pFlac->bs.onSeek = drflac__on_seek_ogg; + pFlac->bs.onRead = drflac__on_read_ogg; + pFlac->bs.onSeek = drflac__on_seek_ogg; pFlac->bs.pUserData = (void*)pInternalOggbs; - pFlac->_oggbs = (void*)pInternalOggbs; + pFlac->_oggbs = (void*)pInternalOggbs; } #endif pFlac->firstFramePos = firstFramePos; - // NOTE: Seektables are not currently compatible with Ogg encapsulation (Ogg has its own accelerated seeking system). I may change this later, so I'm leaving this here for now. + // NOTE: Seektables are not currently compatible with Ogg encapsulation (Ogg has its own accelerated + // seeking system). I may change this later, so I'm leaving this here for now. #ifndef DR_FLAC_NO_OGG if (init.container == drflac_container_ogg) { - pFlac->pSeekpoints = NULL; + pFlac->pSeekpoints = NULL; pFlac->seekpointCount = 0; } else #endif { - // If we have a seektable we need to load it now, making sure we move back to where we were previously. - if (seektablePos != 0) { + // If we have a seektable we need to load it now, making sure we move back to where we were + // previously. + if (seektablePos != 0) + { pFlac->seekpointCount = seektableSize / sizeof(*pFlac->pSeekpoints); - pFlac->pSeekpoints = (drflac_seekpoint*)((drflac_uint8*)pFlac->pDecodedSamples + decodedSamplesAllocationSize); + pFlac->pSeekpoints = + (drflac_seekpoint*)((drflac_uint8*)pFlac->pDecodedSamples + decodedSamplesAllocationSize); // Seek to the seektable, then just read directly into our seektable buffer. - if (pFlac->bs.onSeek(pFlac->bs.pUserData, (int)seektablePos, drflac_seek_origin_start)) { - if (pFlac->bs.onRead(pFlac->bs.pUserData, pFlac->pSeekpoints, seektableSize) == seektableSize) { + if (pFlac->bs.onSeek(pFlac->bs.pUserData, (int)seektablePos, drflac_seek_origin_start)) + { + if (pFlac->bs.onRead(pFlac->bs.pUserData, pFlac->pSeekpoints, seektableSize) == seektableSize) + { // Endian swap. - for (drflac_uint32 iSeekpoint = 0; iSeekpoint < pFlac->seekpointCount; ++iSeekpoint) { - pFlac->pSeekpoints[iSeekpoint].firstSample = drflac__be2host_64(pFlac->pSeekpoints[iSeekpoint].firstSample); - pFlac->pSeekpoints[iSeekpoint].frameOffset = drflac__be2host_64(pFlac->pSeekpoints[iSeekpoint].frameOffset); - pFlac->pSeekpoints[iSeekpoint].sampleCount = drflac__be2host_16(pFlac->pSeekpoints[iSeekpoint].sampleCount); + for (drflac_uint32 iSeekpoint = 0; iSeekpoint < pFlac->seekpointCount; ++iSeekpoint) + { + pFlac->pSeekpoints[iSeekpoint].firstSample = + drflac__be2host_64(pFlac->pSeekpoints[iSeekpoint].firstSample); + pFlac->pSeekpoints[iSeekpoint].frameOffset = + drflac__be2host_64(pFlac->pSeekpoints[iSeekpoint].frameOffset); + pFlac->pSeekpoints[iSeekpoint].sampleCount = + drflac__be2host_16(pFlac->pSeekpoints[iSeekpoint].sampleCount); } - } else { + } + else + { // Failed to read the seektable. Pretend we don't have one. - pFlac->pSeekpoints = NULL; + pFlac->pSeekpoints = NULL; pFlac->seekpointCount = 0; } // We need to seek back to where we were. If this fails it's a critical error. - if (!pFlac->bs.onSeek(pFlac->bs.pUserData, (int)pFlac->firstFramePos, drflac_seek_origin_start)) { + if (!pFlac->bs.onSeek(pFlac->bs.pUserData, (int)pFlac->firstFramePos, + drflac_seek_origin_start)) + { DRFLAC_FREE(pFlac); return NULL; } - } else { - // Failed to seek to the seektable. Ominous sign, but for now we can just pretend we don't have one. - pFlac->pSeekpoints = NULL; + } + else + { + // Failed to seek to the seektable. Ominous sign, but for now we can just pretend we don't + // have one. + pFlac->pSeekpoints = NULL; pFlac->seekpointCount = 0; } } } - - - // If we get here, but don't have a STREAMINFO block, it means we've opened the stream in relaxed mode and need to decode - // the first frame. - if (!init.hasStreamInfoBlock) { + // If we get here, but don't have a STREAMINFO block, it means we've opened the stream in relaxed mode and + // need to decode the first frame. + if (!init.hasStreamInfoBlock) + { pFlac->currentFrame.header = init.firstFrameHeader; do { drflac_result result = drflac__decode_frame(pFlac); - if (result == DRFLAC_SUCCESS) { + if (result == DRFLAC_SUCCESS) + { break; - } else { - if (result == DRFLAC_CRC_MISMATCH) { - if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, &pFlac->currentFrame.header)) { + } + else + { + if (result == DRFLAC_CRC_MISMATCH) + { + if (!drflac__read_next_frame_header(&pFlac->bs, pFlac->bitsPerSample, + &pFlac->currentFrame.header)) + { DRFLAC_FREE(pFlac); return NULL; } continue; - } else { + } + else + { DRFLAC_FREE(pFlac); return NULL; } @@ -5172,8 +6076,6 @@ drflac* drflac_open_with_metadata_private(drflac_read_proc onRead, drflac_seek_p return pFlac; } - - #ifndef DR_FLAC_NO_STDIO #include <stdio.h> @@ -5184,7 +6086,7 @@ static size_t drflac__on_read_stdio(void* pUserData, void* bufferOut, size_t byt static drflac_bool32 drflac__on_seek_stdio(void* pUserData, int offset, drflac_seek_origin origin) { - drflac_assert(offset >= 0); // <-- Never seek backwards. + drflac_assert(offset >= 0); // <-- Never seek backwards. return fseek((FILE*)pUserData, offset, (origin == drflac_seek_origin_current) ? SEEK_CUR : SEEK_SET) == 0; } @@ -5193,12 +6095,14 @@ static FILE* drflac__fopen(const char* filename) { FILE* pFile; #ifdef _MSC_VER - if (fopen_s(&pFile, filename, "rb") != 0) { + if (fopen_s(&pFile, filename, "rb") != 0) + { return NULL; } #else pFile = fopen(filename, "rb"); - if (pFile == NULL) { + if (pFile == NULL) + { return NULL; } #endif @@ -5206,16 +6110,17 @@ static FILE* drflac__fopen(const char* filename) return pFile; } - drflac* drflac_open_file(const char* filename) { FILE* file = drflac__fopen(filename); - if (file == NULL) { + if (file == NULL) + { return NULL; } drflac* pFlac = drflac_open(drflac__on_read_stdio, drflac__on_seek_stdio, (void*)file); - if (pFlac == NULL) { + if (pFlac == NULL) + { fclose(file); return NULL; } @@ -5226,19 +6131,22 @@ drflac* drflac_open_file(const char* filename) drflac* drflac_open_file_with_metadata(const char* filename, drflac_meta_proc onMeta, void* pUserData) { FILE* file = drflac__fopen(filename); - if (file == NULL) { + if (file == NULL) + { return NULL; } - drflac* pFlac = drflac_open_with_metadata_private(drflac__on_read_stdio, drflac__on_seek_stdio, onMeta, drflac_container_unknown, (void*)file, pUserData); - if (pFlac == NULL) { + drflac* pFlac = drflac_open_with_metadata_private(drflac__on_read_stdio, drflac__on_seek_stdio, onMeta, + drflac_container_unknown, (void*)file, pUserData); + if (pFlac == NULL) + { fclose(file); return pFlac; } return pFlac; } -#endif //DR_FLAC_NO_STDIO +#endif // DR_FLAC_NO_STDIO static size_t drflac__on_read_memory(void* pUserData, void* bufferOut, size_t bytesToRead) { @@ -5247,11 +6155,13 @@ static size_t drflac__on_read_memory(void* pUserData, void* bufferOut, size_t by drflac_assert(memoryStream->dataSize >= memoryStream->currentReadPos); size_t bytesRemaining = memoryStream->dataSize - memoryStream->currentReadPos; - if (bytesToRead > bytesRemaining) { + if (bytesToRead > bytesRemaining) + { bytesToRead = bytesRemaining; } - if (bytesToRead > 0) { + if (bytesToRead > 0) + { drflac_copy_memory(bufferOut, memoryStream->data + memoryStream->currentReadPos, bytesToRead); memoryStream->currentReadPos += bytesToRead; } @@ -5265,21 +6175,31 @@ static drflac_bool32 drflac__on_seek_memory(void* pUserData, int offset, drflac_ drflac_assert(memoryStream != NULL); drflac_assert(offset >= 0); // <-- Never seek backwards. - if (offset > (drflac_int64)memoryStream->dataSize) { + if (offset > (drflac_int64)memoryStream->dataSize) + { return DRFLAC_FALSE; } - if (origin == drflac_seek_origin_current) { - if (memoryStream->currentReadPos + offset <= memoryStream->dataSize) { + if (origin == drflac_seek_origin_current) + { + if (memoryStream->currentReadPos + offset <= memoryStream->dataSize) + { memoryStream->currentReadPos += offset; - } else { - return DRFLAC_FALSE; // Trying to seek too far forward. } - } else { - if ((drflac_uint32)offset <= memoryStream->dataSize) { + else + { + return DRFLAC_FALSE; // Trying to seek too far forward. + } + } + else + { + if ((drflac_uint32)offset <= memoryStream->dataSize) + { memoryStream->currentReadPos = offset; - } else { - return DRFLAC_FALSE; // Trying to seek too far forward. + } + else + { + return DRFLAC_FALSE; // Trying to seek too far forward. } } @@ -5289,11 +6209,12 @@ static drflac_bool32 drflac__on_seek_memory(void* pUserData, int offset, drflac_ drflac* drflac_open_memory(const void* data, size_t dataSize) { drflac__memory_stream memoryStream; - memoryStream.data = (const unsigned char*)data; - memoryStream.dataSize = dataSize; + memoryStream.data = (const unsigned char*)data; + memoryStream.dataSize = dataSize; memoryStream.currentReadPos = 0; - drflac* pFlac = drflac_open(drflac__on_read_memory, drflac__on_seek_memory, &memoryStream); - if (pFlac == NULL) { + drflac* pFlac = drflac_open(drflac__on_read_memory, drflac__on_seek_memory, &memoryStream); + if (pFlac == NULL) + { return NULL; } @@ -5304,7 +6225,7 @@ drflac* drflac_open_memory(const void* data, size_t dataSize) if (pFlac->container == drflac_container_ogg) { drflac_oggbs* oggbs = (drflac_oggbs*)pFlac->_oggbs; - oggbs->pUserData = &pFlac->memoryStream; + oggbs->pUserData = &pFlac->memoryStream; } else #endif @@ -5315,14 +6236,17 @@ drflac* drflac_open_memory(const void* data, size_t dataSize) return pFlac; } -drflac* drflac_open_memory_with_metadata(const void* data, size_t dataSize, drflac_meta_proc onMeta, void* pUserData) +drflac* drflac_open_memory_with_metadata(const void* data, size_t dataSize, drflac_meta_proc onMeta, + void* pUserData) { drflac__memory_stream memoryStream; - memoryStream.data = (const unsigned char*)data; - memoryStream.dataSize = dataSize; + memoryStream.data = (const unsigned char*)data; + memoryStream.dataSize = dataSize; memoryStream.currentReadPos = 0; - drflac* pFlac = drflac_open_with_metadata_private(drflac__on_read_memory, drflac__on_seek_memory, onMeta, drflac_container_unknown, &memoryStream, pUserData); - if (pFlac == NULL) { + drflac* pFlac = drflac_open_with_metadata_private(drflac__on_read_memory, drflac__on_seek_memory, onMeta, + drflac_container_unknown, &memoryStream, pUserData); + if (pFlac == NULL) + { return NULL; } @@ -5333,7 +6257,7 @@ drflac* drflac_open_memory_with_metadata(const void* data, size_t dataSize, drfl if (pFlac->container == drflac_container_ogg) { drflac_oggbs* oggbs = (drflac_oggbs*)pFlac->_oggbs; - oggbs->pUserData = &pFlac->memoryStream; + oggbs->pUserData = &pFlac->memoryStream; } else #endif @@ -5344,45 +6268,53 @@ drflac* drflac_open_memory_with_metadata(const void* data, size_t dataSize, drfl return pFlac; } - - drflac* drflac_open(drflac_read_proc onRead, drflac_seek_proc onSeek, void* pUserData) { - return drflac_open_with_metadata_private(onRead, onSeek, NULL, drflac_container_unknown, pUserData, pUserData); + return drflac_open_with_metadata_private(onRead, onSeek, NULL, drflac_container_unknown, pUserData, + pUserData); } -drflac* drflac_open_relaxed(drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_container container, void* pUserData) +drflac* drflac_open_relaxed(drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_container container, + void* pUserData) { return drflac_open_with_metadata_private(onRead, onSeek, NULL, container, pUserData, pUserData); } -drflac* drflac_open_with_metadata(drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_meta_proc onMeta, void* pUserData) +drflac* drflac_open_with_metadata(drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_meta_proc onMeta, + void* pUserData) { - return drflac_open_with_metadata_private(onRead, onSeek, onMeta, drflac_container_unknown, pUserData, pUserData); + return drflac_open_with_metadata_private(onRead, onSeek, onMeta, drflac_container_unknown, pUserData, + pUserData); } -drflac* drflac_open_with_metadata_relaxed(drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_meta_proc onMeta, drflac_container container, void* pUserData) +drflac* drflac_open_with_metadata_relaxed(drflac_read_proc onRead, drflac_seek_proc onSeek, + drflac_meta_proc onMeta, drflac_container container, + void* pUserData) { return drflac_open_with_metadata_private(onRead, onSeek, onMeta, container, pUserData, pUserData); } void drflac_close(drflac* pFlac) { - if (pFlac == NULL) { + if (pFlac == NULL) + { return; } #ifndef DR_FLAC_NO_STDIO - // If we opened the file with drflac_open_file() we will want to close the file handle. We can know whether or not drflac_open_file() - // was used by looking at the callbacks. - if (pFlac->bs.onRead == drflac__on_read_stdio) { + // If we opened the file with drflac_open_file() we will want to close the file handle. We can know + // whether or not drflac_open_file() was used by looking at the callbacks. + if (pFlac->bs.onRead == drflac__on_read_stdio) + { fclose((FILE*)pFlac->bs.pUserData); } #ifndef DR_FLAC_NO_OGG // Need to clean up Ogg streams a bit differently due to the way the bit streaming is chained. - if (pFlac->container == drflac_container_ogg) { + if (pFlac->container == drflac_container_ogg) + { drflac_assert(pFlac->bs.onRead == drflac__on_read_ogg); drflac_oggbs* oggbs = (drflac_oggbs*)pFlac->_oggbs; - if (oggbs->onRead == drflac__on_read_stdio) { + if (oggbs->onRead == drflac__on_read_stdio) + { fclose((FILE*)oggbs->pUserData); } } @@ -5392,78 +6324,107 @@ void drflac_close(drflac* pFlac) DRFLAC_FREE(pFlac); } -drflac_uint64 drflac__read_s32__misaligned(drflac* pFlac, drflac_uint64 samplesToRead, drflac_int32* bufferOut) +drflac_uint64 drflac__read_s32__misaligned(drflac* pFlac, drflac_uint64 samplesToRead, + drflac_int32* bufferOut) { - unsigned int channelCount = drflac__get_channel_count_from_channel_assignment(pFlac->currentFrame.header.channelAssignment); + unsigned int channelCount = + drflac__get_channel_count_from_channel_assignment(pFlac->currentFrame.header.channelAssignment); // We should never be calling this when the number of samples to read is >= the sample count. drflac_assert(samplesToRead < channelCount); - drflac_assert(pFlac->currentFrame.samplesRemaining > 0 && samplesToRead <= pFlac->currentFrame.samplesRemaining); - + drflac_assert(pFlac->currentFrame.samplesRemaining > 0 && + samplesToRead <= pFlac->currentFrame.samplesRemaining); drflac_uint64 samplesRead = 0; - while (samplesToRead > 0) { - drflac_uint64 totalSamplesInFrame = pFlac->currentFrame.header.blockSize * channelCount; + while (samplesToRead > 0) + { + drflac_uint64 totalSamplesInFrame = pFlac->currentFrame.header.blockSize * channelCount; drflac_uint64 samplesReadFromFrameSoFar = totalSamplesInFrame - pFlac->currentFrame.samplesRemaining; - drflac_uint64 channelIndex = samplesReadFromFrameSoFar % channelCount; + drflac_uint64 channelIndex = samplesReadFromFrameSoFar % channelCount; drflac_uint64 nextSampleInFrame = samplesReadFromFrameSoFar / channelCount; int decodedSample = 0; switch (pFlac->currentFrame.header.channelAssignment) { - case DRFLAC_CHANNEL_ASSIGNMENT_LEFT_SIDE: + case DRFLAC_CHANNEL_ASSIGNMENT_LEFT_SIDE: + { + if (channelIndex == 0) { - if (channelIndex == 0) { - decodedSample = pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; - } else { - int side = pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; - int left = pFlac->currentFrame.subframes[channelIndex - 1].pDecodedSamples[nextSampleInFrame] << pFlac->currentFrame.subframes[channelIndex - 1].wastedBitsPerSample; - decodedSample = left - side; - } - } break; + decodedSample = + pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] + << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; + } + else + { + int side = pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] + << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; + int left = pFlac->currentFrame.subframes[channelIndex - 1].pDecodedSamples[nextSampleInFrame] + << pFlac->currentFrame.subframes[channelIndex - 1].wastedBitsPerSample; + decodedSample = left - side; + } + } + break; - case DRFLAC_CHANNEL_ASSIGNMENT_RIGHT_SIDE: + case DRFLAC_CHANNEL_ASSIGNMENT_RIGHT_SIDE: + { + if (channelIndex == 0) { - if (channelIndex == 0) { - int side = pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; - int right = pFlac->currentFrame.subframes[channelIndex + 1].pDecodedSamples[nextSampleInFrame] << pFlac->currentFrame.subframes[channelIndex + 1].wastedBitsPerSample; - decodedSample = side + right; - } else { - decodedSample = pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; - } - } break; + int side = pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] + << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; + int right = pFlac->currentFrame.subframes[channelIndex + 1].pDecodedSamples[nextSampleInFrame] + << pFlac->currentFrame.subframes[channelIndex + 1].wastedBitsPerSample; + decodedSample = side + right; + } + else + { + decodedSample = + pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] + << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; + } + } + break; - case DRFLAC_CHANNEL_ASSIGNMENT_MID_SIDE: + case DRFLAC_CHANNEL_ASSIGNMENT_MID_SIDE: + { + int mid; + int side; + if (channelIndex == 0) { - int mid; - int side; - if (channelIndex == 0) { - mid = pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; - side = pFlac->currentFrame.subframes[channelIndex + 1].pDecodedSamples[nextSampleInFrame] << pFlac->currentFrame.subframes[channelIndex + 1].wastedBitsPerSample; - - mid = (((unsigned int)mid) << 1) | (side & 0x01); - decodedSample = (mid + side) >> 1; - } else { - mid = pFlac->currentFrame.subframes[channelIndex - 1].pDecodedSamples[nextSampleInFrame] << pFlac->currentFrame.subframes[channelIndex - 1].wastedBitsPerSample; - side = pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; - - mid = (((unsigned int)mid) << 1) | (side & 0x01); - decodedSample = (mid - side) >> 1; - } - } break; + mid = pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] + << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; + side = pFlac->currentFrame.subframes[channelIndex + 1].pDecodedSamples[nextSampleInFrame] + << pFlac->currentFrame.subframes[channelIndex + 1].wastedBitsPerSample; - case DRFLAC_CHANNEL_ASSIGNMENT_INDEPENDENT: - default: + mid = (((unsigned int)mid) << 1) | (side & 0x01); + decodedSample = (mid + side) >> 1; + } + else { - decodedSample = pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; - } break; + mid = pFlac->currentFrame.subframes[channelIndex - 1].pDecodedSamples[nextSampleInFrame] + << pFlac->currentFrame.subframes[channelIndex - 1].wastedBitsPerSample; + side = pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] + << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; + + mid = (((unsigned int)mid) << 1) | (side & 0x01); + decodedSample = (mid - side) >> 1; + } } + break; + case DRFLAC_CHANNEL_ASSIGNMENT_INDEPENDENT: + default: + { + decodedSample = pFlac->currentFrame.subframes[channelIndex + 0].pDecodedSamples[nextSampleInFrame] + << pFlac->currentFrame.subframes[channelIndex + 0].wastedBitsPerSample; + } + break; + } decodedSample <<= (32 - pFlac->bitsPerSample); - if (bufferOut) { + if (bufferOut) + { *bufferOut++ = decodedSample; } @@ -5478,18 +6439,27 @@ drflac_uint64 drflac__read_s32__misaligned(drflac* pFlac, drflac_uint64 samplesT drflac_uint64 drflac__seek_forward_by_samples(drflac* pFlac, drflac_uint64 samplesToRead) { drflac_uint64 samplesRead = 0; - while (samplesToRead > 0) { - if (pFlac->currentFrame.samplesRemaining == 0) { - if (!drflac__read_and_decode_next_frame(pFlac)) { - break; // Couldn't read the next frame, so just break from the loop and return. + while (samplesToRead > 0) + { + if (pFlac->currentFrame.samplesRemaining == 0) + { + if (!drflac__read_and_decode_next_frame(pFlac)) + { + break; // Couldn't read the next frame, so just break from the loop and return. } - } else { - if (pFlac->currentFrame.samplesRemaining > samplesToRead) { - samplesRead += samplesToRead; - pFlac->currentFrame.samplesRemaining -= (drflac_uint32)samplesToRead; // <-- Safe cast. Will always be < currentFrame.samplesRemaining < 65536. - samplesToRead = 0; - } else { - samplesRead += pFlac->currentFrame.samplesRemaining; + } + else + { + if (pFlac->currentFrame.samplesRemaining > samplesToRead) + { + samplesRead += samplesToRead; + pFlac->currentFrame.samplesRemaining -= (drflac_uint32) + samplesToRead; // <-- Safe cast. Will always be < currentFrame.samplesRemaining < 65536. + samplesToRead = 0; + } + else + { + samplesRead += pFlac->currentFrame.samplesRemaining; samplesToRead -= pFlac->currentFrame.samplesRemaining; pFlac->currentFrame.samplesRemaining = 0; } @@ -5503,145 +6473,189 @@ drflac_uint64 drflac__seek_forward_by_samples(drflac* pFlac, drflac_uint64 sampl drflac_uint64 drflac_read_s32(drflac* pFlac, drflac_uint64 samplesToRead, drflac_int32* bufferOut) { // Note that <bufferOut> is allowed to be null, in which case this will act like a seek. - if (pFlac == NULL || samplesToRead == 0) { + if (pFlac == NULL || samplesToRead == 0) + { return 0; } - if (bufferOut == NULL) { + if (bufferOut == NULL) + { return drflac__seek_forward_by_samples(pFlac, samplesToRead); } - drflac_uint64 samplesRead = 0; - while (samplesToRead > 0) { + while (samplesToRead > 0) + { // If we've run out of samples in this frame, go to the next. - if (pFlac->currentFrame.samplesRemaining == 0) { - if (!drflac__read_and_decode_next_frame(pFlac)) { - break; // Couldn't read the next frame, so just break from the loop and return. + if (pFlac->currentFrame.samplesRemaining == 0) + { + if (!drflac__read_and_decode_next_frame(pFlac)) + { + break; // Couldn't read the next frame, so just break from the loop and return. } - } else { + } + else + { // Here is where we grab the samples and interleave them. - unsigned int channelCount = drflac__get_channel_count_from_channel_assignment(pFlac->currentFrame.header.channelAssignment); + unsigned int channelCount = drflac__get_channel_count_from_channel_assignment( + pFlac->currentFrame.header.channelAssignment); drflac_uint64 totalSamplesInFrame = pFlac->currentFrame.header.blockSize * channelCount; - drflac_uint64 samplesReadFromFrameSoFar = totalSamplesInFrame - pFlac->currentFrame.samplesRemaining; + drflac_uint64 samplesReadFromFrameSoFar = + totalSamplesInFrame - pFlac->currentFrame.samplesRemaining; drflac_uint64 misalignedSampleCount = samplesReadFromFrameSoFar % channelCount; - if (misalignedSampleCount > 0) { - drflac_uint64 misalignedSamplesRead = drflac__read_s32__misaligned(pFlac, misalignedSampleCount, bufferOut); - samplesRead += misalignedSamplesRead; + if (misalignedSampleCount > 0) + { + drflac_uint64 misalignedSamplesRead = + drflac__read_s32__misaligned(pFlac, misalignedSampleCount, bufferOut); + samplesRead += misalignedSamplesRead; samplesReadFromFrameSoFar += misalignedSamplesRead; - bufferOut += misalignedSamplesRead; - samplesToRead -= misalignedSamplesRead; - pFlac->currentSample += misalignedSamplesRead; + bufferOut += misalignedSamplesRead; + samplesToRead -= misalignedSamplesRead; + pFlac->currentSample += misalignedSamplesRead; } - drflac_uint64 alignedSampleCountPerChannel = samplesToRead / channelCount; - if (alignedSampleCountPerChannel > pFlac->currentFrame.samplesRemaining / channelCount) { + if (alignedSampleCountPerChannel > pFlac->currentFrame.samplesRemaining / channelCount) + { alignedSampleCountPerChannel = pFlac->currentFrame.samplesRemaining / channelCount; } drflac_uint64 firstAlignedSampleInFrame = samplesReadFromFrameSoFar / channelCount; - unsigned int unusedBitsPerSample = 32 - pFlac->bitsPerSample; + unsigned int unusedBitsPerSample = 32 - pFlac->bitsPerSample; switch (pFlac->currentFrame.header.channelAssignment) { - case DRFLAC_CHANNEL_ASSIGNMENT_LEFT_SIDE: - { - const drflac_int32* pDecodedSamples0 = pFlac->currentFrame.subframes[0].pDecodedSamples + firstAlignedSampleInFrame; - const drflac_int32* pDecodedSamples1 = pFlac->currentFrame.subframes[1].pDecodedSamples + firstAlignedSampleInFrame; + case DRFLAC_CHANNEL_ASSIGNMENT_LEFT_SIDE: + { + const drflac_int32* pDecodedSamples0 = + pFlac->currentFrame.subframes[0].pDecodedSamples + firstAlignedSampleInFrame; + const drflac_int32* pDecodedSamples1 = + pFlac->currentFrame.subframes[1].pDecodedSamples + firstAlignedSampleInFrame; - for (drflac_uint64 i = 0; i < alignedSampleCountPerChannel; ++i) { - int left = pDecodedSamples0[i] << (unusedBitsPerSample + pFlac->currentFrame.subframes[0].wastedBitsPerSample); - int side = pDecodedSamples1[i] << (unusedBitsPerSample + pFlac->currentFrame.subframes[1].wastedBitsPerSample); - int right = left - side; + for (drflac_uint64 i = 0; i < alignedSampleCountPerChannel; ++i) + { + int left = pDecodedSamples0[i] << (unusedBitsPerSample + + pFlac->currentFrame.subframes[0].wastedBitsPerSample); + int side = pDecodedSamples1[i] << (unusedBitsPerSample + + pFlac->currentFrame.subframes[1].wastedBitsPerSample); + int right = left - side; + + bufferOut[i * 2 + 0] = left; + bufferOut[i * 2 + 1] = right; + } + } + break; - bufferOut[i*2+0] = left; - bufferOut[i*2+1] = right; - } - } break; + case DRFLAC_CHANNEL_ASSIGNMENT_RIGHT_SIDE: + { + const drflac_int32* pDecodedSamples0 = + pFlac->currentFrame.subframes[0].pDecodedSamples + firstAlignedSampleInFrame; + const drflac_int32* pDecodedSamples1 = + pFlac->currentFrame.subframes[1].pDecodedSamples + firstAlignedSampleInFrame; - case DRFLAC_CHANNEL_ASSIGNMENT_RIGHT_SIDE: + for (drflac_uint64 i = 0; i < alignedSampleCountPerChannel; ++i) { - const drflac_int32* pDecodedSamples0 = pFlac->currentFrame.subframes[0].pDecodedSamples + firstAlignedSampleInFrame; - const drflac_int32* pDecodedSamples1 = pFlac->currentFrame.subframes[1].pDecodedSamples + firstAlignedSampleInFrame; - - for (drflac_uint64 i = 0; i < alignedSampleCountPerChannel; ++i) { - int side = pDecodedSamples0[i] << (unusedBitsPerSample + pFlac->currentFrame.subframes[0].wastedBitsPerSample); - int right = pDecodedSamples1[i] << (unusedBitsPerSample + pFlac->currentFrame.subframes[1].wastedBitsPerSample); - int left = right + side; + int side = pDecodedSamples0[i] << (unusedBitsPerSample + + pFlac->currentFrame.subframes[0].wastedBitsPerSample); + int right = pDecodedSamples1[i] << (unusedBitsPerSample + + pFlac->currentFrame.subframes[1].wastedBitsPerSample); + int left = right + side; + + bufferOut[i * 2 + 0] = left; + bufferOut[i * 2 + 1] = right; + } + } + break; - bufferOut[i*2+0] = left; - bufferOut[i*2+1] = right; - } - } break; + case DRFLAC_CHANNEL_ASSIGNMENT_MID_SIDE: + { + const drflac_int32* pDecodedSamples0 = + pFlac->currentFrame.subframes[0].pDecodedSamples + firstAlignedSampleInFrame; + const drflac_int32* pDecodedSamples1 = + pFlac->currentFrame.subframes[1].pDecodedSamples + firstAlignedSampleInFrame; - case DRFLAC_CHANNEL_ASSIGNMENT_MID_SIDE: + for (drflac_uint64 i = 0; i < alignedSampleCountPerChannel; ++i) { - const drflac_int32* pDecodedSamples0 = pFlac->currentFrame.subframes[0].pDecodedSamples + firstAlignedSampleInFrame; - const drflac_int32* pDecodedSamples1 = pFlac->currentFrame.subframes[1].pDecodedSamples + firstAlignedSampleInFrame; + int mid = pDecodedSamples0[i] << pFlac->currentFrame.subframes[0].wastedBitsPerSample; + int side = pDecodedSamples1[i] << pFlac->currentFrame.subframes[1].wastedBitsPerSample; - for (drflac_uint64 i = 0; i < alignedSampleCountPerChannel; ++i) { - int mid = pDecodedSamples0[i] << pFlac->currentFrame.subframes[0].wastedBitsPerSample; - int side = pDecodedSamples1[i] << pFlac->currentFrame.subframes[1].wastedBitsPerSample; - - mid = (((drflac_uint32)mid) << 1) | (side & 0x01); + mid = (((drflac_uint32)mid) << 1) | (side & 0x01); - bufferOut[i*2+0] = ((mid + side) >> 1) << (unusedBitsPerSample); - bufferOut[i*2+1] = ((mid - side) >> 1) << (unusedBitsPerSample); - } - } break; + bufferOut[i * 2 + 0] = ((mid + side) >> 1) << (unusedBitsPerSample); + bufferOut[i * 2 + 1] = ((mid - side) >> 1) << (unusedBitsPerSample); + } + } + break; - case DRFLAC_CHANNEL_ASSIGNMENT_INDEPENDENT: - default: + case DRFLAC_CHANNEL_ASSIGNMENT_INDEPENDENT: + default: + { + if (pFlac->currentFrame.header.channelAssignment == 1) // 1 = Stereo { - if (pFlac->currentFrame.header.channelAssignment == 1) // 1 = Stereo - { - // Stereo optimized inner loop unroll. - const drflac_int32* pDecodedSamples0 = pFlac->currentFrame.subframes[0].pDecodedSamples + firstAlignedSampleInFrame; - const drflac_int32* pDecodedSamples1 = pFlac->currentFrame.subframes[1].pDecodedSamples + firstAlignedSampleInFrame; + // Stereo optimized inner loop unroll. + const drflac_int32* pDecodedSamples0 = + pFlac->currentFrame.subframes[0].pDecodedSamples + firstAlignedSampleInFrame; + const drflac_int32* pDecodedSamples1 = + pFlac->currentFrame.subframes[1].pDecodedSamples + firstAlignedSampleInFrame; - for (drflac_uint64 i = 0; i < alignedSampleCountPerChannel; ++i) { - bufferOut[i*2+0] = pDecodedSamples0[i] << (unusedBitsPerSample + pFlac->currentFrame.subframes[0].wastedBitsPerSample); - bufferOut[i*2+1] = pDecodedSamples1[i] << (unusedBitsPerSample + pFlac->currentFrame.subframes[1].wastedBitsPerSample); - } + for (drflac_uint64 i = 0; i < alignedSampleCountPerChannel; ++i) + { + bufferOut[i * 2 + 0] = + pDecodedSamples0[i] + << (unusedBitsPerSample + pFlac->currentFrame.subframes[0].wastedBitsPerSample); + bufferOut[i * 2 + 1] = + pDecodedSamples1[i] + << (unusedBitsPerSample + pFlac->currentFrame.subframes[1].wastedBitsPerSample); } - else + } + else + { + // Generic interleaving. + for (drflac_uint64 i = 0; i < alignedSampleCountPerChannel; ++i) { - // Generic interleaving. - for (drflac_uint64 i = 0; i < alignedSampleCountPerChannel; ++i) { - for (unsigned int j = 0; j < channelCount; ++j) { - bufferOut[(i*channelCount)+j] = (pFlac->currentFrame.subframes[j].pDecodedSamples[firstAlignedSampleInFrame + i]) << (unusedBitsPerSample + pFlac->currentFrame.subframes[j].wastedBitsPerSample); - } + for (unsigned int j = 0; j < channelCount; ++j) + { + bufferOut[(i * channelCount) + j] = + (pFlac->currentFrame.subframes[j] + .pDecodedSamples[firstAlignedSampleInFrame + i]) + << (unusedBitsPerSample + + pFlac->currentFrame.subframes[j].wastedBitsPerSample); } } - } break; + } + } + break; } drflac_uint64 alignedSamplesRead = alignedSampleCountPerChannel * channelCount; - samplesRead += alignedSamplesRead; + samplesRead += alignedSamplesRead; samplesReadFromFrameSoFar += alignedSamplesRead; - bufferOut += alignedSamplesRead; - samplesToRead -= alignedSamplesRead; - pFlac->currentSample += alignedSamplesRead; + bufferOut += alignedSamplesRead; + samplesToRead -= alignedSamplesRead; + pFlac->currentSample += alignedSamplesRead; pFlac->currentFrame.samplesRemaining -= (unsigned int)alignedSamplesRead; - // At this point we may still have some excess samples left to read. - if (samplesToRead > 0 && pFlac->currentFrame.samplesRemaining > 0) { + if (samplesToRead > 0 && pFlac->currentFrame.samplesRemaining > 0) + { drflac_uint64 excessSamplesRead = 0; - if (samplesToRead < pFlac->currentFrame.samplesRemaining) { + if (samplesToRead < pFlac->currentFrame.samplesRemaining) + { excessSamplesRead = drflac__read_s32__misaligned(pFlac, samplesToRead, bufferOut); - } else { - excessSamplesRead = drflac__read_s32__misaligned(pFlac, pFlac->currentFrame.samplesRemaining, bufferOut); + } + else + { + excessSamplesRead = + drflac__read_s32__misaligned(pFlac, pFlac->currentFrame.samplesRemaining, bufferOut); } - samplesRead += excessSamplesRead; + samplesRead += excessSamplesRead; samplesReadFromFrameSoFar += excessSamplesRead; - bufferOut += excessSamplesRead; - samplesToRead -= excessSamplesRead; - pFlac->currentSample += excessSamplesRead; + bufferOut += excessSamplesRead; + samplesToRead -= excessSamplesRead; + pFlac->currentSample += excessSamplesRead; } } } @@ -5654,21 +6668,25 @@ drflac_uint64 drflac_read_s16(drflac* pFlac, drflac_uint64 samplesToRead, drflac // This reads samples in 2 passes and can probably be optimized. drflac_uint64 totalSamplesRead = 0; - while (samplesToRead > 0) { + while (samplesToRead > 0) + { drflac_int32 samples32[4096]; - drflac_uint64 samplesJustRead = drflac_read_s32(pFlac, (samplesToRead > 4096) ? 4096 : samplesToRead, samples32); - if (samplesJustRead == 0) { - break; // Reached the end. + drflac_uint64 samplesJustRead = + drflac_read_s32(pFlac, (samplesToRead > 4096) ? 4096 : samplesToRead, samples32); + if (samplesJustRead == 0) + { + break; // Reached the end. } // s32 -> s16 - for (drflac_uint64 i = 0; i < samplesJustRead; ++i) { + for (drflac_uint64 i = 0; i < samplesJustRead; ++i) + { pBufferOut[i] = (drflac_int16)(samples32[i] >> 16); } totalSamplesRead += samplesJustRead; - samplesToRead -= samplesJustRead; - pBufferOut += samplesJustRead; + samplesToRead -= samplesJustRead; + pBufferOut += samplesJustRead; } return totalSamplesRead; @@ -5679,21 +6697,25 @@ drflac_uint64 drflac_read_f32(drflac* pFlac, drflac_uint64 samplesToRead, float* // This reads samples in 2 passes and can probably be optimized. drflac_uint64 totalSamplesRead = 0; - while (samplesToRead > 0) { + while (samplesToRead > 0) + { drflac_int32 samples32[4096]; - drflac_uint64 samplesJustRead = drflac_read_s32(pFlac, (samplesToRead > 4096) ? 4096 : samplesToRead, samples32); - if (samplesJustRead == 0) { - break; // Reached the end. + drflac_uint64 samplesJustRead = + drflac_read_s32(pFlac, (samplesToRead > 4096) ? 4096 : samplesToRead, samples32); + if (samplesJustRead == 0) + { + break; // Reached the end. } // s32 -> f32 - for (drflac_uint64 i = 0; i < samplesJustRead; ++i) { + for (drflac_uint64 i = 0; i < samplesJustRead; ++i) + { pBufferOut[i] = (float)(samples32[i] / 2147483648.0); } totalSamplesRead += samplesJustRead; - samplesToRead -= samplesJustRead; - pBufferOut += samplesJustRead; + samplesToRead -= samplesJustRead; + pBufferOut += samplesJustRead; } return totalSamplesRead; @@ -5701,50 +6723,65 @@ drflac_uint64 drflac_read_f32(drflac* pFlac, drflac_uint64 samplesToRead, float* drflac_bool32 drflac_seek_to_sample(drflac* pFlac, drflac_uint64 sampleIndex) { - if (pFlac == NULL) { + if (pFlac == NULL) + { return DRFLAC_FALSE; } - // If we don't know where the first frame begins then we can't seek. This will happen when the STREAMINFO block was not present - // when the decoder was opened. - if (pFlac->firstFramePos == 0) { + // If we don't know where the first frame begins then we can't seek. This will happen when the STREAMINFO + // block was not present when the decoder was opened. + if (pFlac->firstFramePos == 0) + { return DRFLAC_FALSE; } - if (sampleIndex == 0) { + if (sampleIndex == 0) + { pFlac->currentSample = 0; return drflac__seek_to_first_frame(pFlac); - } else { + } + else + { drflac_bool32 wasSuccessful = DRFLAC_FALSE; // Clamp the sample to the end. - if (sampleIndex >= pFlac->totalSampleCount) { - sampleIndex = pFlac->totalSampleCount - 1; + if (sampleIndex >= pFlac->totalSampleCount) + { + sampleIndex = pFlac->totalSampleCount - 1; } - // If the target sample and the current sample are in the same frame we just move the position forward. - if (sampleIndex > pFlac->currentSample) { + // If the target sample and the current sample are in the same frame we just move the position + // forward. + if (sampleIndex > pFlac->currentSample) + { // Forward. drflac_uint32 offset = (drflac_uint32)(sampleIndex - pFlac->currentSample); - if (pFlac->currentFrame.samplesRemaining > offset) { + if (pFlac->currentFrame.samplesRemaining > offset) + { pFlac->currentFrame.samplesRemaining -= offset; pFlac->currentSample = sampleIndex; return DRFLAC_TRUE; } - } else { + } + else + { // Backward. drflac_uint32 offsetAbs = (drflac_uint32)(pFlac->currentSample - sampleIndex); - drflac_uint32 currentFrameSampleCount = pFlac->currentFrame.header.blockSize * drflac__get_channel_count_from_channel_assignment(pFlac->currentFrame.header.channelAssignment); - drflac_uint32 currentFrameSamplesConsumed = (drflac_uint32)(currentFrameSampleCount - pFlac->currentFrame.samplesRemaining); - if (currentFrameSamplesConsumed > offsetAbs) { + drflac_uint32 currentFrameSampleCount = + pFlac->currentFrame.header.blockSize * drflac__get_channel_count_from_channel_assignment( + pFlac->currentFrame.header.channelAssignment); + drflac_uint32 currentFrameSamplesConsumed = + (drflac_uint32)(currentFrameSampleCount - pFlac->currentFrame.samplesRemaining); + if (currentFrameSamplesConsumed > offsetAbs) + { pFlac->currentFrame.samplesRemaining += offsetAbs; pFlac->currentSample = sampleIndex; return DRFLAC_TRUE; } } - // Different techniques depending on encapsulation. Using the native FLAC seektable with Ogg encapsulation is a bit awkward so - // we'll instead use Ogg's natural seeking facility. + // Different techniques depending on encapsulation. Using the native FLAC seektable with Ogg + // encapsulation is a bit awkward so we'll instead use Ogg's natural seeking facility. #ifndef DR_FLAC_NO_OGG if (pFlac->container == drflac_container_ogg) { @@ -5753,9 +6790,11 @@ drflac_bool32 drflac_seek_to_sample(drflac* pFlac, drflac_uint64 sampleIndex) else #endif { - // First try seeking via the seek table. If this fails, fall back to a brute force seek which is much slower. + // First try seeking via the seek table. If this fails, fall back to a brute force seek which is + // much slower. wasSuccessful = drflac__seek_to_sample__seek_table(pFlac, sampleIndex); - if (!wasSuccessful) { + if (!wasSuccessful) + { wasSuccessful = drflac__seek_to_sample__brute_force(pFlac, sampleIndex); } } @@ -5765,128 +6804,162 @@ drflac_bool32 drflac_seek_to_sample(drflac* pFlac, drflac_uint64 sampleIndex) } } - - //// High Level APIs //// #if defined(SIZE_MAX) - #define DRFLAC_SIZE_MAX SIZE_MAX +#define DRFLAC_SIZE_MAX SIZE_MAX #else - #if defined(DRFLAC_64BIT) - #define DRFLAC_SIZE_MAX ((drflac_uint64)0xFFFFFFFFFFFFFFFF) - #else - #define DRFLAC_SIZE_MAX 0xFFFFFFFF - #endif +#if defined(DRFLAC_64BIT) +#define DRFLAC_SIZE_MAX ((drflac_uint64)0xFFFFFFFFFFFFFFFF) +#else +#define DRFLAC_SIZE_MAX 0xFFFFFFFF +#endif #endif - // Using a macro as the definition of the drflac__full_decode_and_close_*() API family. Sue me. -#define DRFLAC_DEFINE_FULL_DECODE_AND_CLOSE(extension, type) \ -static type* drflac__full_decode_and_close_ ## extension (drflac* pFlac, unsigned int* channelsOut, unsigned int* sampleRateOut, drflac_uint64* totalSampleCountOut)\ -{ \ - drflac_assert(pFlac != NULL); \ - \ - type* pSampleData = NULL; \ - drflac_uint64 totalSampleCount = pFlac->totalSampleCount; \ - \ - if (totalSampleCount == 0) { \ - type buffer[4096]; \ - \ - size_t sampleDataBufferSize = sizeof(buffer); \ - pSampleData = (type*)DRFLAC_MALLOC(sampleDataBufferSize); \ - if (pSampleData == NULL) { \ - goto on_error; \ - } \ - \ - drflac_uint64 samplesRead; \ - while ((samplesRead = (drflac_uint64)drflac_read_##extension(pFlac, sizeof(buffer)/sizeof(buffer[0]), buffer)) > 0) { \ - if (((totalSampleCount + samplesRead) * sizeof(type)) > sampleDataBufferSize) { \ - sampleDataBufferSize *= 2; \ - type* pNewSampleData = (type*)DRFLAC_REALLOC(pSampleData, sampleDataBufferSize); \ - if (pNewSampleData == NULL) { \ - DRFLAC_FREE(pSampleData); \ - goto on_error; \ - } \ - \ - pSampleData = pNewSampleData; \ - } \ - \ - drflac_copy_memory(pSampleData + totalSampleCount, buffer, (size_t)(samplesRead*sizeof(type))); \ - totalSampleCount += samplesRead; \ - } \ - \ - /* At this point everything should be decoded, but we just want to fill the unused part buffer with silence - need to \ - protect those ears from random noise! */ \ - drflac_zero_memory(pSampleData + totalSampleCount, (size_t)(sampleDataBufferSize - totalSampleCount*sizeof(type))); \ - } else { \ - drflac_uint64 dataSize = totalSampleCount * sizeof(type); \ - if (dataSize > DRFLAC_SIZE_MAX) { \ - goto on_error; /* The decoded data is too big. */ \ - } \ - \ - pSampleData = (type*)DRFLAC_MALLOC((size_t)dataSize); /* <-- Safe cast as per the check above. */ \ - if (pSampleData == NULL) { \ - goto on_error; \ - } \ - \ - totalSampleCount = drflac_read_##extension(pFlac, pFlac->totalSampleCount, pSampleData); \ - } \ - \ - if (sampleRateOut) *sampleRateOut = pFlac->sampleRate; \ - if (channelsOut) *channelsOut = pFlac->channels; \ - if (totalSampleCountOut) *totalSampleCountOut = totalSampleCount; \ - \ - drflac_close(pFlac); \ - return pSampleData; \ - \ -on_error: \ - drflac_close(pFlac); \ - return NULL; \ -} +#define DRFLAC_DEFINE_FULL_DECODE_AND_CLOSE(extension, type) \ + static type* drflac__full_decode_and_close_##extension(drflac* pFlac, unsigned int* channelsOut, \ + unsigned int* sampleRateOut, \ + drflac_uint64* totalSampleCountOut) \ + { \ + drflac_assert(pFlac != NULL); \ + \ + type* pSampleData = NULL; \ + drflac_uint64 totalSampleCount = pFlac->totalSampleCount; \ + \ + if (totalSampleCount == 0) \ + { \ + type buffer[4096]; \ + \ + size_t sampleDataBufferSize = sizeof(buffer); \ + pSampleData = (type*)DRFLAC_MALLOC(sampleDataBufferSize); \ + if (pSampleData == NULL) \ + { \ + goto on_error; \ + } \ + \ + drflac_uint64 samplesRead; \ + while ((samplesRead = (drflac_uint64)drflac_read_##extension( \ + pFlac, sizeof(buffer) / sizeof(buffer[0]), buffer)) > 0) \ + { \ + if (((totalSampleCount + samplesRead) * sizeof(type)) > sampleDataBufferSize) \ + { \ + sampleDataBufferSize *= 2; \ + type* pNewSampleData = (type*)DRFLAC_REALLOC(pSampleData, sampleDataBufferSize); \ + if (pNewSampleData == NULL) \ + { \ + DRFLAC_FREE(pSampleData); \ + goto on_error; \ + } \ + \ + pSampleData = pNewSampleData; \ + } \ + \ + drflac_copy_memory(pSampleData + totalSampleCount, buffer, \ + (size_t)(samplesRead * sizeof(type))); \ + totalSampleCount += samplesRead; \ + } \ + \ + /* At this point everything should be decoded, but we just want to fill the unused part buffer \ + with silence - need to \ \ + protect those ears from random noise! */ \ + drflac_zero_memory(pSampleData + totalSampleCount, \ + (size_t)(sampleDataBufferSize - totalSampleCount * sizeof(type))); \ + } \ + else \ + { \ + drflac_uint64 dataSize = totalSampleCount * sizeof(type); \ + if (dataSize > DRFLAC_SIZE_MAX) \ + { \ + goto on_error; /* The decoded data is too big. */ \ + } \ + \ + pSampleData = \ + (type*)DRFLAC_MALLOC((size_t)dataSize); /* <-- Safe cast as per the check above. */ \ + if (pSampleData == NULL) \ + { \ + goto on_error; \ + } \ + \ + totalSampleCount = drflac_read_##extension(pFlac, pFlac->totalSampleCount, pSampleData); \ + } \ + \ + if (sampleRateOut) \ + *sampleRateOut = pFlac->sampleRate; \ + if (channelsOut) \ + *channelsOut = pFlac->channels; \ + if (totalSampleCountOut) \ + *totalSampleCountOut = totalSampleCount; \ + \ + drflac_close(pFlac); \ + return pSampleData; \ + \ + on_error: \ + drflac_close(pFlac); \ + return NULL; \ + } DRFLAC_DEFINE_FULL_DECODE_AND_CLOSE(s32, drflac_int32) DRFLAC_DEFINE_FULL_DECODE_AND_CLOSE(s16, drflac_int16) DRFLAC_DEFINE_FULL_DECODE_AND_CLOSE(f32, float) -drflac_int32* drflac_open_and_decode_s32(drflac_read_proc onRead, drflac_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount) +drflac_int32* drflac_open_and_decode_s32(drflac_read_proc onRead, drflac_seek_proc onSeek, void* pUserData, + unsigned int* channels, unsigned int* sampleRate, + drflac_uint64* totalSampleCount) { // Safety. - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drflac* pFlac = drflac_open(onRead, onSeek, pUserData); - if (pFlac == NULL) { + if (pFlac == NULL) + { return NULL; } return drflac__full_decode_and_close_s32(pFlac, channels, sampleRate, totalSampleCount); } -drflac_int16* drflac_open_and_decode_s16(drflac_read_proc onRead, drflac_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount) +drflac_int16* drflac_open_and_decode_s16(drflac_read_proc onRead, drflac_seek_proc onSeek, void* pUserData, + unsigned int* channels, unsigned int* sampleRate, + drflac_uint64* totalSampleCount) { // Safety. - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drflac* pFlac = drflac_open(onRead, onSeek, pUserData); - if (pFlac == NULL) { + if (pFlac == NULL) + { return NULL; } return drflac__full_decode_and_close_s16(pFlac, channels, sampleRate, totalSampleCount); } -float* drflac_open_and_decode_f32(drflac_read_proc onRead, drflac_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount) +float* drflac_open_and_decode_f32(drflac_read_proc onRead, drflac_seek_proc onSeek, void* pUserData, + unsigned int* channels, unsigned int* sampleRate, + drflac_uint64* totalSampleCount) { // Safety. - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drflac* pFlac = drflac_open(onRead, onSeek, pUserData); - if (pFlac == NULL) { + if (pFlac == NULL) + { return NULL; } @@ -5894,42 +6967,57 @@ float* drflac_open_and_decode_f32(drflac_read_proc onRead, drflac_seek_proc onSe } #ifndef DR_FLAC_NO_STDIO -drflac_int32* drflac_open_and_decode_file_s32(const char* filename, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount) +drflac_int32* drflac_open_and_decode_file_s32(const char* filename, unsigned int* channels, + unsigned int* sampleRate, drflac_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drflac* pFlac = drflac_open_file(filename); - if (pFlac == NULL) { + if (pFlac == NULL) + { return NULL; } return drflac__full_decode_and_close_s32(pFlac, channels, sampleRate, totalSampleCount); } -drflac_int16* drflac_open_and_decode_file_s16(const char* filename, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount) +drflac_int16* drflac_open_and_decode_file_s16(const char* filename, unsigned int* channels, + unsigned int* sampleRate, drflac_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drflac* pFlac = drflac_open_file(filename); - if (pFlac == NULL) { + if (pFlac == NULL) + { return NULL; } return drflac__full_decode_and_close_s16(pFlac, channels, sampleRate, totalSampleCount); } -float* drflac_open_and_decode_file_f32(const char* filename, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount) +float* drflac_open_and_decode_file_f32(const char* filename, unsigned int* channels, unsigned int* sampleRate, + drflac_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drflac* pFlac = drflac_open_file(filename); - if (pFlac == NULL) { + if (pFlac == NULL) + { return NULL; } @@ -5937,42 +7025,57 @@ float* drflac_open_and_decode_file_f32(const char* filename, unsigned int* chann } #endif -drflac_int32* drflac_open_and_decode_memory_s32(const void* data, size_t dataSize, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount) +drflac_int32* drflac_open_and_decode_memory_s32(const void* data, size_t dataSize, unsigned int* channels, + unsigned int* sampleRate, drflac_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drflac* pFlac = drflac_open_memory(data, dataSize); - if (pFlac == NULL) { + if (pFlac == NULL) + { return NULL; } return drflac__full_decode_and_close_s32(pFlac, channels, sampleRate, totalSampleCount); } -drflac_int16* drflac_open_and_decode_memory_s16(const void* data, size_t dataSize, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount) +drflac_int16* drflac_open_and_decode_memory_s16(const void* data, size_t dataSize, unsigned int* channels, + unsigned int* sampleRate, drflac_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drflac* pFlac = drflac_open_memory(data, dataSize); - if (pFlac == NULL) { + if (pFlac == NULL) + { return NULL; } return drflac__full_decode_and_close_s16(pFlac, channels, sampleRate, totalSampleCount); } -float* drflac_open_and_decode_memory_f32(const void* data, size_t dataSize, unsigned int* channels, unsigned int* sampleRate, drflac_uint64* totalSampleCount) +float* drflac_open_and_decode_memory_f32(const void* data, size_t dataSize, unsigned int* channels, + unsigned int* sampleRate, drflac_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drflac* pFlac = drflac_open_memory(data, dataSize); - if (pFlac == NULL) { + if (pFlac == NULL) + { return NULL; } @@ -5984,12 +7087,11 @@ void drflac_free(void* pSampleDataReturnedByOpenAndDecode) DRFLAC_FREE(pSampleDataReturnedByOpenAndDecode); } - - - -void drflac_init_vorbis_comment_iterator(drflac_vorbis_comment_iterator* pIter, drflac_uint32 commentCount, const void* pComments) +void drflac_init_vorbis_comment_iterator(drflac_vorbis_comment_iterator* pIter, drflac_uint32 commentCount, + const void* pComments) { - if (pIter == NULL) { + if (pIter == NULL) + { return; } @@ -5997,12 +7099,15 @@ void drflac_init_vorbis_comment_iterator(drflac_vorbis_comment_iterator* pIter, pIter->pRunningData = (const char*)pComments; } -const char* drflac_next_vorbis_comment(drflac_vorbis_comment_iterator* pIter, drflac_uint32* pCommentLengthOut) +const char* drflac_next_vorbis_comment(drflac_vorbis_comment_iterator* pIter, + drflac_uint32* pCommentLengthOut) { // Safety. - if (pCommentLengthOut) *pCommentLengthOut = 0; + if (pCommentLengthOut) + *pCommentLengthOut = 0; - if (pIter == NULL || pIter->countRemaining == 0 || pIter->pRunningData == NULL) { + if (pIter == NULL || pIter->countRemaining == 0 || pIter->pRunningData == NULL) + { return NULL; } @@ -6013,16 +7118,16 @@ const char* drflac_next_vorbis_comment(drflac_vorbis_comment_iterator* pIter, dr pIter->pRunningData += length; pIter->countRemaining -= 1; - if (pCommentLengthOut) *pCommentLengthOut = length; + if (pCommentLengthOut) + *pCommentLengthOut = length; return pComment; } - - - -void drflac_init_cuesheet_track_iterator(drflac_cuesheet_track_iterator* pIter, drflac_uint32 trackCount, const void* pTrackData) +void drflac_init_cuesheet_track_iterator(drflac_cuesheet_track_iterator* pIter, drflac_uint32 trackCount, + const void* pTrackData) { - if (pIter == NULL) { + if (pIter == NULL) + { return; } @@ -6030,9 +7135,11 @@ void drflac_init_cuesheet_track_iterator(drflac_cuesheet_track_iterator* pIter, pIter->pRunningData = (const char*)pTrackData; } -drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter, drflac_cuesheet_track* pCuesheetTrack) +drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter, + drflac_cuesheet_track* pCuesheetTrack) { - if (pIter == NULL || pIter->countRemaining == 0 || pIter->pRunningData == NULL) { + if (pIter == NULL || pIter->countRemaining == 0 || pIter->pRunningData == NULL) + { return DRFLAC_FALSE; } @@ -6040,34 +7147,43 @@ drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter, const char* pRunningData = pIter->pRunningData; - drflac_uint64 offsetHi = drflac__be2host_32(*(const drflac_uint32*)pRunningData); pRunningData += 4; - drflac_uint64 offsetLo = drflac__be2host_32(*(const drflac_uint32*)pRunningData); pRunningData += 4; - cuesheetTrack.offset = offsetLo | (offsetHi << 32); - cuesheetTrack.trackNumber = pRunningData[0]; pRunningData += 1; - drflac_copy_memory(cuesheetTrack.ISRC, pRunningData, sizeof(cuesheetTrack.ISRC)); pRunningData += 12; - cuesheetTrack.isAudio = (pRunningData[0] & 0x80) != 0; - cuesheetTrack.preEmphasis = (pRunningData[0] & 0x40) != 0; pRunningData += 14; - cuesheetTrack.indexCount = pRunningData[0]; pRunningData += 1; - cuesheetTrack.pIndexPoints = (const drflac_cuesheet_track_index*)pRunningData; pRunningData += cuesheetTrack.indexCount * sizeof(drflac_cuesheet_track_index); + drflac_uint64 offsetHi = drflac__be2host_32(*(const drflac_uint32*)pRunningData); + pRunningData += 4; + drflac_uint64 offsetLo = drflac__be2host_32(*(const drflac_uint32*)pRunningData); + pRunningData += 4; + cuesheetTrack.offset = offsetLo | (offsetHi << 32); + cuesheetTrack.trackNumber = pRunningData[0]; + pRunningData += 1; + drflac_copy_memory(cuesheetTrack.ISRC, pRunningData, sizeof(cuesheetTrack.ISRC)); + pRunningData += 12; + cuesheetTrack.isAudio = (pRunningData[0] & 0x80) != 0; + cuesheetTrack.preEmphasis = (pRunningData[0] & 0x40) != 0; + pRunningData += 14; + cuesheetTrack.indexCount = pRunningData[0]; + pRunningData += 1; + cuesheetTrack.pIndexPoints = (const drflac_cuesheet_track_index*)pRunningData; + pRunningData += cuesheetTrack.indexCount * sizeof(drflac_cuesheet_track_index); pIter->pRunningData = pRunningData; pIter->countRemaining -= 1; - if (pCuesheetTrack) *pCuesheetTrack = cuesheetTrack; + if (pCuesheetTrack) + *pCuesheetTrack = cuesheetTrack; return DRFLAC_TRUE; } -#endif //DR_FLAC_IMPLEMENTATION - +#endif // DR_FLAC_IMPLEMENTATION // REVISION HISTORY // // v0.10.0 - 2018-09-11 -// - Remove the DR_FLAC_NO_WIN32_IO option and the Win32 file IO functionality. If you need to use Win32 file IO you +// - Remove the DR_FLAC_NO_WIN32_IO option and the Win32 file IO functionality. If you need to use Win32 +// file IO you // need to do it yourself via the callback API. // - Fix the clang build. // - Fix undefined behavior. // - Fix errors with CUESHEET metdata blocks. -// - Add an API for iterating over each cuesheet track in the CUESHEET metadata block. This works the same way as the +// - Add an API for iterating over each cuesheet track in the CUESHEET metadata block. This works the same +// way as the // Vorbis comment API. // - Other miscellaneous bug fixes, mostly relating to invalid FLAC streams. // - Minor optimizations. @@ -6117,7 +7233,8 @@ drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter, // - Stop pretending to support changing rate/channels mid stream. // // v0.8e - 2018-02-01 -// - Fix a crash when the block size of a frame is larger than the maximum block size defined by the FLAC stream. +// - Fix a crash when the block size of a frame is larger than the maximum block size defined by the FLAC +// stream. // - Fix a crash the the Rice partition order is invalid. // // v0.8d - 2017-09-22 @@ -6134,18 +7251,22 @@ drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter, // // v0.8 - 2017-08-12 // - API CHANGE: Rename dr_* types to drflac_*. -// - Optimizations. This brings dr_flac back to about the same class of efficiency as the reference implementation. +// - Optimizations. This brings dr_flac back to about the same class of efficiency as the reference +// implementation. // - Add support for custom implementations of malloc(), realloc(), etc. // - Add CRC checking to Ogg encapsulated streams. // - Fix VC++ 6 build. This is only for the C++ compiler. The C compiler is not currently supported. // - Bug fixes. // // v0.7 - 2017-07-23 -// - Add support for opening a stream without a header block. To do this, use drflac_open_relaxed() / drflac_open_with_metadata_relaxed(). +// - Add support for opening a stream without a header block. To do this, use drflac_open_relaxed() / +// drflac_open_with_metadata_relaxed(). // // v0.6 - 2017-07-22 -// - Add support for recovering from invalid frames. With this change, dr_flac will simply skip over invalid frames as if they -// never existed. Frames are checked against their sync code, the CRC-8 of the frame header and the CRC-16 of the whole frame. +// - Add support for recovering from invalid frames. With this change, dr_flac will simply skip over invalid +// frames as if they +// never existed. Frames are checked against their sync code, the CRC-8 of the frame header and the CRC-16 +// of the whole frame. // // v0.5 - 2017-07-16 // - Fix typos. @@ -6175,7 +7296,8 @@ drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter, // v0.4 - 2016-09-29 // - API/ABI CHANGE: Use fixed size 32-bit booleans instead of the built-in bool type. // - API CHANGE: Rename drflac_open_and_decode*() to drflac_open_and_decode*_s32(). -// - API CHANGE: Swap the order of "channels" and "sampleRate" parameters in drflac_open_and_decode*(). Rationale for this is to +// - API CHANGE: Swap the order of "channels" and "sampleRate" parameters in drflac_open_and_decode*(). +// Rationale for this is to // keep it consistent with drflac_audio. // // v0.3f - 2016-09-21 @@ -6228,7 +7350,6 @@ drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter, // v0.1 - 2016-05-03 // - Initial versioned release. - /* This is free and unencumbered software released into the public domain. diff --git a/include/kfr/io/dr/dr_wav.h b/include/kfr/io/dr/dr_wav.h @@ -9,8 +9,8 @@ // #define DR_WAV_IMPLEMENTATION // #include "dr_wav.h" // -// You can then #include this file in other parts of the program as you would with any other header file. Do something -// like the following to read audio data: +// You can then #include this file in other parts of the program as you would with any other header file. Do +// something like the following to read audio data: // // drwav wav; // if (!drwav_init_file(&wav, "my_song.wav")) { @@ -18,7 +18,8 @@ // } // // drwav_int32* pDecodedInterleavedSamples = malloc(wav.totalSampleCount * sizeof(drwav_int32)); -// size_t numberOfSamplesActuallyDecoded = drwav_read_s32(&wav, wav.totalSampleCount, pDecodedInterleavedSamples); +// size_t numberOfSamplesActuallyDecoded = drwav_read_s32(&wav, wav.totalSampleCount, +// pDecodedInterleavedSamples); // // ... // @@ -35,13 +36,14 @@ // // drwav_close(pWav); // -// If you just want to quickly open and read the audio data in a single operation you can do something like this: +// If you just want to quickly open and read the audio data in a single operation you can do something like +// this: // // unsigned int channels; // unsigned int sampleRate; // drwav_uint64 totalSampleCount; -// float* pSampleData = drwav_open_and_read_file_s32("my_song.wav", &channels, &sampleRate, &totalSampleCount); -// if (pSampleData == NULL) { +// float* pSampleData = drwav_open_and_read_file_s32("my_song.wav", &channels, &sampleRate, +// &totalSampleCount); if (pSampleData == NULL) { // // Error opening and reading WAV file. // } // @@ -49,31 +51,30 @@ // // drwav_free(pSampleData); // -// The examples above use versions of the API that convert the audio data to a consistent format (32-bit signed PCM, in -// this case), but you can still output the audio data in its internal format (see notes below for supported formats): +// The examples above use versions of the API that convert the audio data to a consistent format (32-bit +// signed PCM, in this case), but you can still output the audio data in its internal format (see notes below +// for supported formats): // // size_t samplesRead = drwav_read(&wav, wav.totalSampleCount, pDecodedInterleavedSamples); // -// You can also read the raw bytes of audio data, which could be useful if dr_wav does not have native support for -// a particular data format: +// You can also read the raw bytes of audio data, which could be useful if dr_wav does not have native support +// for a particular data format: // // size_t bytesRead = drwav_read_raw(&wav, bytesToRead, pRawDataBuffer); // // -// dr_wav has seamless support the Sony Wave64 format. The decoder will automatically detect it and it should Just Work -// without any manual intervention. +// dr_wav has seamless support the Sony Wave64 format. The decoder will automatically detect it and it should +// Just Work without any manual intervention. // // -// dr_wav can also be used to output WAV files. This does not currently support compressed formats. To use this, look at -// drwav_open_write(), drwav_open_file_write(), etc. Use drwav_write() to write samples, or drwav_write_raw() to write -// raw data in the "data" chunk. +// dr_wav can also be used to output WAV files. This does not currently support compressed formats. To use +// this, look at drwav_open_write(), drwav_open_file_write(), etc. Use drwav_write() to write samples, or +// drwav_write_raw() to write raw data in the "data" chunk. // // drwav_data_format format; -// format.container = drwav_container_riff; // <-- drwav_container_riff = normal WAV files, drwav_container_w64 = Sony Wave64. -// format.format = DR_WAVE_FORMAT_PCM; // <-- Any of the DR_WAVE_FORMAT_* codes. -// format.channels = 2; -// format.sampleRate = 44100; -// format.bitsPerSample = 16; +// format.container = drwav_container_riff; // <-- drwav_container_riff = normal WAV files, +// drwav_container_w64 = Sony Wave64. format.format = DR_WAVE_FORMAT_PCM; // <-- Any of the +// DR_WAVE_FORMAT_* codes. format.channels = 2; format.sampleRate = 44100; format.bitsPerSample = 16; // drwav* pWav = drwav_open_file_write("data/recording.wav", &format); // // ... @@ -95,9 +96,11 @@ // // QUICK NOTES // - Samples are always interleaved. -// - The default read function does not do any data conversion. Use drwav_read_f32() to read and convert audio data -// to IEEE 32-bit floating point samples, drwav_read_s32() to read samples as signed 32-bit PCM and drwav_read_s16() -// to read samples as signed 16-bit PCM. Tested and supported internal formats include the following: +// - The default read function does not do any data conversion. Use drwav_read_f32() to read and convert audio +// data +// to IEEE 32-bit floating point samples, drwav_read_s32() to read samples as signed 32-bit PCM and +// drwav_read_s16() to read samples as signed 16-bit PCM. Tested and supported internal formats include the +// following: // - Unsigned 8-bit PCM // - Signed 12-bit PCM // - Signed 16-bit PCM @@ -108,8 +111,8 @@ // - A-law and u-law // - Microsoft ADPCM // - IMA ADPCM (DVI, format code 0x11) -// - dr_wav will try to read the WAV file as best it can, even if it's not strictly conformant to the WAV format. - +// - dr_wav will try to read the WAV file as best it can, even if it's not strictly conformant to the WAV +// format. #ifndef dr_wav_h #define dr_wav_h @@ -117,569 +120,595 @@ #include <stddef.h> #if defined(_MSC_VER) && _MSC_VER < 1600 -typedef signed char drwav_int8; -typedef unsigned char drwav_uint8; -typedef signed short drwav_int16; -typedef unsigned short drwav_uint16; -typedef signed int drwav_int32; -typedef unsigned int drwav_uint32; -typedef signed __int64 drwav_int64; +typedef signed char drwav_int8; +typedef unsigned char drwav_uint8; +typedef signed short drwav_int16; +typedef unsigned short drwav_uint16; +typedef signed int drwav_int32; +typedef unsigned int drwav_uint32; +typedef signed __int64 drwav_int64; typedef unsigned __int64 drwav_uint64; #else #include <stdint.h> -typedef int8_t drwav_int8; -typedef uint8_t drwav_uint8; -typedef int16_t drwav_int16; -typedef uint16_t drwav_uint16; -typedef int32_t drwav_int32; -typedef uint32_t drwav_uint32; -typedef int64_t drwav_int64; -typedef uint64_t drwav_uint64; +typedef int8_t drwav_int8; +typedef uint8_t drwav_uint8; +typedef int16_t drwav_int16; +typedef uint16_t drwav_uint16; +typedef int32_t drwav_int32; +typedef uint32_t drwav_uint32; +typedef int64_t drwav_int64; +typedef uint64_t drwav_uint64; #endif -typedef drwav_uint8 drwav_bool8; -typedef drwav_uint32 drwav_bool32; -#define DRWAV_TRUE 1 -#define DRWAV_FALSE 0 +typedef drwav_uint8 drwav_bool8; +typedef drwav_uint32 drwav_bool32; +#define DRWAV_TRUE 1 +#define DRWAV_FALSE 0 #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif // Common data formats. -#define DR_WAVE_FORMAT_PCM 0x1 -#define DR_WAVE_FORMAT_ADPCM 0x2 -#define DR_WAVE_FORMAT_IEEE_FLOAT 0x3 -#define DR_WAVE_FORMAT_ALAW 0x6 -#define DR_WAVE_FORMAT_MULAW 0x7 -#define DR_WAVE_FORMAT_DVI_ADPCM 0x11 -#define DR_WAVE_FORMAT_EXTENSIBLE 0xFFFE - -typedef enum -{ - drwav_seek_origin_start, - drwav_seek_origin_current -} drwav_seek_origin; - -typedef enum -{ - drwav_container_riff, - drwav_container_w64 -} drwav_container; - -// Callback for when data is read. Return value is the number of bytes actually read. -// -// pUserData [in] The user data that was passed to drwav_init(), drwav_open() and family. -// pBufferOut [out] The output buffer. -// bytesToRead [in] The number of bytes to read. -// -// Returns the number of bytes actually read. -// -// A return value of less than bytesToRead indicates the end of the stream. Do _not_ return from this callback until -// either the entire bytesToRead is filled or you have reached the end of the stream. -typedef size_t (* drwav_read_proc)(void* pUserData, void* pBufferOut, size_t bytesToRead); - -// Callback for when data is written. Returns value is the number of bytes actually written. -// -// pUserData [in] The user data that was passed to drwav_init_write(), drwav_open_write() and family. -// pData [out] A pointer to the data to write. -// bytesToWrite [in] The number of bytes to write. -// -// Returns the number of bytes actually written. -// -// If the return value differs from bytesToWrite, it indicates an error. -typedef size_t (* drwav_write_proc)(void* pUserData, const void* pData, size_t bytesToWrite); - -// Callback for when data needs to be seeked. -// -// pUserData [in] The user data that was passed to drwav_init(), drwav_open() and family. -// offset [in] The number of bytes to move, relative to the origin. Will never be negative. -// origin [in] The origin of the seek - the current position or the start of the stream. -// -// Returns whether or not the seek was successful. -// -// Whether or not it is relative to the beginning or current position is determined by the "origin" parameter which -// will be either drwav_seek_origin_start or drwav_seek_origin_current. -typedef drwav_bool32 (* drwav_seek_proc)(void* pUserData, int offset, drwav_seek_origin origin); - -// Structure for internal use. Only used for loaders opened with drwav_open_memory(). -typedef struct -{ - const drwav_uint8* data; - size_t dataSize; - size_t currentReadPos; -} drwav__memory_stream; - -// Structure for internal use. Only used for writers opened with drwav_open_memory_write(). -typedef struct -{ - void** ppData; - size_t* pDataSize; - size_t dataSize; - size_t dataCapacity; - size_t currentWritePos; -} drwav__memory_stream_write; - -typedef struct -{ - drwav_container container; // RIFF, W64. - drwav_uint32 format; // DR_WAVE_FORMAT_* - drwav_uint32 channels; - drwav_uint32 sampleRate; - drwav_uint32 bitsPerSample; -} drwav_data_format; - -typedef struct -{ - // The format tag exactly as specified in the wave file's "fmt" chunk. This can be used by applications - // that require support for data formats not natively supported by dr_wav. - drwav_uint16 formatTag; - - // The number of channels making up the audio data. When this is set to 1 it is mono, 2 is stereo, etc. - drwav_uint16 channels; - - // The sample rate. Usually set to something like 44100. - drwav_uint32 sampleRate; - - // Average bytes per second. You probably don't need this, but it's left here for informational purposes. - drwav_uint32 avgBytesPerSec; - - // Block align. This is equal to the number of channels * bytes per sample. - drwav_uint16 blockAlign; - - // Bits per sample. - drwav_uint16 bitsPerSample; - - // The size of the extended data. Only used internally for validation, but left here for informational purposes. - drwav_uint16 extendedSize; - - // The number of valid bits per sample. When <formatTag> is equal to WAVE_FORMAT_EXTENSIBLE, <bitsPerSample> - // is always rounded up to the nearest multiple of 8. This variable contains information about exactly how - // many bits a valid per sample. Mainly used for informational purposes. - drwav_uint16 validBitsPerSample; - - // The channel mask. Not used at the moment. - drwav_uint32 channelMask; - - // The sub-format, exactly as specified by the wave file. - drwav_uint8 subFormat[16]; -} drwav_fmt; - -typedef struct -{ - // A pointer to the function to call when more data is needed. - drwav_read_proc onRead; - - // A pointer to the function to call when data needs to be written. Only used when the drwav object is opened in write mode. - drwav_write_proc onWrite; - - // A pointer to the function to call when the wav file needs to be seeked. - drwav_seek_proc onSeek; - - // The user data to pass to callbacks. - void* pUserData; - - - // Whether or not the WAV file is formatted as a standard RIFF file or W64. - drwav_container container; - - - // Structure containing format information exactly as specified by the wav file. - drwav_fmt fmt; - - // The sample rate. Will be set to something like 44100. - drwav_uint32 sampleRate; - - // The number of channels. This will be set to 1 for monaural streams, 2 for stereo, etc. - drwav_uint16 channels; - - // The bits per sample. Will be set to something like 16, 24, etc. - drwav_uint16 bitsPerSample; - - // The number of bytes per sample. - drwav_uint16 bytesPerSample; - - // Equal to fmt.formatTag, or the value specified by fmt.subFormat if fmt.formatTag is equal to 65534 (WAVE_FORMAT_EXTENSIBLE). - drwav_uint16 translatedFormatTag; - - // The total number of samples making up the audio data. Use <totalSampleCount> * <bytesPerSample> to calculate - // the required size of a buffer to hold the entire audio data. - drwav_uint64 totalSampleCount; - - - // The size in bytes of the data chunk. - drwav_uint64 dataChunkDataSize; - - // The position in the stream of the first byte of the data chunk. This is used for seeking. - drwav_uint64 dataChunkDataPos; - - // The number of bytes remaining in the data chunk. - drwav_uint64 bytesRemaining; - - - // Only used in sequential write mode. Keeps track of the desired size of the "data" chunk at the point of initialization time. Always - // set to 0 for non-sequential writes and when the drwav object is opened in read mode. Used for validation. - drwav_uint64 dataChunkDataSizeTargetWrite; - - // Keeps track of whether or not the wav writer was initialized in sequential mode. - drwav_bool32 isSequentialWrite; - - - // A hack to avoid a DRWAV_MALLOC() when opening a decoder with drwav_open_memory(). - drwav__memory_stream memoryStream; - drwav__memory_stream_write memoryStreamWrite; +#define DR_WAVE_FORMAT_PCM 0x1 +#define DR_WAVE_FORMAT_ADPCM 0x2 +#define DR_WAVE_FORMAT_IEEE_FLOAT 0x3 +#define DR_WAVE_FORMAT_ALAW 0x6 +#define DR_WAVE_FORMAT_MULAW 0x7 +#define DR_WAVE_FORMAT_DVI_ADPCM 0x11 +#define DR_WAVE_FORMAT_EXTENSIBLE 0xFFFE + + typedef enum + { + drwav_seek_origin_start, + drwav_seek_origin_current + } drwav_seek_origin; - // Generic data for compressed formats. This data is shared across all block-compressed formats. - struct + typedef enum { - drwav_uint64 iCurrentSample; // The index of the next sample that will be read by drwav_read_*(). This is used with "totalSampleCount" to ensure we don't read excess samples at the end of the last block. - } compressed; - - // Microsoft ADPCM specific data. - struct + drwav_container_riff, + drwav_container_w64 + } drwav_container; + + // Callback for when data is read. Return value is the number of bytes actually read. + // + // pUserData [in] The user data that was passed to drwav_init(), drwav_open() and family. + // pBufferOut [out] The output buffer. + // bytesToRead [in] The number of bytes to read. + // + // Returns the number of bytes actually read. + // + // A return value of less than bytesToRead indicates the end of the stream. Do _not_ return from this + // callback until either the entire bytesToRead is filled or you have reached the end of the stream. + typedef size_t (*drwav_read_proc)(void* pUserData, void* pBufferOut, size_t bytesToRead); + + // Callback for when data is written. Returns value is the number of bytes actually written. + // + // pUserData [in] The user data that was passed to drwav_init_write(), drwav_open_write() and family. + // pData [out] A pointer to the data to write. + // bytesToWrite [in] The number of bytes to write. + // + // Returns the number of bytes actually written. + // + // If the return value differs from bytesToWrite, it indicates an error. + typedef size_t (*drwav_write_proc)(void* pUserData, const void* pData, size_t bytesToWrite); + + // Callback for when data needs to be seeked. + // + // pUserData [in] The user data that was passed to drwav_init(), drwav_open() and family. + // offset [in] The number of bytes to move, relative to the origin. Will never be negative. + // origin [in] The origin of the seek - the current position or the start of the stream. + // + // Returns whether or not the seek was successful. + // + // Whether or not it is relative to the beginning or current position is determined by the "origin" + // parameter which will be either drwav_seek_origin_start or drwav_seek_origin_current. + typedef drwav_bool32 (*drwav_seek_proc)(void* pUserData, int offset, drwav_seek_origin origin); + + // Structure for internal use. Only used for loaders opened with drwav_open_memory(). + typedef struct { - drwav_uint32 bytesRemainingInBlock; - drwav_uint16 predictor[2]; - drwav_int32 delta[2]; - drwav_int32 cachedSamples[4]; // Samples are stored in this cache during decoding. - drwav_uint32 cachedSampleCount; - drwav_int32 prevSamples[2][2]; // The previous 2 samples for each channel (2 channels at most). - } msadpcm; + const drwav_uint8* data; + size_t dataSize; + size_t currentReadPos; + } drwav__memory_stream; - // IMA ADPCM specific data. - struct + // Structure for internal use. Only used for writers opened with drwav_open_memory_write(). + typedef struct { - drwav_uint32 bytesRemainingInBlock; - drwav_int32 predictor[2]; - drwav_int32 stepIndex[2]; - drwav_int32 cachedSamples[16]; // Samples are stored in this cache during decoding. - drwav_uint32 cachedSampleCount; - } ima; -} drwav; - - -// Initializes a pre-allocated drwav object. -// -// onRead [in] The function to call when data needs to be read from the client. -// onSeek [in] The function to call when the read position of the client data needs to move. -// pUserData [in, optional] A pointer to application defined data that will be passed to onRead and onSeek. -// -// Returns true if successful; false otherwise. -// -// Close the loader with drwav_uninit(). -// -// This is the lowest level function for initializing a WAV file. You can also use drwav_init_file() and drwav_init_memory() -// to open the stream from a file or from a block of memory respectively. -// -// If you want dr_wav to manage the memory allocation for you, consider using drwav_open() instead. This will allocate -// a drwav object on the heap and return a pointer to it. -// -// See also: drwav_init_file(), drwav_init_memory(), drwav_uninit() -drwav_bool32 drwav_init(drwav* pWav, drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData); - -// Initializes a pre-allocated drwav object for writing. -// -// onWrite [in] The function to call when data needs to be written. -// onSeek [in] The function to call when the write position needs to move. -// pUserData [in, optional] A pointer to application defined data that will be passed to onWrite and onSeek. -// -// Returns true if successful; false otherwise. -// -// Close the writer with drwav_uninit(). -// -// This is the lowest level function for initializing a WAV file. You can also use drwav_init_file() and drwav_init_memory() -// to open the stream from a file or from a block of memory respectively. -// -// If the total sample count is known, you can use drwav_init_write_sequential(). This avoids the need for dr_wav to perform -// a post-processing step for storing the total sample count and the size of the data chunk which requires a backwards seek. -// -// If you want dr_wav to manage the memory allocation for you, consider using drwav_open() instead. This will allocate -// a drwav object on the heap and return a pointer to it. -// -// See also: drwav_init_file_write(), drwav_init_memory_write(), drwav_uninit() -drwav_bool32 drwav_init_write(drwav* pWav, const drwav_data_format* pFormat, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData); -drwav_bool32 drwav_init_write_sequential(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_write_proc onWrite, void* pUserData); - -// Uninitializes the given drwav object. -// -// Use this only for objects initialized with drwav_init(). -void drwav_uninit(drwav* pWav); - - -// Opens a wav file using the given callbacks. -// -// onRead [in] The function to call when data needs to be read from the client. -// onSeek [in] The function to call when the read position of the client data needs to move. -// pUserData [in, optional] A pointer to application defined data that will be passed to onRead and onSeek. -// -// Returns null on error. -// -// Close the loader with drwav_close(). -// -// You can also use drwav_open_file() and drwav_open_memory() to open the stream from a file or from a block of -// memory respectively. -// -// This is different from drwav_init() in that it will allocate the drwav object for you via DRWAV_MALLOC() before -// initializing it. -// -// See also: drwav_open_file(), drwav_open_memory(), drwav_close() -drwav* drwav_open(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData); - -// Opens a wav file for writing using the given callbacks. -// -// onWrite [in] The function to call when data needs to be written. -// onSeek [in] The function to call when the write position needs to move. -// pUserData [in, optional] A pointer to application defined data that will be passed to onWrite and onSeek. -// -// Returns null on error. -// -// Close the loader with drwav_close(). -// -// You can also use drwav_open_file_write() and drwav_open_memory_write() to open the stream from a file or from a block -// of memory respectively. -// -// This is different from drwav_init_write() in that it will allocate the drwav object for you via DRWAV_MALLOC() before -// initializing it. -// -// See also: drwav_open_file_write(), drwav_open_memory_write(), drwav_close() -drwav* drwav_open_write(const drwav_data_format* pFormat, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData); -drwav* drwav_open_write_sequential(const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_write_proc onWrite, void* pUserData); + void** ppData; + size_t* pDataSize; + size_t dataSize; + size_t dataCapacity; + size_t currentWritePos; + } drwav__memory_stream_write; + + typedef struct + { + drwav_container container; // RIFF, W64. + drwav_uint32 format; // DR_WAVE_FORMAT_* + drwav_uint32 channels; + drwav_uint32 sampleRate; + drwav_uint32 bitsPerSample; + } drwav_data_format; + + typedef struct + { + // The format tag exactly as specified in the wave file's "fmt" chunk. This can be used by + // applications that require support for data formats not natively supported by dr_wav. + drwav_uint16 formatTag; -// Uninitializes and deletes the the given drwav object. -// -// Use this only for objects created with drwav_open(). -void drwav_close(drwav* pWav); + // The number of channels making up the audio data. When this is set to 1 it is mono, 2 is stereo, + // etc. + drwav_uint16 channels; + // The sample rate. Usually set to something like 44100. + drwav_uint32 sampleRate; -// Reads raw audio data. -// -// This is the lowest level function for reading audio data. It simply reads the given number of -// bytes of the raw internal sample data. -// -// Consider using drwav_read_s16(), drwav_read_s32() or drwav_read_f32() for reading sample data in -// a consistent format. -// -// Returns the number of bytes actually read. -size_t drwav_read_raw(drwav* pWav, size_t bytesToRead, void* pBufferOut); + // Average bytes per second. You probably don't need this, but it's left here for informational + // purposes. + drwav_uint32 avgBytesPerSec; -// Reads a chunk of audio data in the native internal format. -// -// This is typically the most efficient way to retrieve audio data, but it does not do any format -// conversions which means you'll need to convert the data manually if required. -// -// If the return value is less than <samplesToRead> it means the end of the file has been reached or -// you have requested more samples than can possibly fit in the output buffer. -// -// This function will only work when sample data is of a fixed size and uncompressed. If you are -// using a compressed format consider using drwav_read_raw() or drwav_read_s16/s32/f32/etc(). -drwav_uint64 drwav_read(drwav* pWav, drwav_uint64 samplesToRead, void* pBufferOut); + // Block align. This is equal to the number of channels * bytes per sample. + drwav_uint16 blockAlign; -// Seeks to the given sample. -// -// Returns true if successful; false otherwise. -drwav_bool32 drwav_seek_to_sample(drwav* pWav, drwav_uint64 sample); + // Bits per sample. + drwav_uint16 bitsPerSample; + // The size of the extended data. Only used internally for validation, but left here for informational + // purposes. + drwav_uint16 extendedSize; -// Writes raw audio data. -// -// Returns the number of bytes actually written. If this differs from bytesToWrite, it indicates an error. -size_t drwav_write_raw(drwav* pWav, size_t bytesToWrite, const void* pData); + // The number of valid bits per sample. When <formatTag> is equal to WAVE_FORMAT_EXTENSIBLE, + // <bitsPerSample> is always rounded up to the nearest multiple of 8. This variable contains + // information about exactly how many bits a valid per sample. Mainly used for informational purposes. + drwav_uint16 validBitsPerSample; -// Writes audio data based on sample counts. -// -// Returns the number of samples written. -drwav_uint64 drwav_write(drwav* pWav, drwav_uint64 samplesToWrite, const void* pData); + // The channel mask. Not used at the moment. + drwav_uint32 channelMask; + // The sub-format, exactly as specified by the wave file. + drwav_uint8 subFormat[16]; + } drwav_fmt; + typedef struct + { + // A pointer to the function to call when more data is needed. + drwav_read_proc onRead; + + // A pointer to the function to call when data needs to be written. Only used when the drwav object is + // opened in write mode. + drwav_write_proc onWrite; + + // A pointer to the function to call when the wav file needs to be seeked. + drwav_seek_proc onSeek; + + // The user data to pass to callbacks. + void* pUserData; + + // Whether or not the WAV file is formatted as a standard RIFF file or W64. + drwav_container container; + + // Structure containing format information exactly as specified by the wav file. + drwav_fmt fmt; + + // The sample rate. Will be set to something like 44100. + drwav_uint32 sampleRate; + + // The number of channels. This will be set to 1 for monaural streams, 2 for stereo, etc. + drwav_uint16 channels; + + // The bits per sample. Will be set to something like 16, 24, etc. + drwav_uint16 bitsPerSample; + + // The number of bytes per sample. + drwav_uint16 bytesPerSample; + + // Equal to fmt.formatTag, or the value specified by fmt.subFormat if fmt.formatTag is equal to 65534 + // (WAVE_FORMAT_EXTENSIBLE). + drwav_uint16 translatedFormatTag; + + // The total number of samples making up the audio data. Use <totalSampleCount> * <bytesPerSample> to + // calculate the required size of a buffer to hold the entire audio data. + drwav_uint64 totalSampleCount; + + // The size in bytes of the data chunk. + drwav_uint64 dataChunkDataSize; + + // The position in the stream of the first byte of the data chunk. This is used for seeking. + drwav_uint64 dataChunkDataPos; + + // The number of bytes remaining in the data chunk. + drwav_uint64 bytesRemaining; + + // Only used in sequential write mode. Keeps track of the desired size of the "data" chunk at the + // point of initialization time. Always set to 0 for non-sequential writes and when the drwav object + // is opened in read mode. Used for validation. + drwav_uint64 dataChunkDataSizeTargetWrite; + + // Keeps track of whether or not the wav writer was initialized in sequential mode. + drwav_bool32 isSequentialWrite; + + // A hack to avoid a DRWAV_MALLOC() when opening a decoder with drwav_open_memory(). + drwav__memory_stream memoryStream; + drwav__memory_stream_write memoryStreamWrite; + + // Generic data for compressed formats. This data is shared across all block-compressed formats. + struct + { + drwav_uint64 iCurrentSample; // The index of the next sample that will be read by drwav_read_*(). + // This is used with "totalSampleCount" to ensure we don't read + // excess samples at the end of the last block. + } compressed; + + // Microsoft ADPCM specific data. + struct + { + drwav_uint32 bytesRemainingInBlock; + drwav_uint16 predictor[2]; + drwav_int32 delta[2]; + drwav_int32 cachedSamples[4]; // Samples are stored in this cache during decoding. + drwav_uint32 cachedSampleCount; + drwav_int32 prevSamples[2][2]; // The previous 2 samples for each channel (2 channels at most). + } msadpcm; + + // IMA ADPCM specific data. + struct + { + drwav_uint32 bytesRemainingInBlock; + drwav_int32 predictor[2]; + drwav_int32 stepIndex[2]; + drwav_int32 cachedSamples[16]; // Samples are stored in this cache during decoding. + drwav_uint32 cachedSampleCount; + } ima; + } drwav; + + // Initializes a pre-allocated drwav object. + // + // onRead [in] The function to call when data needs to be read from the client. + // onSeek [in] The function to call when the read position of the client data needs to move. + // pUserData [in, optional] A pointer to application defined data that will be passed to onRead and + // onSeek. + // + // Returns true if successful; false otherwise. + // + // Close the loader with drwav_uninit(). + // + // This is the lowest level function for initializing a WAV file. You can also use drwav_init_file() and + // drwav_init_memory() to open the stream from a file or from a block of memory respectively. + // + // If you want dr_wav to manage the memory allocation for you, consider using drwav_open() instead. This + // will allocate a drwav object on the heap and return a pointer to it. + // + // See also: drwav_init_file(), drwav_init_memory(), drwav_uninit() + drwav_bool32 drwav_init(drwav* pWav, drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData); + + // Initializes a pre-allocated drwav object for writing. + // + // onWrite [in] The function to call when data needs to be written. + // onSeek [in] The function to call when the write position needs to move. + // pUserData [in, optional] A pointer to application defined data that will be passed to onWrite and + // onSeek. + // + // Returns true if successful; false otherwise. + // + // Close the writer with drwav_uninit(). + // + // This is the lowest level function for initializing a WAV file. You can also use drwav_init_file() and + // drwav_init_memory() to open the stream from a file or from a block of memory respectively. + // + // If the total sample count is known, you can use drwav_init_write_sequential(). This avoids the need for + // dr_wav to perform a post-processing step for storing the total sample count and the size of the data + // chunk which requires a backwards seek. + // + // If you want dr_wav to manage the memory allocation for you, consider using drwav_open() instead. This + // will allocate a drwav object on the heap and return a pointer to it. + // + // See also: drwav_init_file_write(), drwav_init_memory_write(), drwav_uninit() + drwav_bool32 drwav_init_write(drwav* pWav, const drwav_data_format* pFormat, drwav_write_proc onWrite, + drwav_seek_proc onSeek, void* pUserData); + drwav_bool32 drwav_init_write_sequential(drwav* pWav, const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount, drwav_write_proc onWrite, + void* pUserData); + + // Uninitializes the given drwav object. + // + // Use this only for objects initialized with drwav_init(). + void drwav_uninit(drwav* pWav); + + // Opens a wav file using the given callbacks. + // + // onRead [in] The function to call when data needs to be read from the client. + // onSeek [in] The function to call when the read position of the client data needs to move. + // pUserData [in, optional] A pointer to application defined data that will be passed to onRead and + // onSeek. + // + // Returns null on error. + // + // Close the loader with drwav_close(). + // + // You can also use drwav_open_file() and drwav_open_memory() to open the stream from a file or from a + // block of memory respectively. + // + // This is different from drwav_init() in that it will allocate the drwav object for you via + // DRWAV_MALLOC() before initializing it. + // + // See also: drwav_open_file(), drwav_open_memory(), drwav_close() + drwav* drwav_open(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData); + + // Opens a wav file for writing using the given callbacks. + // + // onWrite [in] The function to call when data needs to be written. + // onSeek [in] The function to call when the write position needs to move. + // pUserData [in, optional] A pointer to application defined data that will be passed to onWrite and + // onSeek. + // + // Returns null on error. + // + // Close the loader with drwav_close(). + // + // You can also use drwav_open_file_write() and drwav_open_memory_write() to open the stream from a file + // or from a block of memory respectively. + // + // This is different from drwav_init_write() in that it will allocate the drwav object for you via + // DRWAV_MALLOC() before initializing it. + // + // See also: drwav_open_file_write(), drwav_open_memory_write(), drwav_close() + drwav* drwav_open_write(const drwav_data_format* pFormat, drwav_write_proc onWrite, + drwav_seek_proc onSeek, void* pUserData); + drwav* drwav_open_write_sequential(const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, + drwav_write_proc onWrite, void* pUserData); + + // Uninitializes and deletes the the given drwav object. + // + // Use this only for objects created with drwav_open(). + void drwav_close(drwav* pWav); + + // Reads raw audio data. + // + // This is the lowest level function for reading audio data. It simply reads the given number of + // bytes of the raw internal sample data. + // + // Consider using drwav_read_s16(), drwav_read_s32() or drwav_read_f32() for reading sample data in + // a consistent format. + // + // Returns the number of bytes actually read. + size_t drwav_read_raw(drwav* pWav, size_t bytesToRead, void* pBufferOut); + + // Reads a chunk of audio data in the native internal format. + // + // This is typically the most efficient way to retrieve audio data, but it does not do any format + // conversions which means you'll need to convert the data manually if required. + // + // If the return value is less than <samplesToRead> it means the end of the file has been reached or + // you have requested more samples than can possibly fit in the output buffer. + // + // This function will only work when sample data is of a fixed size and uncompressed. If you are + // using a compressed format consider using drwav_read_raw() or drwav_read_s16/s32/f32/etc(). + drwav_uint64 drwav_read(drwav* pWav, drwav_uint64 samplesToRead, void* pBufferOut); + + // Seeks to the given sample. + // + // Returns true if successful; false otherwise. + drwav_bool32 drwav_seek_to_sample(drwav* pWav, drwav_uint64 sample); + + // Writes raw audio data. + // + // Returns the number of bytes actually written. If this differs from bytesToWrite, it indicates an error. + size_t drwav_write_raw(drwav* pWav, size_t bytesToWrite, const void* pData); + + // Writes audio data based on sample counts. + // + // Returns the number of samples written. + drwav_uint64 drwav_write(drwav* pWav, drwav_uint64 samplesToWrite, const void* pData); //// Conversion Utilities //// #ifndef DR_WAV_NO_CONVERSION_API -// Reads a chunk of audio data and converts it to signed 16-bit PCM samples. -// -// Returns the number of samples actually read. -// -// If the return value is less than <samplesToRead> it means the end of the file has been reached. -drwav_uint64 drwav_read_s16(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16* pBufferOut); - -// Low-level function for converting unsigned 8-bit PCM samples to signed 16-bit PCM samples. -void drwav_u8_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount); + // Reads a chunk of audio data and converts it to signed 16-bit PCM samples. + // + // Returns the number of samples actually read. + // + // If the return value is less than <samplesToRead> it means the end of the file has been reached. + drwav_uint64 drwav_read_s16(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16* pBufferOut); -// Low-level function for converting signed 24-bit PCM samples to signed 16-bit PCM samples. -void drwav_s24_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount); + // Low-level function for converting unsigned 8-bit PCM samples to signed 16-bit PCM samples. + void drwav_u8_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount); -// Low-level function for converting signed 32-bit PCM samples to signed 16-bit PCM samples. -void drwav_s32_to_s16(drwav_int16* pOut, const drwav_int32* pIn, size_t sampleCount); + // Low-level function for converting signed 24-bit PCM samples to signed 16-bit PCM samples. + void drwav_s24_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount); -// Low-level function for converting IEEE 32-bit floating point samples to signed 16-bit PCM samples. -void drwav_f32_to_s16(drwav_int16* pOut, const float* pIn, size_t sampleCount); + // Low-level function for converting signed 32-bit PCM samples to signed 16-bit PCM samples. + void drwav_s32_to_s16(drwav_int16* pOut, const drwav_int32* pIn, size_t sampleCount); -// Low-level function for converting IEEE 64-bit floating point samples to signed 16-bit PCM samples. -void drwav_f64_to_s16(drwav_int16* pOut, const double* pIn, size_t sampleCount); + // Low-level function for converting IEEE 32-bit floating point samples to signed 16-bit PCM samples. + void drwav_f32_to_s16(drwav_int16* pOut, const float* pIn, size_t sampleCount); -// Low-level function for converting A-law samples to signed 16-bit PCM samples. -void drwav_alaw_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount); + // Low-level function for converting IEEE 64-bit floating point samples to signed 16-bit PCM samples. + void drwav_f64_to_s16(drwav_int16* pOut, const double* pIn, size_t sampleCount); -// Low-level function for converting u-law samples to signed 16-bit PCM samples. -void drwav_mulaw_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount); - - -// Reads a chunk of audio data and converts it to IEEE 32-bit floating point samples. -// -// Returns the number of samples actually read. -// -// If the return value is less than <samplesToRead> it means the end of the file has been reached. -drwav_uint64 drwav_read_f32(drwav* pWav, drwav_uint64 samplesToRead, float* pBufferOut); + // Low-level function for converting A-law samples to signed 16-bit PCM samples. + void drwav_alaw_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount); -// Low-level function for converting unsigned 8-bit PCM samples to IEEE 32-bit floating point samples. -void drwav_u8_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount); + // Low-level function for converting u-law samples to signed 16-bit PCM samples. + void drwav_mulaw_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount); -// Low-level function for converting signed 16-bit PCM samples to IEEE 32-bit floating point samples. -void drwav_s16_to_f32(float* pOut, const drwav_int16* pIn, size_t sampleCount); + // Reads a chunk of audio data and converts it to IEEE 32-bit floating point samples. + // + // Returns the number of samples actually read. + // + // If the return value is less than <samplesToRead> it means the end of the file has been reached. + drwav_uint64 drwav_read_f32(drwav* pWav, drwav_uint64 samplesToRead, float* pBufferOut); -// Low-level function for converting signed 24-bit PCM samples to IEEE 32-bit floating point samples. -void drwav_s24_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount); + // Low-level function for converting unsigned 8-bit PCM samples to IEEE 32-bit floating point samples. + void drwav_u8_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount); -// Low-level function for converting signed 32-bit PCM samples to IEEE 32-bit floating point samples. -void drwav_s32_to_f32(float* pOut, const drwav_int32* pIn, size_t sampleCount); + // Low-level function for converting signed 16-bit PCM samples to IEEE 32-bit floating point samples. + void drwav_s16_to_f32(float* pOut, const drwav_int16* pIn, size_t sampleCount); -// Low-level function for converting IEEE 64-bit floating point samples to IEEE 32-bit floating point samples. -void drwav_f64_to_f32(float* pOut, const double* pIn, size_t sampleCount); + // Low-level function for converting signed 24-bit PCM samples to IEEE 32-bit floating point samples. + void drwav_s24_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount); -// Low-level function for converting A-law samples to IEEE 32-bit floating point samples. -void drwav_alaw_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount); + // Low-level function for converting signed 32-bit PCM samples to IEEE 32-bit floating point samples. + void drwav_s32_to_f32(float* pOut, const drwav_int32* pIn, size_t sampleCount); -// Low-level function for converting u-law samples to IEEE 32-bit floating point samples. -void drwav_mulaw_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount); + // Low-level function for converting IEEE 64-bit floating point samples to IEEE 32-bit floating point + // samples. + void drwav_f64_to_f32(float* pOut, const double* pIn, size_t sampleCount); + // Low-level function for converting A-law samples to IEEE 32-bit floating point samples. + void drwav_alaw_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount); -// Reads a chunk of audio data and converts it to signed 32-bit PCM samples. -// -// Returns the number of samples actually read. -// -// If the return value is less than <samplesToRead> it means the end of the file has been reached. -drwav_uint64 drwav_read_s32(drwav* pWav, drwav_uint64 samplesToRead, drwav_int32* pBufferOut); + // Low-level function for converting u-law samples to IEEE 32-bit floating point samples. + void drwav_mulaw_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount); -// Low-level function for converting unsigned 8-bit PCM samples to signed 32-bit PCM samples. -void drwav_u8_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount); + // Reads a chunk of audio data and converts it to signed 32-bit PCM samples. + // + // Returns the number of samples actually read. + // + // If the return value is less than <samplesToRead> it means the end of the file has been reached. + drwav_uint64 drwav_read_s32(drwav* pWav, drwav_uint64 samplesToRead, drwav_int32* pBufferOut); -// Low-level function for converting signed 16-bit PCM samples to signed 32-bit PCM samples. -void drwav_s16_to_s32(drwav_int32* pOut, const drwav_int16* pIn, size_t sampleCount); + // Low-level function for converting unsigned 8-bit PCM samples to signed 32-bit PCM samples. + void drwav_u8_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount); -// Low-level function for converting signed 24-bit PCM samples to signed 32-bit PCM samples. -void drwav_s24_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount); + // Low-level function for converting signed 16-bit PCM samples to signed 32-bit PCM samples. + void drwav_s16_to_s32(drwav_int32* pOut, const drwav_int16* pIn, size_t sampleCount); -// Low-level function for converting IEEE 32-bit floating point samples to signed 32-bit PCM samples. -void drwav_f32_to_s32(drwav_int32* pOut, const float* pIn, size_t sampleCount); + // Low-level function for converting signed 24-bit PCM samples to signed 32-bit PCM samples. + void drwav_s24_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount); -// Low-level function for converting IEEE 64-bit floating point samples to signed 32-bit PCM samples. -void drwav_f64_to_s32(drwav_int32* pOut, const double* pIn, size_t sampleCount); + // Low-level function for converting IEEE 32-bit floating point samples to signed 32-bit PCM samples. + void drwav_f32_to_s32(drwav_int32* pOut, const float* pIn, size_t sampleCount); -// Low-level function for converting A-law samples to signed 32-bit PCM samples. -void drwav_alaw_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount); + // Low-level function for converting IEEE 64-bit floating point samples to signed 32-bit PCM samples. + void drwav_f64_to_s32(drwav_int32* pOut, const double* pIn, size_t sampleCount); -// Low-level function for converting u-law samples to signed 32-bit PCM samples. -void drwav_mulaw_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount); + // Low-level function for converting A-law samples to signed 32-bit PCM samples. + void drwav_alaw_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount); -#endif //DR_WAV_NO_CONVERSION_API + // Low-level function for converting u-law samples to signed 32-bit PCM samples. + void drwav_mulaw_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount); +#endif // DR_WAV_NO_CONVERSION_API -//// High-Level Convenience Helpers //// + //// High-Level Convenience Helpers //// #ifndef DR_WAV_NO_STDIO -// Helper for initializing a wave file using stdio. -// -// This holds the internal FILE object until drwav_uninit() is called. Keep this in mind if you're caching drwav -// objects because the operating system may restrict the number of file handles an application can have open at -// any given time. -drwav_bool32 drwav_init_file(drwav* pWav, const char* filename); - -// Helper for initializing a wave file for writing using stdio. -// -// This holds the internal FILE object until drwav_uninit() is called. Keep this in mind if you're caching drwav -// objects because the operating system may restrict the number of file handles an application can have open at -// any given time. -drwav_bool32 drwav_init_file_write(drwav* pWav, const char* filename, const drwav_data_format* pFormat); -drwav_bool32 drwav_init_file_write_sequential(drwav* pWav, const char* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount); - -// Helper for opening a wave file using stdio. -// -// This holds the internal FILE object until drwav_close() is called. Keep this in mind if you're caching drwav -// objects because the operating system may restrict the number of file handles an application can have open at -// any given time. -drwav* drwav_open_file(const char* filename); - -// Helper for opening a wave file for writing using stdio. -// -// This holds the internal FILE object until drwav_close() is called. Keep this in mind if you're caching drwav -// objects because the operating system may restrict the number of file handles an application can have open at -// any given time. -drwav* drwav_open_file_write(const char* filename, const drwav_data_format* pFormat); -drwav* drwav_open_file_write_sequential(const char* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount); - -#endif //DR_WAV_NO_STDIO - -// Helper for initializing a loader from a pre-allocated memory buffer. -// -// This does not create a copy of the data. It is up to the application to ensure the buffer remains valid for -// the lifetime of the drwav object. -// -// The buffer should contain the contents of the entire wave file, not just the sample data. -drwav_bool32 drwav_init_memory(drwav* pWav, const void* data, size_t dataSize); - -// Helper for initializing a writer which outputs data to a memory buffer. -// -// dr_wav will manage the memory allocations, however it is up to the caller to free the data with drwav_free(). -// -// The buffer will remain allocated even after drwav_uninit() is called. Indeed, the buffer should not be -// considered valid until after drwav_uninit() has been called anyway. -drwav_bool32 drwav_init_memory_write(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat); -drwav_bool32 drwav_init_memory_write_sequential(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount); - -// Helper for opening a loader from a pre-allocated memory buffer. -// -// This does not create a copy of the data. It is up to the application to ensure the buffer remains valid for -// the lifetime of the drwav object. -// -// The buffer should contain the contents of the entire wave file, not just the sample data. -drwav* drwav_open_memory(const void* data, size_t dataSize); - -// Helper for opening a writer which outputs data to a memory buffer. -// -// dr_wav will manage the memory allocations, however it is up to the caller to free the data with drwav_free(). -// -// The buffer will remain allocated even after drwav_close() is called. Indeed, the buffer should not be -// considered valid until after drwav_close() has been called anyway. -drwav* drwav_open_memory_write(void** ppData, size_t* pDataSize, const drwav_data_format* pFormat); -drwav* drwav_open_memory_write_sequential(void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount); - + // Helper for initializing a wave file using stdio. + // + // This holds the internal FILE object until drwav_uninit() is called. Keep this in mind if you're caching + // drwav objects because the operating system may restrict the number of file handles an application can + // have open at any given time. + drwav_bool32 drwav_init_file(drwav* pWav, const char* filename); + + // Helper for initializing a wave file for writing using stdio. + // + // This holds the internal FILE object until drwav_uninit() is called. Keep this in mind if you're caching + // drwav objects because the operating system may restrict the number of file handles an application can + // have open at any given time. + drwav_bool32 drwav_init_file_write(drwav* pWav, const char* filename, const drwav_data_format* pFormat); + drwav_bool32 drwav_init_file_write_sequential(drwav* pWav, const char* filename, + const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount); + + // Helper for opening a wave file using stdio. + // + // This holds the internal FILE object until drwav_close() is called. Keep this in mind if you're caching + // drwav objects because the operating system may restrict the number of file handles an application can + // have open at any given time. + drwav* drwav_open_file(const char* filename); + + // Helper for opening a wave file for writing using stdio. + // + // This holds the internal FILE object until drwav_close() is called. Keep this in mind if you're caching + // drwav objects because the operating system may restrict the number of file handles an application can + // have open at any given time. + drwav* drwav_open_file_write(const char* filename, const drwav_data_format* pFormat); + drwav* drwav_open_file_write_sequential(const char* filename, const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount); + +#endif // DR_WAV_NO_STDIO + + // Helper for initializing a loader from a pre-allocated memory buffer. + // + // This does not create a copy of the data. It is up to the application to ensure the buffer remains valid + // for the lifetime of the drwav object. + // + // The buffer should contain the contents of the entire wave file, not just the sample data. + drwav_bool32 drwav_init_memory(drwav* pWav, const void* data, size_t dataSize); + + // Helper for initializing a writer which outputs data to a memory buffer. + // + // dr_wav will manage the memory allocations, however it is up to the caller to free the data with + // drwav_free(). + // + // The buffer will remain allocated even after drwav_uninit() is called. Indeed, the buffer should not be + // considered valid until after drwav_uninit() has been called anyway. + drwav_bool32 drwav_init_memory_write(drwav* pWav, void** ppData, size_t* pDataSize, + const drwav_data_format* pFormat); + drwav_bool32 drwav_init_memory_write_sequential(drwav* pWav, void** ppData, size_t* pDataSize, + const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount); + + // Helper for opening a loader from a pre-allocated memory buffer. + // + // This does not create a copy of the data. It is up to the application to ensure the buffer remains valid + // for the lifetime of the drwav object. + // + // The buffer should contain the contents of the entire wave file, not just the sample data. + drwav* drwav_open_memory(const void* data, size_t dataSize); + + // Helper for opening a writer which outputs data to a memory buffer. + // + // dr_wav will manage the memory allocations, however it is up to the caller to free the data with + // drwav_free(). + // + // The buffer will remain allocated even after drwav_close() is called. Indeed, the buffer should not be + // considered valid until after drwav_close() has been called anyway. + drwav* drwav_open_memory_write(void** ppData, size_t* pDataSize, const drwav_data_format* pFormat); + drwav* drwav_open_memory_write_sequential(void** ppData, size_t* pDataSize, + const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount); #ifndef DR_WAV_NO_CONVERSION_API -// Opens and reads a wav file in a single operation. -drwav_int16* drwav_open_and_read_s16(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount); -float* drwav_open_and_read_f32(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount); -drwav_int32* drwav_open_and_read_s32(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount); + // Opens and reads a wav file in a single operation. + drwav_int16* drwav_open_and_read_s16(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, + unsigned int* channels, unsigned int* sampleRate, + drwav_uint64* totalSampleCount); + float* drwav_open_and_read_f32(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, + unsigned int* channels, unsigned int* sampleRate, + drwav_uint64* totalSampleCount); + drwav_int32* drwav_open_and_read_s32(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, + unsigned int* channels, unsigned int* sampleRate, + drwav_uint64* totalSampleCount); #ifndef DR_WAV_NO_STDIO -// Opens and decodes a wav file in a single operation. -drwav_int16* drwav_open_and_read_file_s16(const char* filename, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount); -float* drwav_open_and_read_file_f32(const char* filename, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount); -drwav_int32* drwav_open_and_read_file_s32(const char* filename, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount); + // Opens and decodes a wav file in a single operation. + drwav_int16* drwav_open_and_read_file_s16(const char* filename, unsigned int* channels, + unsigned int* sampleRate, drwav_uint64* totalSampleCount); + float* drwav_open_and_read_file_f32(const char* filename, unsigned int* channels, + unsigned int* sampleRate, drwav_uint64* totalSampleCount); + drwav_int32* drwav_open_and_read_file_s32(const char* filename, unsigned int* channels, + unsigned int* sampleRate, drwav_uint64* totalSampleCount); #endif -// Opens and decodes a wav file from a block of memory in a single operation. -drwav_int16* drwav_open_and_read_memory_s16(const void* data, size_t dataSize, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount); -float* drwav_open_and_read_memory_f32(const void* data, size_t dataSize, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount); -drwav_int32* drwav_open_and_read_memory_s32(const void* data, size_t dataSize, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount); + // Opens and decodes a wav file from a block of memory in a single operation. + drwav_int16* drwav_open_and_read_memory_s16(const void* data, size_t dataSize, unsigned int* channels, + unsigned int* sampleRate, drwav_uint64* totalSampleCount); + float* drwav_open_and_read_memory_f32(const void* data, size_t dataSize, unsigned int* channels, + unsigned int* sampleRate, drwav_uint64* totalSampleCount); + drwav_int32* drwav_open_and_read_memory_s32(const void* data, size_t dataSize, unsigned int* channels, + unsigned int* sampleRate, drwav_uint64* totalSampleCount); #endif -// Frees data that was allocated internally by dr_wav. -void drwav_free(void* pDataReturnedByOpenAndRead); + // Frees data that was allocated internally by dr_wav. + void drwav_free(void* pDataReturnedByOpenAndRead); #ifdef __cplusplus } #endif -#endif // dr_wav_h - +#endif // dr_wav_h ///////////////////////////////////////////////////// // @@ -688,9 +717,9 @@ void drwav_free(void* pDataReturnedByOpenAndRead); ///////////////////////////////////////////////////// #ifdef DR_WAV_IMPLEMENTATION +#include <limits.h> // For INT_MAX #include <stdlib.h> #include <string.h> // For memcpy(), memset() -#include <limits.h> // For INT_MAX #ifndef DR_WAV_NO_STDIO #include <stdio.h> @@ -699,36 +728,35 @@ void drwav_free(void* pDataReturnedByOpenAndRead); // Standard library stuff. #ifndef DRWAV_ASSERT #include <assert.h> -#define DRWAV_ASSERT(expression) assert(expression) +#define DRWAV_ASSERT(expression) assert(expression) #endif #ifndef DRWAV_MALLOC -#define DRWAV_MALLOC(sz) malloc((sz)) +#define DRWAV_MALLOC(sz) malloc((sz)) #endif #ifndef DRWAV_REALLOC -#define DRWAV_REALLOC(p, sz) realloc((p), (sz)) +#define DRWAV_REALLOC(p, sz) realloc((p), (sz)) #endif #ifndef DRWAV_FREE -#define DRWAV_FREE(p) free((p)) +#define DRWAV_FREE(p) free((p)) #endif #ifndef DRWAV_COPY_MEMORY -#define DRWAV_COPY_MEMORY(dst, src, sz) memcpy((dst), (src), (sz)) +#define DRWAV_COPY_MEMORY(dst, src, sz) memcpy((dst), (src), (sz)) #endif #ifndef DRWAV_ZERO_MEMORY -#define DRWAV_ZERO_MEMORY(p, sz) memset((p), 0, (sz)) +#define DRWAV_ZERO_MEMORY(p, sz) memset((p), 0, (sz)) #endif -#define drwav_countof(x) (sizeof(x) / sizeof(x[0])) -#define drwav_align(x, a) ((((x) + (a) - 1) / (a)) * (a)) -#define drwav_min(a, b) (((a) < (b)) ? (a) : (b)) -#define drwav_max(a, b) (((a) > (b)) ? (a) : (b)) -#define drwav_clamp(x, lo, hi) (drwav_max((lo), drwav_min((hi), (x)))) +#define drwav_countof(x) (sizeof(x) / sizeof(x[0])) +#define drwav_align(x, a) ((((x) + (a)-1) / (a)) * (a)) +#define drwav_min(a, b) (((a) < (b)) ? (a) : (b)) +#define drwav_max(a, b) (((a) > (b)) ? (a) : (b)) +#define drwav_clamp(x, lo, hi) (drwav_max((lo), drwav_min((hi), (x)))) -#define drwav_assert DRWAV_ASSERT -#define drwav_copy_memory DRWAV_COPY_MEMORY -#define drwav_zero_memory DRWAV_ZERO_MEMORY +#define drwav_assert DRWAV_ASSERT +#define drwav_copy_memory DRWAV_COPY_MEMORY +#define drwav_zero_memory DRWAV_ZERO_MEMORY - -#define DRWAV_MAX_SIMD_VECTOR_SIZE 64 // 64 for AVX-512 in the future. +#define DRWAV_MAX_SIMD_VECTOR_SIZE 64 // 64 for AVX-512 in the future. #ifdef _MSC_VER #define DRWAV_INLINE __forceinline @@ -741,45 +769,47 @@ void drwav_free(void* pDataReturnedByOpenAndRead); #endif #if defined(SIZE_MAX) - #define DRWAV_SIZE_MAX SIZE_MAX +#define DRWAV_SIZE_MAX SIZE_MAX +#else +#if defined(_WIN64) || defined(_LP64) || defined(__LP64__) +#define DRWAV_SIZE_MAX ((drwav_uint64)0xFFFFFFFFFFFFFFFF) #else - #if defined(_WIN64) || defined(_LP64) || defined(__LP64__) - #define DRWAV_SIZE_MAX ((drwav_uint64)0xFFFFFFFFFFFFFFFF) - #else - #define DRWAV_SIZE_MAX 0xFFFFFFFF - #endif +#define DRWAV_SIZE_MAX 0xFFFFFFFF +#endif #endif -static const drwav_uint8 drwavGUID_W64_RIFF[16] = {0x72,0x69,0x66,0x66, 0x2E,0x91, 0xCF,0x11, 0xA5,0xD6, 0x28,0xDB,0x04,0xC1,0x00,0x00}; // 66666972-912E-11CF-A5D6-28DB04C10000 -static const drwav_uint8 drwavGUID_W64_WAVE[16] = {0x77,0x61,0x76,0x65, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A}; // 65766177-ACF3-11D3-8CD1-00C04F8EDB8A -static const drwav_uint8 drwavGUID_W64_JUNK[16] = {0x6A,0x75,0x6E,0x6B, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A}; // 6B6E756A-ACF3-11D3-8CD1-00C04F8EDB8A -static const drwav_uint8 drwavGUID_W64_FMT [16] = {0x66,0x6D,0x74,0x20, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A}; // 20746D66-ACF3-11D3-8CD1-00C04F8EDB8A -static const drwav_uint8 drwavGUID_W64_FACT[16] = {0x66,0x61,0x63,0x74, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A}; // 74636166-ACF3-11D3-8CD1-00C04F8EDB8A -static const drwav_uint8 drwavGUID_W64_DATA[16] = {0x64,0x61,0x74,0x61, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A}; // 61746164-ACF3-11D3-8CD1-00C04F8EDB8A +static const drwav_uint8 drwavGUID_W64_RIFF[16] = { + 0x72, 0x69, 0x66, 0x66, 0x2E, 0x91, 0xCF, 0x11, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +}; // 66666972-912E-11CF-A5D6-28DB04C10000 +static const drwav_uint8 drwavGUID_W64_WAVE[16] = { + 0x77, 0x61, 0x76, 0x65, 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A +}; // 65766177-ACF3-11D3-8CD1-00C04F8EDB8A +static const drwav_uint8 drwavGUID_W64_JUNK[16] = { + 0x6A, 0x75, 0x6E, 0x6B, 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A +}; // 6B6E756A-ACF3-11D3-8CD1-00C04F8EDB8A +static const drwav_uint8 drwavGUID_W64_FMT[16] = { + 0x66, 0x6D, 0x74, 0x20, 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A +}; // 20746D66-ACF3-11D3-8CD1-00C04F8EDB8A +static const drwav_uint8 drwavGUID_W64_FACT[16] = { + 0x66, 0x61, 0x63, 0x74, 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A +}; // 74636166-ACF3-11D3-8CD1-00C04F8EDB8A +static const drwav_uint8 drwavGUID_W64_DATA[16] = { + 0x64, 0x61, 0x74, 0x61, 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A +}; // 61746164-ACF3-11D3-8CD1-00C04F8EDB8A static DRWAV_INLINE drwav_bool32 drwav__guid_equal(const drwav_uint8 a[16], const drwav_uint8 b[16]) { const drwav_uint32* a32 = (const drwav_uint32*)a; const drwav_uint32* b32 = (const drwav_uint32*)b; - return - a32[0] == b32[0] && - a32[1] == b32[1] && - a32[2] == b32[2] && - a32[3] == b32[3]; + return a32[0] == b32[0] && a32[1] == b32[1] && a32[2] == b32[2] && a32[3] == b32[3]; } static DRWAV_INLINE drwav_bool32 drwav__fourcc_equal(const unsigned char* a, const char* b) { - return - a[0] == b[0] && - a[1] == b[1] && - a[2] == b[2] && - a[3] == b[3]; + return a[0] == b[0] && a[1] == b[1] && a[2] == b[2] && a[3] == b[3]; } - - static DRWAV_INLINE int drwav__is_little_endian() { int n = 1; @@ -803,36 +833,36 @@ static DRWAV_INLINE unsigned int drwav__bytes_to_u32(const unsigned char* data) static DRWAV_INLINE drwav_uint64 drwav__bytes_to_u64(const unsigned char* data) { - return - ((drwav_uint64)data[0] << 0) | ((drwav_uint64)data[1] << 8) | ((drwav_uint64)data[2] << 16) | ((drwav_uint64)data[3] << 24) | - ((drwav_uint64)data[4] << 32) | ((drwav_uint64)data[5] << 40) | ((drwav_uint64)data[6] << 48) | ((drwav_uint64)data[7] << 56); + return ((drwav_uint64)data[0] << 0) | ((drwav_uint64)data[1] << 8) | ((drwav_uint64)data[2] << 16) | + ((drwav_uint64)data[3] << 24) | ((drwav_uint64)data[4] << 32) | ((drwav_uint64)data[5] << 40) | + ((drwav_uint64)data[6] << 48) | ((drwav_uint64)data[7] << 56); } static DRWAV_INLINE void drwav__bytes_to_guid(const unsigned char* data, drwav_uint8* guid) { - for (int i = 0; i < 16; ++i) { + for (int i = 0; i < 16; ++i) + { guid[i] = data[i]; } } - static DRWAV_INLINE drwav_bool32 drwav__is_compressed_format_tag(drwav_uint16 formatTag) { - return - formatTag == DR_WAVE_FORMAT_ADPCM || - formatTag == DR_WAVE_FORMAT_DVI_ADPCM; + return formatTag == DR_WAVE_FORMAT_ADPCM || formatTag == DR_WAVE_FORMAT_DVI_ADPCM; } - drwav_uint64 drwav_read_s16__msadpcm(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16* pBufferOut); drwav_uint64 drwav_read_s16__ima(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16* pBufferOut); -drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData); -drwav* drwav_open_write__internal(const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData); +drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount, drwav_bool32 isSequential, + drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData); +drwav* drwav_open_write__internal(const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, + drwav_bool32 isSequential, drwav_write_proc onWrite, drwav_seek_proc onSeek, + void* pUserData); typedef struct { - union - { + union { drwav_uint8 fourcc[4]; drwav_uint8 guid[16]; } id; @@ -846,32 +876,42 @@ typedef struct } drwav__chunk_header; -static drwav_bool32 drwav__read_chunk_header(drwav_read_proc onRead, void* pUserData, drwav_container container, drwav_uint64* pRunningBytesReadOut, drwav__chunk_header* pHeaderOut) +static drwav_bool32 drwav__read_chunk_header(drwav_read_proc onRead, void* pUserData, + drwav_container container, drwav_uint64* pRunningBytesReadOut, + drwav__chunk_header* pHeaderOut) { - if (container == drwav_container_riff) { - if (onRead(pUserData, pHeaderOut->id.fourcc, 4) != 4) { + if (container == drwav_container_riff) + { + if (onRead(pUserData, pHeaderOut->id.fourcc, 4) != 4) + { return DRWAV_FALSE; } unsigned char sizeInBytes[4]; - if (onRead(pUserData, sizeInBytes, 4) != 4) { + if (onRead(pUserData, sizeInBytes, 4) != 4) + { return DRWAV_FALSE; } pHeaderOut->sizeInBytes = drwav__bytes_to_u32(sizeInBytes); pHeaderOut->paddingSize = (unsigned int)(pHeaderOut->sizeInBytes % 2); *pRunningBytesReadOut += 8; - } else { - if (onRead(pUserData, pHeaderOut->id.guid, 16) != 16) { + } + else + { + if (onRead(pUserData, pHeaderOut->id.guid, 16) != 16) + { return DRWAV_FALSE; } unsigned char sizeInBytes[8]; - if (onRead(pUserData, sizeInBytes, 8) != 8) { + if (onRead(pUserData, sizeInBytes, 8) != 8) + { return DRWAV_FALSE; } - pHeaderOut->sizeInBytes = drwav__bytes_to_u64(sizeInBytes) - 24; // <-- Subtract 24 because w64 includes the size of the header. + pHeaderOut->sizeInBytes = drwav__bytes_to_u64(sizeInBytes) - + 24; // <-- Subtract 24 because w64 includes the size of the header. pHeaderOut->paddingSize = (unsigned int)(pHeaderOut->sizeInBytes % 8); *pRunningBytesReadOut += 24; } @@ -882,14 +922,20 @@ static drwav_bool32 drwav__read_chunk_header(drwav_read_proc onRead, void* pUser static drwav_bool32 drwav__seek_forward(drwav_seek_proc onSeek, drwav_uint64 offset, void* pUserData) { drwav_uint64 bytesRemainingToSeek = offset; - while (bytesRemainingToSeek > 0) { - if (bytesRemainingToSeek > 0x7FFFFFFF) { - if (!onSeek(pUserData, 0x7FFFFFFF, drwav_seek_origin_current)) { + while (bytesRemainingToSeek > 0) + { + if (bytesRemainingToSeek > 0x7FFFFFFF) + { + if (!onSeek(pUserData, 0x7FFFFFFF, drwav_seek_origin_current)) + { return DRWAV_FALSE; } bytesRemainingToSeek -= 0x7FFFFFFF; - } else { - if (!onSeek(pUserData, (int)bytesRemainingToSeek, drwav_seek_origin_current)) { + } + else + { + if (!onSeek(pUserData, (int)bytesRemainingToSeek, drwav_seek_origin_current)) + { return DRWAV_FALSE; } bytesRemainingToSeek = 0; @@ -899,43 +945,52 @@ static drwav_bool32 drwav__seek_forward(drwav_seek_proc onSeek, drwav_uint64 off return DRWAV_TRUE; } - -static drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, drwav_container container, drwav_uint64* pRunningBytesReadOut, drwav_fmt* fmtOut) +static drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, + drwav_container container, drwav_uint64* pRunningBytesReadOut, + drwav_fmt* fmtOut) { drwav__chunk_header header; - if (!drwav__read_chunk_header(onRead, pUserData, container, pRunningBytesReadOut, &header)) { + if (!drwav__read_chunk_header(onRead, pUserData, container, pRunningBytesReadOut, &header)) + { return DRWAV_FALSE; } - // Skip non-fmt chunks. - while ((container == drwav_container_riff && !drwav__fourcc_equal(header.id.fourcc, "fmt ")) || (container == drwav_container_w64 && !drwav__guid_equal(header.id.guid, drwavGUID_W64_FMT))) { - if (!drwav__seek_forward(onSeek, header.sizeInBytes + header.paddingSize, pUserData)) { + while ((container == drwav_container_riff && !drwav__fourcc_equal(header.id.fourcc, "fmt ")) || + (container == drwav_container_w64 && !drwav__guid_equal(header.id.guid, drwavGUID_W64_FMT))) + { + if (!drwav__seek_forward(onSeek, header.sizeInBytes + header.paddingSize, pUserData)) + { return DRWAV_FALSE; } *pRunningBytesReadOut += header.sizeInBytes + header.paddingSize; // Try the next header. - if (!drwav__read_chunk_header(onRead, pUserData, container, pRunningBytesReadOut, &header)) { + if (!drwav__read_chunk_header(onRead, pUserData, container, pRunningBytesReadOut, &header)) + { return DRWAV_FALSE; } } - // Validation. - if (container == drwav_container_riff) { - if (!drwav__fourcc_equal(header.id.fourcc, "fmt ")) { + if (container == drwav_container_riff) + { + if (!drwav__fourcc_equal(header.id.fourcc, "fmt ")) + { return DRWAV_FALSE; } - } else { - if (!drwav__guid_equal(header.id.guid, drwavGUID_W64_FMT)) { + } + else + { + if (!drwav__guid_equal(header.id.guid, drwavGUID_W64_FMT)) + { return DRWAV_FALSE; } } - unsigned char fmt[16]; - if (onRead(pUserData, fmt, sizeof(fmt)) != sizeof(fmt)) { + if (onRead(pUserData, fmt, sizeof(fmt)) != sizeof(fmt)) + { return DRWAV_FALSE; } *pRunningBytesReadOut += sizeof(fmt); @@ -952,35 +1007,45 @@ static drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSe fmtOut->channelMask = 0; memset(fmtOut->subFormat, 0, sizeof(fmtOut->subFormat)); - if (header.sizeInBytes > 16) { + if (header.sizeInBytes > 16) + { unsigned char fmt_cbSize[2]; - if (onRead(pUserData, fmt_cbSize, sizeof(fmt_cbSize)) != sizeof(fmt_cbSize)) { - return DRWAV_FALSE; // Expecting more data. + if (onRead(pUserData, fmt_cbSize, sizeof(fmt_cbSize)) != sizeof(fmt_cbSize)) + { + return DRWAV_FALSE; // Expecting more data. } *pRunningBytesReadOut += sizeof(fmt_cbSize); int bytesReadSoFar = 18; fmtOut->extendedSize = drwav__bytes_to_u16(fmt_cbSize); - if (fmtOut->extendedSize > 0) { + if (fmtOut->extendedSize > 0) + { // Simple validation. - if (fmtOut->formatTag == DR_WAVE_FORMAT_EXTENSIBLE) { - if (fmtOut->extendedSize != 22) { + if (fmtOut->formatTag == DR_WAVE_FORMAT_EXTENSIBLE) + { + if (fmtOut->extendedSize != 22) + { return DRWAV_FALSE; } } - if (fmtOut->formatTag == DR_WAVE_FORMAT_EXTENSIBLE) { + if (fmtOut->formatTag == DR_WAVE_FORMAT_EXTENSIBLE) + { unsigned char fmtext[22]; - if (onRead(pUserData, fmtext, fmtOut->extendedSize) != fmtOut->extendedSize) { - return DRWAV_FALSE; // Expecting more data. + if (onRead(pUserData, fmtext, fmtOut->extendedSize) != fmtOut->extendedSize) + { + return DRWAV_FALSE; // Expecting more data. } fmtOut->validBitsPerSample = drwav__bytes_to_u16(fmtext + 0); fmtOut->channelMask = drwav__bytes_to_u32(fmtext + 2); drwav__bytes_to_guid(fmtext + 6, fmtOut->subFormat); - } else { - if (!onSeek(pUserData, fmtOut->extendedSize, drwav_seek_origin_current)) { + } + else + { + if (!onSeek(pUserData, fmtOut->extendedSize, drwav_seek_origin_current)) + { return DRWAV_FALSE; } } @@ -990,14 +1055,17 @@ static drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSe } // Seek past any leftover bytes. For w64 the leftover will be defined based on the chunk size. - if (!onSeek(pUserData, (int)(header.sizeInBytes - bytesReadSoFar), drwav_seek_origin_current)) { + if (!onSeek(pUserData, (int)(header.sizeInBytes - bytesReadSoFar), drwav_seek_origin_current)) + { return DRWAV_FALSE; } *pRunningBytesReadOut += (header.sizeInBytes - bytesReadSoFar); } - if (header.paddingSize > 0) { - if (!onSeek(pUserData, header.paddingSize, drwav_seek_origin_current)) { + if (header.paddingSize > 0) + { + if (!onSeek(pUserData, header.paddingSize, drwav_seek_origin_current)) + { return DRWAV_FALSE; } *pRunningBytesReadOut += header.paddingSize; @@ -1006,18 +1074,19 @@ static drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSe return DRWAV_TRUE; } - #ifndef DR_WAV_NO_STDIO FILE* drwav_fopen(const char* filePath, const char* openMode) { FILE* pFile; #if defined(_MSC_VER) && _MSC_VER >= 1400 - if (fopen_s(&pFile, filePath, openMode) != 0) { + if (fopen_s(&pFile, filePath, openMode) != 0) + { return DRWAV_FALSE; } #else pFile = fopen(filePath, openMode); - if (pFile == NULL) { + if (pFile == NULL) + { return DRWAV_FALSE; } #endif @@ -1043,22 +1112,26 @@ static drwav_bool32 drwav__on_seek_stdio(void* pUserData, int offset, drwav_seek drwav_bool32 drwav_init_file(drwav* pWav, const char* filename) { FILE* pFile = drwav_fopen(filename, "rb"); - if (pFile == NULL) { + if (pFile == NULL) + { return DRWAV_FALSE; } return drwav_init(pWav, drwav__on_read_stdio, drwav__on_seek_stdio, (void*)pFile); } - -drwav_bool32 drwav_init_file_write__internal(drwav* pWav, const char* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential) +drwav_bool32 drwav_init_file_write__internal(drwav* pWav, const char* filename, + const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, + drwav_bool32 isSequential) { FILE* pFile = drwav_fopen(filename, "wb"); - if (pFile == NULL) { + if (pFile == NULL) + { return DRWAV_FALSE; } - return drwav_init_write__internal(pWav, pFormat, totalSampleCount, isSequential, drwav__on_write_stdio, drwav__on_seek_stdio, (void*)pFile); + return drwav_init_write__internal(pWav, pFormat, totalSampleCount, isSequential, drwav__on_write_stdio, + drwav__on_seek_stdio, (void*)pFile); } drwav_bool32 drwav_init_file_write(drwav* pWav, const char* filename, const drwav_data_format* pFormat) @@ -1066,7 +1139,8 @@ drwav_bool32 drwav_init_file_write(drwav* pWav, const char* filename, const drwa return drwav_init_file_write__internal(pWav, filename, pFormat, 0, DRWAV_FALSE); } -drwav_bool32 drwav_init_file_write_sequential(drwav* pWav, const char* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount) +drwav_bool32 drwav_init_file_write_sequential(drwav* pWav, const char* filename, + const drwav_data_format* pFormat, drwav_uint64 totalSampleCount) { return drwav_init_file_write__internal(pWav, filename, pFormat, totalSampleCount, DRWAV_TRUE); } @@ -1074,12 +1148,14 @@ drwav_bool32 drwav_init_file_write_sequential(drwav* pWav, const char* filename, drwav* drwav_open_file(const char* filename) { FILE* pFile = drwav_fopen(filename, "rb"); - if (pFile == NULL) { + if (pFile == NULL) + { return DRWAV_FALSE; } drwav* pWav = drwav_open(drwav__on_read_stdio, drwav__on_seek_stdio, (void*)pFile); - if (pWav == NULL) { + if (pWav == NULL) + { fclose(pFile); return NULL; } @@ -1087,16 +1163,19 @@ drwav* drwav_open_file(const char* filename) return pWav; } - -drwav* drwav_open_file_write__internal(const char* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential) +drwav* drwav_open_file_write__internal(const char* filename, const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount, drwav_bool32 isSequential) { FILE* pFile = drwav_fopen(filename, "wb"); - if (pFile == NULL) { + if (pFile == NULL) + { return DRWAV_FALSE; } - drwav* pWav = drwav_open_write__internal(pFormat, totalSampleCount, isSequential, drwav__on_write_stdio, drwav__on_seek_stdio, (void*)pFile); - if (pWav == NULL) { + drwav* pWav = drwav_open_write__internal(pFormat, totalSampleCount, isSequential, drwav__on_write_stdio, + drwav__on_seek_stdio, (void*)pFile); + if (pWav == NULL) + { fclose(pFile); return NULL; } @@ -1109,12 +1188,12 @@ drwav* drwav_open_file_write(const char* filename, const drwav_data_format* pFor return drwav_open_file_write__internal(filename, pFormat, 0, DRWAV_FALSE); } -drwav* drwav_open_file_write_sequential(const char* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount) +drwav* drwav_open_file_write_sequential(const char* filename, const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount) { return drwav_open_file_write__internal(filename, pFormat, totalSampleCount, DRWAV_TRUE); } -#endif //DR_WAV_NO_STDIO - +#endif // DR_WAV_NO_STDIO static size_t drwav__on_read_memory(void* pUserData, void* pBufferOut, size_t bytesToRead) { @@ -1123,11 +1202,13 @@ static size_t drwav__on_read_memory(void* pUserData, void* pBufferOut, size_t by drwav_assert(memory->dataSize >= memory->currentReadPos); size_t bytesRemaining = memory->dataSize - memory->currentReadPos; - if (bytesToRead > bytesRemaining) { + if (bytesToRead > bytesRemaining) + { bytesToRead = bytesRemaining; } - if (bytesToRead > 0) { + if (bytesToRead > 0) + { DRWAV_COPY_MEMORY(pBufferOut, memory->data + memory->currentReadPos, bytesToRead); memory->currentReadPos += bytesToRead; } @@ -1140,27 +1221,38 @@ static drwav_bool32 drwav__on_seek_memory(void* pUserData, int offset, drwav_see drwav__memory_stream* memory = (drwav__memory_stream*)pUserData; drwav_assert(memory != NULL); - if (origin == drwav_seek_origin_current) { - if (offset > 0) { - if (memory->currentReadPos + offset > memory->dataSize) { + if (origin == drwav_seek_origin_current) + { + if (offset > 0) + { + if (memory->currentReadPos + offset > memory->dataSize) + { return DRWAV_FALSE; // Trying to seek too far forward. } - } else { - if (memory->currentReadPos < (size_t)-offset) { + } + else + { + if (memory->currentReadPos < (size_t)-offset) + { return DRWAV_FALSE; // Trying to seek too far backwards. } } // This will never underflow thanks to the clamps above. memory->currentReadPos += offset; - } else { - if ((drwav_uint32)offset <= memory->dataSize) { + } + else + { + if ((drwav_uint32)offset <= memory->dataSize) + { memory->currentReadPos = offset; - } else { + } + else + { return DRWAV_FALSE; // Trying to seek too far forward. } } - + return DRWAV_TRUE; } @@ -1171,21 +1263,24 @@ static size_t drwav__on_write_memory(void* pUserData, const void* pDataIn, size_ drwav_assert(memory->dataCapacity >= memory->currentWritePos); size_t bytesRemaining = memory->dataCapacity - memory->currentWritePos; - if (bytesRemaining < bytesToWrite) { + if (bytesRemaining < bytesToWrite) + { // Need to reallocate. size_t newDataCapacity = (memory->dataCapacity == 0) ? 256 : memory->dataCapacity * 2; // If doubling wasn't enough, just make it the minimum required size to write the data. - if ((newDataCapacity - memory->currentWritePos) < bytesToWrite) { + if ((newDataCapacity - memory->currentWritePos) < bytesToWrite) + { newDataCapacity = memory->currentWritePos + bytesToWrite; } void* pNewData = DRWAV_REALLOC(*memory->ppData, newDataCapacity); - if (pNewData == NULL) { + if (pNewData == NULL) + { return 0; } - *memory->ppData = pNewData; + *memory->ppData = pNewData; memory->dataCapacity = newDataCapacity; } @@ -1193,7 +1288,8 @@ static size_t drwav__on_write_memory(void* pUserData, const void* pDataIn, size_ DRWAV_COPY_MEMORY(pDataOut + memory->currentWritePos, pDataIn, bytesToWrite); memory->currentWritePos += bytesToWrite; - if (memory->dataSize < memory->currentWritePos) { + if (memory->dataSize < memory->currentWritePos) + { memory->dataSize = memory->currentWritePos; } @@ -1207,136 +1303,160 @@ static drwav_bool32 drwav__on_seek_memory_write(void* pUserData, int offset, drw drwav__memory_stream_write* memory = (drwav__memory_stream_write*)pUserData; drwav_assert(memory != NULL); - if (origin == drwav_seek_origin_current) { - if (offset > 0) { - if (memory->currentWritePos + offset > memory->dataSize) { - offset = (int)(memory->dataSize - memory->currentWritePos); // Trying to seek too far forward. + if (origin == drwav_seek_origin_current) + { + if (offset > 0) + { + if (memory->currentWritePos + offset > memory->dataSize) + { + offset = (int)(memory->dataSize - memory->currentWritePos); // Trying to seek too far forward. } - } else { - if (memory->currentWritePos < (size_t)-offset) { - offset = -(int)memory->currentWritePos; // Trying to seek too far backwards. + } + else + { + if (memory->currentWritePos < (size_t)-offset) + { + offset = -(int)memory->currentWritePos; // Trying to seek too far backwards. } } // This will never underflow thanks to the clamps above. memory->currentWritePos += offset; - } else { - if ((drwav_uint32)offset <= memory->dataSize) { + } + else + { + if ((drwav_uint32)offset <= memory->dataSize) + { memory->currentWritePos = offset; - } else { - memory->currentWritePos = memory->dataSize; // Trying to seek too far forward. + } + else + { + memory->currentWritePos = memory->dataSize; // Trying to seek too far forward. } } - + return DRWAV_TRUE; } drwav_bool32 drwav_init_memory(drwav* pWav, const void* data, size_t dataSize) { - if (data == NULL || dataSize == 0) { + if (data == NULL || dataSize == 0) + { return DRWAV_FALSE; } drwav__memory_stream memoryStream; drwav_zero_memory(&memoryStream, sizeof(memoryStream)); - memoryStream.data = (const unsigned char*)data; - memoryStream.dataSize = dataSize; + memoryStream.data = (const unsigned char*)data; + memoryStream.dataSize = dataSize; memoryStream.currentReadPos = 0; - if (!drwav_init(pWav, drwav__on_read_memory, drwav__on_seek_memory, (void*)&memoryStream)) { + if (!drwav_init(pWav, drwav__on_read_memory, drwav__on_seek_memory, (void*)&memoryStream)) + { return DRWAV_FALSE; } pWav->memoryStream = memoryStream; - pWav->pUserData = &pWav->memoryStream; + pWav->pUserData = &pWav->memoryStream; return DRWAV_TRUE; } - -drwav_bool32 drwav_init_memory_write__internal(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential) +drwav_bool32 drwav_init_memory_write__internal(drwav* pWav, void** ppData, size_t* pDataSize, + const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount, drwav_bool32 isSequential) { - if (ppData == NULL) { + if (ppData == NULL) + { return DRWAV_FALSE; } - *ppData = NULL; // Important because we're using realloc()! + *ppData = NULL; // Important because we're using realloc()! *pDataSize = 0; drwav__memory_stream_write memoryStreamWrite; drwav_zero_memory(&memoryStreamWrite, sizeof(memoryStreamWrite)); - memoryStreamWrite.ppData = ppData; - memoryStreamWrite.pDataSize = pDataSize; - memoryStreamWrite.dataSize = 0; - memoryStreamWrite.dataCapacity = 0; + memoryStreamWrite.ppData = ppData; + memoryStreamWrite.pDataSize = pDataSize; + memoryStreamWrite.dataSize = 0; + memoryStreamWrite.dataCapacity = 0; memoryStreamWrite.currentWritePos = 0; - if (!drwav_init_write__internal(pWav, pFormat, totalSampleCount, isSequential, drwav__on_write_memory, drwav__on_seek_memory_write, (void*)&memoryStreamWrite)) { + if (!drwav_init_write__internal(pWav, pFormat, totalSampleCount, isSequential, drwav__on_write_memory, + drwav__on_seek_memory_write, (void*)&memoryStreamWrite)) + { return DRWAV_FALSE; } pWav->memoryStreamWrite = memoryStreamWrite; - pWav->pUserData = &pWav->memoryStreamWrite; + pWav->pUserData = &pWav->memoryStreamWrite; return DRWAV_TRUE; } -drwav_bool32 drwav_init_memory_write(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat) +drwav_bool32 drwav_init_memory_write(drwav* pWav, void** ppData, size_t* pDataSize, + const drwav_data_format* pFormat) { return drwav_init_memory_write__internal(pWav, ppData, pDataSize, pFormat, 0, DRWAV_FALSE); } -drwav_bool32 drwav_init_memory_write_sequential(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount) +drwav_bool32 drwav_init_memory_write_sequential(drwav* pWav, void** ppData, size_t* pDataSize, + const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount) { return drwav_init_memory_write__internal(pWav, ppData, pDataSize, pFormat, totalSampleCount, DRWAV_TRUE); } - drwav* drwav_open_memory(const void* data, size_t dataSize) { - if (data == NULL || dataSize == 0) { + if (data == NULL || dataSize == 0) + { return NULL; } drwav__memory_stream memoryStream; drwav_zero_memory(&memoryStream, sizeof(memoryStream)); - memoryStream.data = (const unsigned char*)data; - memoryStream.dataSize = dataSize; + memoryStream.data = (const unsigned char*)data; + memoryStream.dataSize = dataSize; memoryStream.currentReadPos = 0; drwav* pWav = drwav_open(drwav__on_read_memory, drwav__on_seek_memory, (void*)&memoryStream); - if (pWav == NULL) { + if (pWav == NULL) + { return NULL; } pWav->memoryStream = memoryStream; - pWav->pUserData = &pWav->memoryStream; + pWav->pUserData = &pWav->memoryStream; return pWav; } - -drwav* drwav_open_memory_write__internal(void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential) +drwav* drwav_open_memory_write__internal(void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount, drwav_bool32 isSequential) { - if (ppData == NULL) { + if (ppData == NULL) + { return NULL; } - *ppData = NULL; // Important because we're using realloc()! + *ppData = NULL; // Important because we're using realloc()! *pDataSize = 0; drwav__memory_stream_write memoryStreamWrite; drwav_zero_memory(&memoryStreamWrite, sizeof(memoryStreamWrite)); - memoryStreamWrite.ppData = ppData; - memoryStreamWrite.pDataSize = pDataSize; - memoryStreamWrite.dataSize = 0; - memoryStreamWrite.dataCapacity = 0; + memoryStreamWrite.ppData = ppData; + memoryStreamWrite.pDataSize = pDataSize; + memoryStreamWrite.dataSize = 0; + memoryStreamWrite.dataCapacity = 0; memoryStreamWrite.currentWritePos = 0; - drwav* pWav = drwav_open_write__internal(pFormat, totalSampleCount, isSequential, drwav__on_write_memory, drwav__on_seek_memory_write, (void*)&memoryStreamWrite); - if (pWav == NULL) { + drwav* pWav = drwav_open_write__internal(pFormat, totalSampleCount, isSequential, drwav__on_write_memory, + drwav__on_seek_memory_write, (void*)&memoryStreamWrite); + if (pWav == NULL) + { return NULL; } pWav->memoryStreamWrite = memoryStreamWrite; - pWav->pUserData = &pWav->memoryStreamWrite; + pWav->pUserData = &pWav->memoryStreamWrite; return pWav; } @@ -1345,158 +1465,194 @@ drwav* drwav_open_memory_write(void** ppData, size_t* pDataSize, const drwav_dat return drwav_open_memory_write__internal(ppData, pDataSize, pFormat, 0, DRWAV_FALSE); } -drwav* drwav_open_memory_write_sequential(void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount) +drwav* drwav_open_memory_write_sequential(void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount) { return drwav_open_memory_write__internal(ppData, pDataSize, pFormat, totalSampleCount, DRWAV_TRUE); } - drwav_bool32 drwav_init(drwav* pWav, drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData) { - if (onRead == NULL || onSeek == NULL) { + if (onRead == NULL || onSeek == NULL) + { return DRWAV_FALSE; } drwav_zero_memory(pWav, sizeof(*pWav)); - // The first 4 bytes should be the RIFF identifier. unsigned char riff[4]; - if (onRead(pUserData, riff, sizeof(riff)) != sizeof(riff)) { - return DRWAV_FALSE; // Failed to read data. + if (onRead(pUserData, riff, sizeof(riff)) != sizeof(riff)) + { + return DRWAV_FALSE; // Failed to read data. } - // The first 4 bytes can be used to identify the container. For RIFF files it will start with "RIFF" and for - // w64 it will start with "riff". - if (drwav__fourcc_equal(riff, "RIFF")) { + // The first 4 bytes can be used to identify the container. For RIFF files it will start with "RIFF" and + // for w64 it will start with "riff". + if (drwav__fourcc_equal(riff, "RIFF")) + { pWav->container = drwav_container_riff; - } else if (drwav__fourcc_equal(riff, "riff")) { + } + else if (drwav__fourcc_equal(riff, "riff")) + { pWav->container = drwav_container_w64; // Check the rest of the GUID for validity. drwav_uint8 riff2[12]; - if (onRead(pUserData, riff2, sizeof(riff2)) != sizeof(riff2)) { + if (onRead(pUserData, riff2, sizeof(riff2)) != sizeof(riff2)) + { return DRWAV_FALSE; } - for (int i = 0; i < 12; ++i) { - if (riff2[i] != drwavGUID_W64_RIFF[i+4]) { + for (int i = 0; i < 12; ++i) + { + if (riff2[i] != drwavGUID_W64_RIFF[i + 4]) + { return DRWAV_FALSE; } } - } else { - return DRWAV_FALSE; // Unknown or unsupported container. + } + else + { + return DRWAV_FALSE; // Unknown or unsupported container. } - - if (pWav->container == drwav_container_riff) { + if (pWav->container == drwav_container_riff) + { // RIFF/WAVE unsigned char chunkSizeBytes[4]; - if (onRead(pUserData, chunkSizeBytes, sizeof(chunkSizeBytes)) != sizeof(chunkSizeBytes)) { + if (onRead(pUserData, chunkSizeBytes, sizeof(chunkSizeBytes)) != sizeof(chunkSizeBytes)) + { return DRWAV_FALSE; } unsigned int chunkSize = drwav__bytes_to_u32(chunkSizeBytes); - if (chunkSize < 36) { - return DRWAV_FALSE; // Chunk size should always be at least 36 bytes. + if (chunkSize < 36) + { + return DRWAV_FALSE; // Chunk size should always be at least 36 bytes. } unsigned char wave[4]; - if (onRead(pUserData, wave, sizeof(wave)) != sizeof(wave)) { + if (onRead(pUserData, wave, sizeof(wave)) != sizeof(wave)) + { return DRWAV_FALSE; } - if (!drwav__fourcc_equal(wave, "WAVE")) { - return DRWAV_FALSE; // Expecting "WAVE". + if (!drwav__fourcc_equal(wave, "WAVE")) + { + return DRWAV_FALSE; // Expecting "WAVE". } pWav->dataChunkDataPos = 4 + sizeof(chunkSizeBytes) + sizeof(wave); - } else { + } + else + { // W64 unsigned char chunkSize[8]; - if (onRead(pUserData, chunkSize, sizeof(chunkSize)) != sizeof(chunkSize)) { + if (onRead(pUserData, chunkSize, sizeof(chunkSize)) != sizeof(chunkSize)) + { return DRWAV_FALSE; } - if (drwav__bytes_to_u64(chunkSize) < 80) { + if (drwav__bytes_to_u64(chunkSize) < 80) + { return DRWAV_FALSE; } drwav_uint8 wave[16]; - if (onRead(pUserData, wave, sizeof(wave)) != sizeof(wave)) { + if (onRead(pUserData, wave, sizeof(wave)) != sizeof(wave)) + { return DRWAV_FALSE; } - if (!drwav__guid_equal(wave, drwavGUID_W64_WAVE)) { + if (!drwav__guid_equal(wave, drwavGUID_W64_WAVE)) + { return DRWAV_FALSE; } pWav->dataChunkDataPos = 16 + sizeof(chunkSize) + sizeof(wave); } - // The next bytes should be the "fmt " chunk. drwav_fmt fmt; - if (!drwav__read_fmt(onRead, onSeek, pUserData, pWav->container, &pWav->dataChunkDataPos, &fmt)) { - return DRWAV_FALSE; // Failed to read the "fmt " chunk. + if (!drwav__read_fmt(onRead, onSeek, pUserData, pWav->container, &pWav->dataChunkDataPos, &fmt)) + { + return DRWAV_FALSE; // Failed to read the "fmt " chunk. } // Basic validation. - if (fmt.sampleRate == 0 || fmt.channels == 0 || fmt.bitsPerSample == 0 || fmt.blockAlign == 0) { + if (fmt.sampleRate == 0 || fmt.channels == 0 || fmt.bitsPerSample == 0 || fmt.blockAlign == 0) + { return DRWAV_FALSE; // Invalid channel count. Probably an invalid WAV file. } - // Translate the internal format. unsigned short translatedFormatTag = fmt.formatTag; - if (translatedFormatTag == DR_WAVE_FORMAT_EXTENSIBLE) { + if (translatedFormatTag == DR_WAVE_FORMAT_EXTENSIBLE) + { translatedFormatTag = drwav__bytes_to_u16(fmt.subFormat + 0); } - drwav_uint64 sampleCountFromFactChunk = 0; - // The next chunk we care about is the "data" chunk. This is not necessarily the next chunk so we'll need to loop. + // The next chunk we care about is the "data" chunk. This is not necessarily the next chunk so we'll need + // to loop. drwav_uint64 dataSize; for (;;) { drwav__chunk_header header; - if (!drwav__read_chunk_header(onRead, pUserData, pWav->container, &pWav->dataChunkDataPos, &header)) { + if (!drwav__read_chunk_header(onRead, pUserData, pWav->container, &pWav->dataChunkDataPos, &header)) + { return DRWAV_FALSE; } dataSize = header.sizeInBytes; - if (pWav->container == drwav_container_riff) { - if (drwav__fourcc_equal(header.id.fourcc, "data")) { + if (pWav->container == drwav_container_riff) + { + if (drwav__fourcc_equal(header.id.fourcc, "data")) + { break; } - } else { - if (drwav__guid_equal(header.id.guid, drwavGUID_W64_DATA)) { + } + else + { + if (drwav__guid_equal(header.id.guid, drwavGUID_W64_DATA)) + { break; } } // Optional. Get the total sample count from the FACT chunk. This is useful for compressed formats. - if (pWav->container == drwav_container_riff) { - if (drwav__fourcc_equal(header.id.fourcc, "fact")) { + if (pWav->container == drwav_container_riff) + { + if (drwav__fourcc_equal(header.id.fourcc, "fact")) + { drwav_uint32 sampleCount; - if (onRead(pUserData, &sampleCount, 4) != 4) { + if (onRead(pUserData, &sampleCount, 4) != 4) + { return DRWAV_FALSE; } pWav->dataChunkDataPos += 4; dataSize -= 4; - // The sample count in the "fact" chunk is either unreliable, or I'm not understanding it properly. For now I am only enabling this - // for Microsoft ADPCM formats. - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) { + // The sample count in the "fact" chunk is either unreliable, or I'm not understanding it + // properly. For now I am only enabling this for Microsoft ADPCM formats. + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) + { sampleCountFromFactChunk = sampleCount; - } else { + } + else + { sampleCountFromFactChunk = 0; } } - } else { - if (drwav__guid_equal(header.id.guid, drwavGUID_W64_FACT)) { - if (onRead(pUserData, &sampleCountFromFactChunk, 8) != 8) { + } + else + { + if (drwav__guid_equal(header.id.guid, drwavGUID_W64_FACT)) + { + if (onRead(pUserData, &sampleCountFromFactChunk, 8) != 8) + { return DRWAV_FALSE; } pWav->dataChunkDataPos += 8; @@ -1527,138 +1683,171 @@ drwav_bool32 drwav_init(drwav* pWav, drwav_read_proc onRead, drwav_seek_proc onS pWav->dataChunkDataSize = dataSize; // The bytes per sample should never be 0 at this point. This would indicate an invalid WAV file. - if (pWav->bytesPerSample == 0) { + if (pWav->bytesPerSample == 0) + { return DRWAV_FALSE; } - if (sampleCountFromFactChunk != 0) { + if (sampleCountFromFactChunk != 0) + { pWav->totalSampleCount = sampleCountFromFactChunk * fmt.channels; - } else { + } + else + { pWav->totalSampleCount = dataSize / pWav->bytesPerSample; - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) + { drwav_uint64 blockCount = dataSize / fmt.blockAlign; - pWav->totalSampleCount = (blockCount * (fmt.blockAlign - (6*pWav->channels))) * 2; // x2 because two samples per byte. + pWav->totalSampleCount = (blockCount * (fmt.blockAlign - (6 * pWav->channels))) * + 2; // x2 because two samples per byte. } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) + { drwav_uint64 blockCount = dataSize / fmt.blockAlign; - pWav->totalSampleCount = ((blockCount * (fmt.blockAlign - (4*pWav->channels))) * 2) + (blockCount * pWav->channels); + pWav->totalSampleCount = + ((blockCount * (fmt.blockAlign - (4 * pWav->channels))) * 2) + (blockCount * pWav->channels); } } - // The way we calculate the bytes per sample does not make sense for compressed formats so we just set it to 0. - if (drwav__is_compressed_format_tag(pWav->translatedFormatTag)) { + // The way we calculate the bytes per sample does not make sense for compressed formats so we just set it + // to 0. + if (drwav__is_compressed_format_tag(pWav->translatedFormatTag)) + { pWav->bytesPerSample = 0; } // Some formats only support a certain number of channels. - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM || pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) { - if (pWav->channels > 2) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM || + pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) + { + if (pWav->channels > 2) + { return DRWAV_FALSE; } } #ifdef DR_WAV_LIBSNDFILE_COMPAT - // I use libsndfile as a benchmark for testing, however in the version I'm using (from the Windows installer on the libsndfile website), - // it appears the total sample count libsndfile uses for MS-ADPCM is incorrect. It would seem they are computing the total sample count - // from the number of blocks, however this results in the inclusion of extra silent samples at the end of the last block. The correct - // way to know the total sample count is to inspect the "fact" chunk, which should always be present for compressed formats, and should - // always include the sample count. This little block of code below is only used to emulate the libsndfile logic so I can properly run my - // correctness tests against libsndfile, and is disabled by default. - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) { + // I use libsndfile as a benchmark for testing, however in the version I'm using (from the Windows + // installer on the libsndfile website), it appears the total sample count libsndfile uses for MS-ADPCM is + // incorrect. It would seem they are computing the total sample count from the number of blocks, however + // this results in the inclusion of extra silent samples at the end of the last block. The correct way to + // know the total sample count is to inspect the "fact" chunk, which should always be present for + // compressed formats, and should always include the sample count. This little block of code below is only + // used to emulate the libsndfile logic so I can properly run my correctness tests against libsndfile, and + // is disabled by default. + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) + { drwav_uint64 blockCount = dataSize / fmt.blockAlign; - pWav->totalSampleCount = (blockCount * (fmt.blockAlign - (6*pWav->channels))) * 2; // x2 because two samples per byte. + pWav->totalSampleCount = + (blockCount * (fmt.blockAlign - (6 * pWav->channels))) * 2; // x2 because two samples per byte. } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) + { drwav_uint64 blockCount = dataSize / fmt.blockAlign; - pWav->totalSampleCount = ((blockCount * (fmt.blockAlign - (4*pWav->channels))) * 2) + (blockCount * pWav->channels); + pWav->totalSampleCount = + ((blockCount * (fmt.blockAlign - (4 * pWav->channels))) * 2) + (blockCount * pWav->channels); } #endif return DRWAV_TRUE; } - drwav_uint32 drwav_riff_chunk_size_riff(drwav_uint64 dataChunkSize) { - if (dataChunkSize <= (0xFFFFFFFF - 36)) { + if (dataChunkSize <= (0xFFFFFFFF - 36)) + { return 36 + (drwav_uint32)dataChunkSize; - } else { + } + else + { return 0xFFFFFFFF; } } drwav_uint32 drwav_data_chunk_size_riff(drwav_uint64 dataChunkSize) { - if (dataChunkSize <= 0xFFFFFFFF) { + if (dataChunkSize <= 0xFFFFFFFF) + { return (drwav_uint32)dataChunkSize; - } else { + } + else + { return 0xFFFFFFFF; } } drwav_uint64 drwav_riff_chunk_size_w64(drwav_uint64 dataChunkSize) { - return 80 + 24 + dataChunkSize; // +24 because W64 includes the size of the GUID and size fields. + return 80 + 24 + dataChunkSize; // +24 because W64 includes the size of the GUID and size fields. } drwav_uint64 drwav_data_chunk_size_w64(drwav_uint64 dataChunkSize) { - return 24 + dataChunkSize; // +24 because W64 includes the size of the GUID and size fields. + return 24 + dataChunkSize; // +24 because W64 includes the size of the GUID and size fields. } - -drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData) +drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount, drwav_bool32 isSequential, + drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData) { - if (pWav == NULL) { + if (pWav == NULL) + { return DRWAV_FALSE; } - if (onWrite == NULL) { + if (onWrite == NULL) + { return DRWAV_FALSE; } - if (!isSequential && onSeek == NULL) { + if (!isSequential && onSeek == NULL) + { return DRWAV_FALSE; // <-- onSeek is required when in non-sequential mode. } - - // Not currently supporting compressed formats. Will need to add support for the "fact" chunk before we enable this. - if (pFormat->format == DR_WAVE_FORMAT_EXTENSIBLE) { + // Not currently supporting compressed formats. Will need to add support for the "fact" chunk before we + // enable this. + if (pFormat->format == DR_WAVE_FORMAT_EXTENSIBLE) + { return DRWAV_FALSE; } - if (pFormat->format == DR_WAVE_FORMAT_ADPCM || pFormat->format == DR_WAVE_FORMAT_DVI_ADPCM) { + if (pFormat->format == DR_WAVE_FORMAT_ADPCM || pFormat->format == DR_WAVE_FORMAT_DVI_ADPCM) + { return DRWAV_FALSE; } - drwav_zero_memory(pWav, sizeof(*pWav)); - pWav->onWrite = onWrite; - pWav->onSeek = onSeek; - pWav->pUserData = pUserData; - pWav->fmt.formatTag = (drwav_uint16)pFormat->format; - pWav->fmt.channels = (drwav_uint16)pFormat->channels; + pWav->onWrite = onWrite; + pWav->onSeek = onSeek; + pWav->pUserData = pUserData; + pWav->fmt.formatTag = (drwav_uint16)pFormat->format; + pWav->fmt.channels = (drwav_uint16)pFormat->channels; pWav->fmt.sampleRate = pFormat->sampleRate; - pWav->fmt.avgBytesPerSec = (drwav_uint32)((pFormat->bitsPerSample * pFormat->sampleRate * pFormat->channels) / 8); - pWav->fmt.blockAlign = (drwav_uint16)((pFormat->channels * pFormat->bitsPerSample) / 8); + pWav->fmt.avgBytesPerSec = + (drwav_uint32)((pFormat->bitsPerSample * pFormat->sampleRate * pFormat->channels) / 8); + pWav->fmt.blockAlign = (drwav_uint16)((pFormat->channels * pFormat->bitsPerSample) / 8); pWav->fmt.bitsPerSample = (drwav_uint16)pFormat->bitsPerSample; - pWav->fmt.extendedSize = 0; + pWav->fmt.extendedSize = 0; pWav->isSequentialWrite = isSequential; - size_t runningPos = 0; - // The initial values for the "RIFF" and "data" chunks depends on whether or not we are initializing in sequential mode or not. In - // sequential mode we set this to its final values straight away since they can be calculated from the total sample count. In non- - // sequential mode we initialize it all to zero and fill it out in drwav_uninit() using a backwards seek. + // The initial values for the "RIFF" and "data" chunks depends on whether or not we are initializing in + // sequential mode or not. In sequential mode we set this to its final values straight away since they can + // be calculated from the total sample count. In non- sequential mode we initialize it all to zero and + // fill it out in drwav_uninit() using a backwards seek. drwav_uint64 initialDataChunkSize = 0; - if (isSequential) { + if (isSequential) + { initialDataChunkSize = (totalSampleCount * pWav->fmt.bitsPerSample) / 8; - // The RIFF container has a limit on the number of samples. drwav is not allowing this. There's no practical limits for Wave64 - // so for the sake of simplicity I'm not doing any validation for that. - if (pFormat->container == drwav_container_riff) { - if (initialDataChunkSize > (0xFFFFFFFF - 36)) { + // The RIFF container has a limit on the number of samples. drwav is not allowing this. There's no + // practical limits for Wave64 so for the sake of simplicity I'm not doing any validation for that. + if (pFormat->container == drwav_container_riff) + { + if (initialDataChunkSize > (0xFFFFFFFF - 36)) + { return DRWAV_FALSE; // Not enough room to store every sample. } } @@ -1666,15 +1855,20 @@ drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_format* pF pWav->dataChunkDataSizeTargetWrite = initialDataChunkSize; - // "RIFF" chunk. - if (pFormat->container == drwav_container_riff) { - drwav_uint32 chunkSizeRIFF = 36 + (drwav_uint32)initialDataChunkSize; // +36 = "RIFF"+[RIFF Chunk Size]+"WAVE" + [sizeof "fmt " chunk] + if (pFormat->container == drwav_container_riff) + { + drwav_uint32 chunkSizeRIFF = + 36 + (drwav_uint32) + initialDataChunkSize; // +36 = "RIFF"+[RIFF Chunk Size]+"WAVE" + [sizeof "fmt " chunk] runningPos += pWav->onWrite(pUserData, "RIFF", 4); runningPos += pWav->onWrite(pUserData, &chunkSizeRIFF, 4); runningPos += pWav->onWrite(pUserData, "WAVE", 4); - } else { - drwav_uint64 chunkSizeRIFF = 80 + 24 + initialDataChunkSize; // +24 because W64 includes the size of the GUID and size fields. + } + else + { + drwav_uint64 chunkSizeRIFF = + 80 + 24 + initialDataChunkSize; // +24 because W64 includes the size of the GUID and size fields. runningPos += pWav->onWrite(pUserData, drwavGUID_W64_RIFF, 16); runningPos += pWav->onWrite(pUserData, &chunkSizeRIFF, 8); runningPos += pWav->onWrite(pUserData, drwavGUID_W64_WAVE, 16); @@ -1682,125 +1876,153 @@ drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_format* pF // "fmt " chunk. drwav_uint64 chunkSizeFMT; - if (pFormat->container == drwav_container_riff) { + if (pFormat->container == drwav_container_riff) + { chunkSizeFMT = 16; runningPos += pWav->onWrite(pUserData, "fmt ", 4); runningPos += pWav->onWrite(pUserData, &chunkSizeFMT, 4); - } else { + } + else + { chunkSizeFMT = 40; runningPos += pWav->onWrite(pUserData, drwavGUID_W64_FMT, 16); runningPos += pWav->onWrite(pUserData, &chunkSizeFMT, 8); } - runningPos += pWav->onWrite(pUserData, &pWav->fmt.formatTag, 2); - runningPos += pWav->onWrite(pUserData, &pWav->fmt.channels, 2); - runningPos += pWav->onWrite(pUserData, &pWav->fmt.sampleRate, 4); + runningPos += pWav->onWrite(pUserData, &pWav->fmt.formatTag, 2); + runningPos += pWav->onWrite(pUserData, &pWav->fmt.channels, 2); + runningPos += pWav->onWrite(pUserData, &pWav->fmt.sampleRate, 4); runningPos += pWav->onWrite(pUserData, &pWav->fmt.avgBytesPerSec, 4); - runningPos += pWav->onWrite(pUserData, &pWav->fmt.blockAlign, 2); - runningPos += pWav->onWrite(pUserData, &pWav->fmt.bitsPerSample, 2); + runningPos += pWav->onWrite(pUserData, &pWav->fmt.blockAlign, 2); + runningPos += pWav->onWrite(pUserData, &pWav->fmt.bitsPerSample, 2); pWav->dataChunkDataPos = runningPos; // "data" chunk. - if (pFormat->container == drwav_container_riff) { + if (pFormat->container == drwav_container_riff) + { drwav_uint32 chunkSizeDATA = (drwav_uint32)initialDataChunkSize; runningPos += pWav->onWrite(pUserData, "data", 4); runningPos += pWav->onWrite(pUserData, &chunkSizeDATA, 4); - } else { - drwav_uint64 chunkSizeDATA = 24 + initialDataChunkSize; // +24 because W64 includes the size of the GUID and size fields. + } + else + { + drwav_uint64 chunkSizeDATA = + 24 + initialDataChunkSize; // +24 because W64 includes the size of the GUID and size fields. runningPos += pWav->onWrite(pUserData, drwavGUID_W64_DATA, 16); runningPos += pWav->onWrite(pUserData, &chunkSizeDATA, 8); } - // Simple validation. - if (pFormat->container == drwav_container_riff) { - if (runningPos != 20 + chunkSizeFMT + 8) { + if (pFormat->container == drwav_container_riff) + { + if (runningPos != 20 + chunkSizeFMT + 8) + { return DRWAV_FALSE; } - } else { - if (runningPos != 40 + chunkSizeFMT + 24) { + } + else + { + if (runningPos != 40 + chunkSizeFMT + 24) + { return DRWAV_FALSE; } } - - // Set some properties for the client's convenience. - pWav->container = pFormat->container; - pWav->channels = (drwav_uint16)pFormat->channels; - pWav->sampleRate = pFormat->sampleRate; - pWav->bitsPerSample = (drwav_uint16)pFormat->bitsPerSample; - pWav->bytesPerSample = (drwav_uint16)(pFormat->bitsPerSample >> 3); + pWav->container = pFormat->container; + pWav->channels = (drwav_uint16)pFormat->channels; + pWav->sampleRate = pFormat->sampleRate; + pWav->bitsPerSample = (drwav_uint16)pFormat->bitsPerSample; + pWav->bytesPerSample = (drwav_uint16)(pFormat->bitsPerSample >> 3); pWav->translatedFormatTag = (drwav_uint16)pFormat->format; return DRWAV_TRUE; } - -drwav_bool32 drwav_init_write(drwav* pWav, const drwav_data_format* pFormat, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData) +drwav_bool32 drwav_init_write(drwav* pWav, const drwav_data_format* pFormat, drwav_write_proc onWrite, + drwav_seek_proc onSeek, void* pUserData) { - return drwav_init_write__internal(pWav, pFormat, 0, DRWAV_FALSE, onWrite, onSeek, pUserData); // DRWAV_FALSE = Not Sequential + return drwav_init_write__internal(pWav, pFormat, 0, DRWAV_FALSE, onWrite, onSeek, + pUserData); // DRWAV_FALSE = Not Sequential } -drwav_bool32 drwav_init_write_sequential(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_write_proc onWrite, void* pUserData) +drwav_bool32 drwav_init_write_sequential(drwav* pWav, const drwav_data_format* pFormat, + drwav_uint64 totalSampleCount, drwav_write_proc onWrite, + void* pUserData) { - return drwav_init_write__internal(pWav, pFormat, totalSampleCount, DRWAV_TRUE, onWrite, NULL, pUserData); // DRWAV_TRUE = Sequential + return drwav_init_write__internal(pWav, pFormat, totalSampleCount, DRWAV_TRUE, onWrite, NULL, + pUserData); // DRWAV_TRUE = Sequential } void drwav_uninit(drwav* pWav) { - if (pWav == NULL) { + if (pWav == NULL) + { return; } // If the drwav object was opened in write mode we'll need to finalize a few things: - // - Make sure the "data" chunk is aligned to 16-bits for RIFF containers, or 64 bits for W64 containers. + // - Make sure the "data" chunk is aligned to 16-bits for RIFF containers, or 64 bits for W64 + // containers. // - Set the size of the "data" chunk. - if (pWav->onWrite != NULL) { + if (pWav->onWrite != NULL) + { // Validation for sequential mode. - if (pWav->isSequentialWrite) { + if (pWav->isSequentialWrite) + { drwav_assert(pWav->dataChunkDataSize == pWav->dataChunkDataSizeTargetWrite); } // Padding. Do not adjust pWav->dataChunkDataSize - this should not include the padding. drwav_uint32 paddingSize = 0; - if (pWav->container == drwav_container_riff) { + if (pWav->container == drwav_container_riff) + { paddingSize = (drwav_uint32)(pWav->dataChunkDataSize % 2); - } else { + } + else + { paddingSize = (drwav_uint32)(pWav->dataChunkDataSize % 8); } - - if (paddingSize > 0) { + + if (paddingSize > 0) + { drwav_uint64 paddingData = 0; pWav->onWrite(pWav->pUserData, &paddingData, paddingSize); } - - // Chunk sizes. When using sequential mode, these will have been filled in at initialization time. We only need - // to do this when using non-sequential mode. - if (pWav->onSeek && !pWav->isSequentialWrite) { - if (pWav->container == drwav_container_riff) { + // Chunk sizes. When using sequential mode, these will have been filled in at initialization time. We + // only need to do this when using non-sequential mode. + if (pWav->onSeek && !pWav->isSequentialWrite) + { + if (pWav->container == drwav_container_riff) + { // The "RIFF" chunk size. - if (pWav->onSeek(pWav->pUserData, 4, drwav_seek_origin_start)) { + if (pWav->onSeek(pWav->pUserData, 4, drwav_seek_origin_start)) + { drwav_uint32 riffChunkSize = drwav_riff_chunk_size_riff(pWav->dataChunkDataSize); pWav->onWrite(pWav->pUserData, &riffChunkSize, 4); } // the "data" chunk size. - if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos + 4, drwav_seek_origin_start)) { + if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos + 4, drwav_seek_origin_start)) + { drwav_uint32 dataChunkSize = drwav_data_chunk_size_riff(pWav->dataChunkDataSize); pWav->onWrite(pWav->pUserData, &dataChunkSize, 4); } - } else { + } + else + { // The "RIFF" chunk size. - if (pWav->onSeek(pWav->pUserData, 16, drwav_seek_origin_start)) { + if (pWav->onSeek(pWav->pUserData, 16, drwav_seek_origin_start)) + { drwav_uint64 riffChunkSize = drwav_riff_chunk_size_w64(pWav->dataChunkDataSize); pWav->onWrite(pWav->pUserData, &riffChunkSize, 8); } // The "data" chunk size. - if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos + 16, drwav_seek_origin_start)) { + if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos + 16, drwav_seek_origin_start)) + { drwav_uint64 dataChunkSize = drwav_data_chunk_size_w64(pWav->dataChunkDataSize); pWav->onWrite(pWav->pUserData, &dataChunkSize, 8); } @@ -1809,23 +2031,25 @@ void drwav_uninit(drwav* pWav) } #ifndef DR_WAV_NO_STDIO - // If we opened the file with drwav_open_file() we will want to close the file handle. We can know whether or not drwav_open_file() - // was used by looking at the onRead and onSeek callbacks. - if (pWav->onRead == drwav__on_read_stdio || pWav->onWrite == drwav__on_write_stdio) { + // If we opened the file with drwav_open_file() we will want to close the file handle. We can know whether + // or not drwav_open_file() was used by looking at the onRead and onSeek callbacks. + if (pWav->onRead == drwav__on_read_stdio || pWav->onWrite == drwav__on_write_stdio) + { fclose((FILE*)pWav->pUserData); } #endif } - drwav* drwav_open(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData) { drwav* pWav = (drwav*)DRWAV_MALLOC(sizeof(*pWav)); - if (pWav == NULL) { + if (pWav == NULL) + { return NULL; } - if (!drwav_init(pWav, onRead, onSeek, pUserData)) { + if (!drwav_init(pWav, onRead, onSeek, pUserData)) + { DRWAV_FREE(pWav); return NULL; } @@ -1833,15 +2057,19 @@ drwav* drwav_open(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserDat return pWav; } - -drwav* drwav_open_write__internal(const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData) +drwav* drwav_open_write__internal(const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, + drwav_bool32 isSequential, drwav_write_proc onWrite, drwav_seek_proc onSeek, + void* pUserData) { drwav* pWav = (drwav*)DRWAV_MALLOC(sizeof(*pWav)); - if (pWav == NULL) { + if (pWav == NULL) + { return NULL; } - if (!drwav_init_write__internal(pWav, pFormat, totalSampleCount, isSequential, onWrite, onSeek, pUserData)) { + if (!drwav_init_write__internal(pWav, pFormat, totalSampleCount, isSequential, onWrite, onSeek, + pUserData)) + { DRWAV_FREE(pWav); return NULL; } @@ -1849,12 +2077,14 @@ drwav* drwav_open_write__internal(const drwav_data_format* pFormat, drwav_uint64 return pWav; } -drwav* drwav_open_write(const drwav_data_format* pFormat, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData) +drwav* drwav_open_write(const drwav_data_format* pFormat, drwav_write_proc onWrite, drwav_seek_proc onSeek, + void* pUserData) { return drwav_open_write__internal(pFormat, 0, DRWAV_FALSE, onWrite, onSeek, pUserData); } -drwav* drwav_open_write_sequential(const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_write_proc onWrite, void* pUserData) +drwav* drwav_open_write_sequential(const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, + drwav_write_proc onWrite, void* pUserData) { return drwav_open_write__internal(pFormat, totalSampleCount, DRWAV_TRUE, onWrite, NULL, pUserData); } @@ -1865,14 +2095,15 @@ void drwav_close(drwav* pWav) DRWAV_FREE(pWav); } - size_t drwav_read_raw(drwav* pWav, size_t bytesToRead, void* pBufferOut) { - if (pWav == NULL || bytesToRead == 0 || pBufferOut == NULL) { + if (pWav == NULL || bytesToRead == 0 || pBufferOut == NULL) + { return 0; } - if (bytesToRead > pWav->bytesRemaining) { + if (bytesToRead > pWav->bytesRemaining) + { bytesToRead = (size_t)pWav->bytesRemaining; } @@ -1884,17 +2115,20 @@ size_t drwav_read_raw(drwav* pWav, size_t bytesToRead, void* pBufferOut) drwav_uint64 drwav_read(drwav* pWav, drwav_uint64 samplesToRead, void* pBufferOut) { - if (pWav == NULL || samplesToRead == 0 || pBufferOut == NULL) { + if (pWav == NULL || samplesToRead == 0 || pBufferOut == NULL) + { return 0; } // Cannot use this function for compressed formats. - if (drwav__is_compressed_format_tag(pWav->translatedFormatTag)) { + if (drwav__is_compressed_format_tag(pWav->translatedFormatTag)) + { return 0; } // Don't try to read more samples than can potentially fit in the output buffer. - if (samplesToRead * pWav->bytesPerSample > DRWAV_SIZE_MAX) { + if (samplesToRead * pWav->bytesPerSample > DRWAV_SIZE_MAX) + { samplesToRead = DRWAV_SIZE_MAX / pWav->bytesPerSample; } @@ -1904,18 +2138,21 @@ drwav_uint64 drwav_read(drwav* pWav, drwav_uint64 samplesToRead, void* pBufferOu drwav_bool32 drwav_seek_to_first_sample(drwav* pWav) { - if (pWav->onWrite != NULL) { + if (pWav->onWrite != NULL) + { return DRWAV_FALSE; // No seeking in write mode. } - if (!pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos, drwav_seek_origin_start)) { + if (!pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos, drwav_seek_origin_start)) + { return DRWAV_FALSE; } - if (drwav__is_compressed_format_tag(pWav->translatedFormatTag)) { + if (drwav__is_compressed_format_tag(pWav->translatedFormatTag)) + { pWav->compressed.iCurrentSample = 0; } - + pWav->bytesRemaining = pWav->dataChunkDataSize; return DRWAV_TRUE; } @@ -1924,65 +2161,84 @@ drwav_bool32 drwav_seek_to_sample(drwav* pWav, drwav_uint64 sample) { // Seeking should be compatible with wave files > 2GB. - if (pWav->onWrite != NULL) { + if (pWav->onWrite != NULL) + { return DRWAV_FALSE; // No seeking in write mode. } - if (pWav == NULL || pWav->onSeek == NULL) { + if (pWav == NULL || pWav->onSeek == NULL) + { return DRWAV_FALSE; } // If there are no samples, just return DRWAV_TRUE without doing anything. - if (pWav->totalSampleCount == 0) { + if (pWav->totalSampleCount == 0) + { return DRWAV_TRUE; } // Make sure the sample is clamped. - if (sample >= pWav->totalSampleCount) { - sample = pWav->totalSampleCount - 1; + if (sample >= pWav->totalSampleCount) + { + sample = pWav->totalSampleCount - 1; } - - // For compressed formats we just use a slow generic seek. If we are seeking forward we just seek forward. If we are going backwards we need - // to seek back to the start. - if (drwav__is_compressed_format_tag(pWav->translatedFormatTag)) { + // For compressed formats we just use a slow generic seek. If we are seeking forward we just seek forward. + // If we are going backwards we need to seek back to the start. + if (drwav__is_compressed_format_tag(pWav->translatedFormatTag)) + { // TODO: This can be optimized. - - // If we're seeking forward it's simple - just keep reading samples until we hit the sample we're requesting. If we're seeking backwards, - // we first need to seek back to the start and then just do the same thing as a forward seek. - if (sample < pWav->compressed.iCurrentSample) { - if (!drwav_seek_to_first_sample(pWav)) { + + // If we're seeking forward it's simple - just keep reading samples until we hit the sample we're + // requesting. If we're seeking backwards, we first need to seek back to the start and then just do + // the same thing as a forward seek. + if (sample < pWav->compressed.iCurrentSample) + { + if (!drwav_seek_to_first_sample(pWav)) + { return DRWAV_FALSE; } } - if (sample > pWav->compressed.iCurrentSample) { + if (sample > pWav->compressed.iCurrentSample) + { drwav_uint64 offset = sample - pWav->compressed.iCurrentSample; drwav_int16 devnull[2048]; - while (offset > 0) { + while (offset > 0) + { drwav_uint64 samplesToRead = offset; - if (samplesToRead > 2048) { + if (samplesToRead > 2048) + { samplesToRead = 2048; } drwav_uint64 samplesRead = 0; - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) + { samplesRead = drwav_read_s16__msadpcm(pWav, samplesToRead, devnull); - } else if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) { + } + else if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) + { samplesRead = drwav_read_s16__ima(pWav, samplesToRead, devnull); - } else { - assert(DRWAV_FALSE); // If this assertion is triggered it means I've implemented a new compressed format but forgot to add a branch for it here. + } + else + { + assert(DRWAV_FALSE); // If this assertion is triggered it means I've implemented a new + // compressed format but forgot to add a branch for it here. } - if (samplesRead != samplesToRead) { + if (samplesRead != samplesToRead) + { return DRWAV_FALSE; } offset -= samplesRead; } } - } else { + } + else + { drwav_uint64 totalSizeInBytes = pWav->totalSampleCount * pWav->bytesPerSample; drwav_assert(totalSizeInBytes >= pWav->bytesRemaining); @@ -1990,20 +2246,26 @@ drwav_bool32 drwav_seek_to_sample(drwav* pWav, drwav_uint64 sample) drwav_uint64 targetBytePos = sample * pWav->bytesPerSample; drwav_uint64 offset; - if (currentBytePos < targetBytePos) { + if (currentBytePos < targetBytePos) + { // Offset forwards. offset = (targetBytePos - currentBytePos); - } else { + } + else + { // Offset backwards. - if (!drwav_seek_to_first_sample(pWav)) { + if (!drwav_seek_to_first_sample(pWav)) + { return DRWAV_FALSE; } offset = targetBytePos; } - while (offset > 0) { + while (offset > 0) + { int offset32 = ((offset > INT_MAX) ? INT_MAX : (int)offset); - if (!pWav->onSeek(pWav->pUserData, offset32, drwav_seek_origin_current)) { + if (!pWav->onSeek(pWav->pUserData, offset32, drwav_seek_origin_current)) + { return DRWAV_FALSE; } @@ -2015,10 +2277,10 @@ drwav_bool32 drwav_seek_to_sample(drwav* pWav, drwav_uint64 sample) return DRWAV_TRUE; } - size_t drwav_write_raw(drwav* pWav, size_t bytesToWrite, const void* pData) { - if (pWav == NULL || bytesToWrite == 0 || pData == NULL) { + if (pWav == NULL || bytesToWrite == 0 || pData == NULL) + { return 0; } @@ -2030,25 +2292,30 @@ size_t drwav_write_raw(drwav* pWav, size_t bytesToWrite, const void* pData) drwav_uint64 drwav_write(drwav* pWav, drwav_uint64 samplesToWrite, const void* pData) { - if (pWav == NULL || samplesToWrite == 0 || pData == NULL) { + if (pWav == NULL || samplesToWrite == 0 || pData == NULL) + { return 0; } drwav_uint64 bytesToWrite = ((samplesToWrite * pWav->bitsPerSample) / 8); - if (bytesToWrite > DRWAV_SIZE_MAX) { + if (bytesToWrite > DRWAV_SIZE_MAX) + { return 0; } - drwav_uint64 bytesWritten = 0; + drwav_uint64 bytesWritten = 0; const drwav_uint8* pRunningData = (const drwav_uint8*)pData; - while (bytesToWrite > 0) { + while (bytesToWrite > 0) + { drwav_uint64 bytesToWriteThisIteration = bytesToWrite; - if (bytesToWriteThisIteration > DRWAV_SIZE_MAX) { + if (bytesToWriteThisIteration > DRWAV_SIZE_MAX) + { bytesToWriteThisIteration = DRWAV_SIZE_MAX; } size_t bytesJustWritten = drwav_write_raw(pWav, (size_t)bytesToWriteThisIteration, pRunningData); - if (bytesJustWritten == 0) { + if (bytesJustWritten == 0) + { break; } @@ -2060,8 +2327,6 @@ drwav_uint64 drwav_write(drwav* pWav, drwav_uint64 samplesToWrite, const void* p return (bytesWritten * 8) / pWav->bitsPerSample; } - - drwav_uint64 drwav_read_s16__msadpcm(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16* pBufferOut) { drwav_assert(pWav != NULL); @@ -2072,52 +2337,63 @@ drwav_uint64 drwav_read_s16__msadpcm(drwav* pWav, drwav_uint64 samplesToRead, dr drwav_uint64 totalSamplesRead = 0; - while (samplesToRead > 0 && pWav->compressed.iCurrentSample < pWav->totalSampleCount) { + while (samplesToRead > 0 && pWav->compressed.iCurrentSample < pWav->totalSampleCount) + { // If there are no cached samples we need to load a new block. - if (pWav->msadpcm.cachedSampleCount == 0 && pWav->msadpcm.bytesRemainingInBlock == 0) { - if (pWav->channels == 1) { + if (pWav->msadpcm.cachedSampleCount == 0 && pWav->msadpcm.bytesRemainingInBlock == 0) + { + if (pWav->channels == 1) + { // Mono. drwav_uint8 header[7]; - if (pWav->onRead(pWav->pUserData, header, sizeof(header)) != sizeof(header)) { + if (pWav->onRead(pWav->pUserData, header, sizeof(header)) != sizeof(header)) + { return totalSamplesRead; } pWav->msadpcm.bytesRemainingInBlock = pWav->fmt.blockAlign - sizeof(header); - pWav->msadpcm.predictor[0] = header[0]; - pWav->msadpcm.delta[0] = drwav__bytes_to_s16(header + 1); + pWav->msadpcm.predictor[0] = header[0]; + pWav->msadpcm.delta[0] = drwav__bytes_to_s16(header + 1); pWav->msadpcm.prevSamples[0][1] = (drwav_int32)drwav__bytes_to_s16(header + 3); pWav->msadpcm.prevSamples[0][0] = (drwav_int32)drwav__bytes_to_s16(header + 5); - pWav->msadpcm.cachedSamples[2] = pWav->msadpcm.prevSamples[0][0]; - pWav->msadpcm.cachedSamples[3] = pWav->msadpcm.prevSamples[0][1]; + pWav->msadpcm.cachedSamples[2] = pWav->msadpcm.prevSamples[0][0]; + pWav->msadpcm.cachedSamples[3] = pWav->msadpcm.prevSamples[0][1]; pWav->msadpcm.cachedSampleCount = 2; - } else { + } + else + { // Stereo. drwav_uint8 header[14]; - if (pWav->onRead(pWav->pUserData, header, sizeof(header)) != sizeof(header)) { + if (pWav->onRead(pWav->pUserData, header, sizeof(header)) != sizeof(header)) + { return totalSamplesRead; } pWav->msadpcm.bytesRemainingInBlock = pWav->fmt.blockAlign - sizeof(header); - pWav->msadpcm.predictor[0] = header[0]; - pWav->msadpcm.predictor[1] = header[1]; - pWav->msadpcm.delta[0] = drwav__bytes_to_s16(header + 2); - pWav->msadpcm.delta[1] = drwav__bytes_to_s16(header + 4); + pWav->msadpcm.predictor[0] = header[0]; + pWav->msadpcm.predictor[1] = header[1]; + pWav->msadpcm.delta[0] = drwav__bytes_to_s16(header + 2); + pWav->msadpcm.delta[1] = drwav__bytes_to_s16(header + 4); pWav->msadpcm.prevSamples[0][1] = (drwav_int32)drwav__bytes_to_s16(header + 6); pWav->msadpcm.prevSamples[1][1] = (drwav_int32)drwav__bytes_to_s16(header + 8); pWav->msadpcm.prevSamples[0][0] = (drwav_int32)drwav__bytes_to_s16(header + 10); pWav->msadpcm.prevSamples[1][0] = (drwav_int32)drwav__bytes_to_s16(header + 12); - pWav->msadpcm.cachedSamples[0] = pWav->msadpcm.prevSamples[0][0]; - pWav->msadpcm.cachedSamples[1] = pWav->msadpcm.prevSamples[1][0]; - pWav->msadpcm.cachedSamples[2] = pWav->msadpcm.prevSamples[0][1]; - pWav->msadpcm.cachedSamples[3] = pWav->msadpcm.prevSamples[1][1]; + pWav->msadpcm.cachedSamples[0] = pWav->msadpcm.prevSamples[0][0]; + pWav->msadpcm.cachedSamples[1] = pWav->msadpcm.prevSamples[1][0]; + pWav->msadpcm.cachedSamples[2] = pWav->msadpcm.prevSamples[0][1]; + pWav->msadpcm.cachedSamples[3] = pWav->msadpcm.prevSamples[1][1]; pWav->msadpcm.cachedSampleCount = 4; } } // Output anything that's cached. - while (samplesToRead > 0 && pWav->msadpcm.cachedSampleCount > 0 && pWav->compressed.iCurrentSample < pWav->totalSampleCount) { - pBufferOut[0] = (drwav_int16)pWav->msadpcm.cachedSamples[drwav_countof(pWav->msadpcm.cachedSamples) - pWav->msadpcm.cachedSampleCount]; + while (samplesToRead > 0 && pWav->msadpcm.cachedSampleCount > 0 && + pWav->compressed.iCurrentSample < pWav->totalSampleCount) + { + pBufferOut[0] = + (drwav_int16)pWav->msadpcm.cachedSamples[drwav_countof(pWav->msadpcm.cachedSamples) - + pWav->msadpcm.cachedSampleCount]; pWav->msadpcm.cachedSampleCount -= 1; pBufferOut += 1; @@ -2126,101 +2402,133 @@ drwav_uint64 drwav_read_s16__msadpcm(drwav* pWav, drwav_uint64 samplesToRead, dr pWav->compressed.iCurrentSample += 1; } - if (samplesToRead == 0) { + if (samplesToRead == 0) + { return totalSamplesRead; } - - // If there's nothing left in the cache, just go ahead and load more. If there's nothing left to load in the current block we just continue to the next - // loop iteration which will trigger the loading of a new block. - if (pWav->msadpcm.cachedSampleCount == 0) { - if (pWav->msadpcm.bytesRemainingInBlock == 0) { + // If there's nothing left in the cache, just go ahead and load more. If there's nothing left to load + // in the current block we just continue to the next loop iteration which will trigger the loading of + // a new block. + if (pWav->msadpcm.cachedSampleCount == 0) + { + if (pWav->msadpcm.bytesRemainingInBlock == 0) + { continue; - } else { + } + else + { drwav_uint8 nibbles; - if (pWav->onRead(pWav->pUserData, &nibbles, 1) != 1) { + if (pWav->onRead(pWav->pUserData, &nibbles, 1) != 1) + { return totalSamplesRead; } pWav->msadpcm.bytesRemainingInBlock -= 1; // TODO: Optimize away these if statements. - drwav_int32 nibble0 = ((nibbles & 0xF0) >> 4); if ((nibbles & 0x80)) { nibble0 |= 0xFFFFFFF0UL; } - drwav_int32 nibble1 = ((nibbles & 0x0F) >> 0); if ((nibbles & 0x08)) { nibble1 |= 0xFFFFFFF0UL; } + drwav_int32 nibble0 = ((nibbles & 0xF0) >> 4); + if ((nibbles & 0x80)) + { + nibble0 |= 0xFFFFFFF0UL; + } + drwav_int32 nibble1 = ((nibbles & 0x0F) >> 0); + if ((nibbles & 0x08)) + { + nibble1 |= 0xFFFFFFF0UL; + } - static drwav_int32 adaptationTable[] = { - 230, 230, 230, 230, 307, 409, 512, 614, - 768, 614, 512, 409, 307, 230, 230, 230 - }; - static drwav_int32 coeff1Table[] = { 256, 512, 0, 192, 240, 460, 392 }; - static drwav_int32 coeff2Table[] = { 0, -256, 0, 64, 0, -208, -232 }; + static drwav_int32 adaptationTable[] = { 230, 230, 230, 230, 307, 409, 512, 614, + 768, 614, 512, 409, 307, 230, 230, 230 }; + static drwav_int32 coeff1Table[] = { 256, 512, 0, 192, 240, 460, 392 }; + static drwav_int32 coeff2Table[] = { 0, -256, 0, 64, 0, -208, -232 }; - if (pWav->channels == 1) { + if (pWav->channels == 1) + { // Mono. drwav_int32 newSample0; - newSample0 = ((pWav->msadpcm.prevSamples[0][1] * coeff1Table[pWav->msadpcm.predictor[0]]) + (pWav->msadpcm.prevSamples[0][0] * coeff2Table[pWav->msadpcm.predictor[0]])) >> 8; + newSample0 = + ((pWav->msadpcm.prevSamples[0][1] * coeff1Table[pWav->msadpcm.predictor[0]]) + + (pWav->msadpcm.prevSamples[0][0] * coeff2Table[pWav->msadpcm.predictor[0]])) >> + 8; newSample0 += nibble0 * pWav->msadpcm.delta[0]; - newSample0 = drwav_clamp(newSample0, -32768, 32767); + newSample0 = drwav_clamp(newSample0, -32768, 32767); - pWav->msadpcm.delta[0] = (adaptationTable[((nibbles & 0xF0) >> 4)] * pWav->msadpcm.delta[0]) >> 8; - if (pWav->msadpcm.delta[0] < 16) { + pWav->msadpcm.delta[0] = + (adaptationTable[((nibbles & 0xF0) >> 4)] * pWav->msadpcm.delta[0]) >> 8; + if (pWav->msadpcm.delta[0] < 16) + { pWav->msadpcm.delta[0] = 16; } pWav->msadpcm.prevSamples[0][0] = pWav->msadpcm.prevSamples[0][1]; pWav->msadpcm.prevSamples[0][1] = newSample0; - drwav_int32 newSample1; - newSample1 = ((pWav->msadpcm.prevSamples[0][1] * coeff1Table[pWav->msadpcm.predictor[0]]) + (pWav->msadpcm.prevSamples[0][0] * coeff2Table[pWav->msadpcm.predictor[0]])) >> 8; + newSample1 = + ((pWav->msadpcm.prevSamples[0][1] * coeff1Table[pWav->msadpcm.predictor[0]]) + + (pWav->msadpcm.prevSamples[0][0] * coeff2Table[pWav->msadpcm.predictor[0]])) >> + 8; newSample1 += nibble1 * pWav->msadpcm.delta[0]; - newSample1 = drwav_clamp(newSample1, -32768, 32767); + newSample1 = drwav_clamp(newSample1, -32768, 32767); - pWav->msadpcm.delta[0] = (adaptationTable[((nibbles & 0x0F) >> 0)] * pWav->msadpcm.delta[0]) >> 8; - if (pWav->msadpcm.delta[0] < 16) { + pWav->msadpcm.delta[0] = + (adaptationTable[((nibbles & 0x0F) >> 0)] * pWav->msadpcm.delta[0]) >> 8; + if (pWav->msadpcm.delta[0] < 16) + { pWav->msadpcm.delta[0] = 16; } pWav->msadpcm.prevSamples[0][0] = pWav->msadpcm.prevSamples[0][1]; pWav->msadpcm.prevSamples[0][1] = newSample1; - - pWav->msadpcm.cachedSamples[2] = newSample0; - pWav->msadpcm.cachedSamples[3] = newSample1; + pWav->msadpcm.cachedSamples[2] = newSample0; + pWav->msadpcm.cachedSamples[3] = newSample1; pWav->msadpcm.cachedSampleCount = 2; - } else { + } + else + { // Stereo. // Left. drwav_int32 newSample0; - newSample0 = ((pWav->msadpcm.prevSamples[0][1] * coeff1Table[pWav->msadpcm.predictor[0]]) + (pWav->msadpcm.prevSamples[0][0] * coeff2Table[pWav->msadpcm.predictor[0]])) >> 8; + newSample0 = + ((pWav->msadpcm.prevSamples[0][1] * coeff1Table[pWav->msadpcm.predictor[0]]) + + (pWav->msadpcm.prevSamples[0][0] * coeff2Table[pWav->msadpcm.predictor[0]])) >> + 8; newSample0 += nibble0 * pWav->msadpcm.delta[0]; - newSample0 = drwav_clamp(newSample0, -32768, 32767); + newSample0 = drwav_clamp(newSample0, -32768, 32767); - pWav->msadpcm.delta[0] = (adaptationTable[((nibbles & 0xF0) >> 4)] * pWav->msadpcm.delta[0]) >> 8; - if (pWav->msadpcm.delta[0] < 16) { + pWav->msadpcm.delta[0] = + (adaptationTable[((nibbles & 0xF0) >> 4)] * pWav->msadpcm.delta[0]) >> 8; + if (pWav->msadpcm.delta[0] < 16) + { pWav->msadpcm.delta[0] = 16; } pWav->msadpcm.prevSamples[0][0] = pWav->msadpcm.prevSamples[0][1]; pWav->msadpcm.prevSamples[0][1] = newSample0; - // Right. drwav_int32 newSample1; - newSample1 = ((pWav->msadpcm.prevSamples[1][1] * coeff1Table[pWav->msadpcm.predictor[1]]) + (pWav->msadpcm.prevSamples[1][0] * coeff2Table[pWav->msadpcm.predictor[1]])) >> 8; + newSample1 = + ((pWav->msadpcm.prevSamples[1][1] * coeff1Table[pWav->msadpcm.predictor[1]]) + + (pWav->msadpcm.prevSamples[1][0] * coeff2Table[pWav->msadpcm.predictor[1]])) >> + 8; newSample1 += nibble1 * pWav->msadpcm.delta[1]; - newSample1 = drwav_clamp(newSample1, -32768, 32767); + newSample1 = drwav_clamp(newSample1, -32768, 32767); - pWav->msadpcm.delta[1] = (adaptationTable[((nibbles & 0x0F) >> 0)] * pWav->msadpcm.delta[1]) >> 8; - if (pWav->msadpcm.delta[1] < 16) { + pWav->msadpcm.delta[1] = + (adaptationTable[((nibbles & 0x0F) >> 0)] * pWav->msadpcm.delta[1]) >> 8; + if (pWav->msadpcm.delta[1] < 16) + { pWav->msadpcm.delta[1] = 16; } pWav->msadpcm.prevSamples[1][0] = pWav->msadpcm.prevSamples[1][1]; pWav->msadpcm.prevSamples[1][1] = newSample1; - pWav->msadpcm.cachedSamples[2] = newSample0; - pWav->msadpcm.cachedSamples[3] = newSample1; + pWav->msadpcm.cachedSamples[2] = newSample0; + pWav->msadpcm.cachedSamples[3] = newSample1; pWav->msadpcm.cachedSampleCount = 2; } } @@ -2240,13 +2548,17 @@ drwav_uint64 drwav_read_s16__ima(drwav* pWav, drwav_uint64 samplesToRead, drwav_ drwav_uint64 totalSamplesRead = 0; - while (samplesToRead > 0 && pWav->compressed.iCurrentSample < pWav->totalSampleCount) { + while (samplesToRead > 0 && pWav->compressed.iCurrentSample < pWav->totalSampleCount) + { // If there are no cached samples we need to load a new block. - if (pWav->ima.cachedSampleCount == 0 && pWav->ima.bytesRemainingInBlock == 0) { - if (pWav->channels == 1) { + if (pWav->ima.cachedSampleCount == 0 && pWav->ima.bytesRemainingInBlock == 0) + { + if (pWav->channels == 1) + { // Mono. drwav_uint8 header[4]; - if (pWav->onRead(pWav->pUserData, header, sizeof(header)) != sizeof(header)) { + if (pWav->onRead(pWav->pUserData, header, sizeof(header)) != sizeof(header)) + { return totalSamplesRead; } pWav->ima.bytesRemainingInBlock = pWav->fmt.blockAlign - sizeof(header); @@ -2254,11 +2566,14 @@ drwav_uint64 drwav_read_s16__ima(drwav* pWav, drwav_uint64 samplesToRead, drwav_ pWav->ima.predictor[0] = drwav__bytes_to_s16(header + 0); pWav->ima.stepIndex[0] = header[2]; pWav->ima.cachedSamples[drwav_countof(pWav->ima.cachedSamples) - 1] = pWav->ima.predictor[0]; - pWav->ima.cachedSampleCount = 1; - } else { + pWav->ima.cachedSampleCount = 1; + } + else + { // Stereo. drwav_uint8 header[8]; - if (pWav->onRead(pWav->pUserData, header, sizeof(header)) != sizeof(header)) { + if (pWav->onRead(pWav->pUserData, header, sizeof(header)) != sizeof(header)) + { return totalSamplesRead; } pWav->ima.bytesRemainingInBlock = pWav->fmt.blockAlign - sizeof(header); @@ -2270,13 +2585,17 @@ drwav_uint64 drwav_read_s16__ima(drwav* pWav, drwav_uint64 samplesToRead, drwav_ pWav->ima.cachedSamples[drwav_countof(pWav->ima.cachedSamples) - 2] = pWav->ima.predictor[0]; pWav->ima.cachedSamples[drwav_countof(pWav->ima.cachedSamples) - 1] = pWav->ima.predictor[1]; - pWav->ima.cachedSampleCount = 2; + pWav->ima.cachedSampleCount = 2; } } // Output anything that's cached. - while (samplesToRead > 0 && pWav->ima.cachedSampleCount > 0 && pWav->compressed.iCurrentSample < pWav->totalSampleCount) { - pBufferOut[0] = (drwav_int16)pWav->ima.cachedSamples[drwav_countof(pWav->ima.cachedSamples) - pWav->ima.cachedSampleCount]; + while (samplesToRead > 0 && pWav->ima.cachedSampleCount > 0 && + pWav->compressed.iCurrentSample < pWav->totalSampleCount) + { + pBufferOut[0] = + (drwav_int16)pWav->ima + .cachedSamples[drwav_countof(pWav->ima.cachedSamples) - pWav->ima.cachedSampleCount]; pWav->ima.cachedSampleCount -= 1; pBufferOut += 1; @@ -2285,75 +2604,96 @@ drwav_uint64 drwav_read_s16__ima(drwav* pWav, drwav_uint64 samplesToRead, drwav_ pWav->compressed.iCurrentSample += 1; } - if (samplesToRead == 0) { + if (samplesToRead == 0) + { return totalSamplesRead; } - // If there's nothing left in the cache, just go ahead and load more. If there's nothing left to load in the current block we just continue to the next - // loop iteration which will trigger the loading of a new block. - if (pWav->ima.cachedSampleCount == 0) { - if (pWav->ima.bytesRemainingInBlock == 0) { + // If there's nothing left in the cache, just go ahead and load more. If there's nothing left to load + // in the current block we just continue to the next loop iteration which will trigger the loading of + // a new block. + if (pWav->ima.cachedSampleCount == 0) + { + if (pWav->ima.bytesRemainingInBlock == 0) + { continue; - } else { + } + else + { static drwav_int32 indexTable[16] = { - -1, -1, -1, -1, 2, 4, 6, 8, - -1, -1, -1, -1, 2, 4, 6, 8 + -1, -1, -1, -1, 2, 4, 6, 8, -1, -1, -1, -1, 2, 4, 6, 8 }; - static drwav_int32 stepTable[89] = { - 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, - 19, 21, 23, 25, 28, 31, 34, 37, 41, 45, - 50, 55, 60, 66, 73, 80, 88, 97, 107, 118, - 130, 143, 157, 173, 190, 209, 230, 253, 279, 307, - 337, 371, 408, 449, 494, 544, 598, 658, 724, 796, - 876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066, - 2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358, - 5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, - 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767 + static drwav_int32 stepTable[89] = { + 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 19, 21, 23, + 25, 28, 31, 34, 37, 41, 45, 50, 55, 60, 66, 73, 80, + 88, 97, 107, 118, 130, 143, 157, 173, 190, 209, 230, 253, 279, + 307, 337, 371, 408, 449, 494, 544, 598, 658, 724, 796, 876, 963, + 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066, 2272, 2499, 2749, 3024, 3327, + 3660, 4026, 4428, 4871, 5358, 5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, + 12635, 13899, 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767 }; - // From what I can tell with stereo streams, it looks like every 4 bytes (8 samples) is for one channel. So it goes 4 bytes for the - // left channel, 4 bytes for the right channel. + // From what I can tell with stereo streams, it looks like every 4 bytes (8 samples) is for + // one channel. So it goes 4 bytes for the left channel, 4 bytes for the right channel. pWav->ima.cachedSampleCount = 8 * pWav->channels; - for (drwav_uint32 iChannel = 0; iChannel < pWav->channels; ++iChannel) { + for (drwav_uint32 iChannel = 0; iChannel < pWav->channels; ++iChannel) + { drwav_uint8 nibbles[4]; - if (pWav->onRead(pWav->pUserData, &nibbles, 4) != 4) { + if (pWav->onRead(pWav->pUserData, &nibbles, 4) != 4) + { return totalSamplesRead; } pWav->ima.bytesRemainingInBlock -= 4; - for (drwav_uint32 iByte = 0; iByte < 4; ++iByte) { + for (drwav_uint32 iByte = 0; iByte < 4; ++iByte) + { drwav_uint8 nibble0 = ((nibbles[iByte] & 0x0F) >> 0); drwav_uint8 nibble1 = ((nibbles[iByte] & 0xF0) >> 4); drwav_int32 step = stepTable[pWav->ima.stepIndex[iChannel]]; drwav_int32 predictor = pWav->ima.predictor[iChannel]; - drwav_int32 diff = step >> 3; - if (nibble0 & 1) diff += step >> 2; - if (nibble0 & 2) diff += step >> 1; - if (nibble0 & 4) diff += step; - if (nibble0 & 8) diff = -diff; - - predictor = drwav_clamp(predictor + diff, -32768, 32767); + drwav_int32 diff = step >> 3; + if (nibble0 & 1) + diff += step >> 2; + if (nibble0 & 2) + diff += step >> 1; + if (nibble0 & 4) + diff += step; + if (nibble0 & 8) + diff = -diff; + + predictor = drwav_clamp(predictor + diff, -32768, 32767); pWav->ima.predictor[iChannel] = predictor; - pWav->ima.stepIndex[iChannel] = drwav_clamp(pWav->ima.stepIndex[iChannel] + indexTable[nibble0], 0, (drwav_int32)drwav_countof(stepTable)-1); - pWav->ima.cachedSamples[(drwav_countof(pWav->ima.cachedSamples) - pWav->ima.cachedSampleCount) + (iByte*2+0)*pWav->channels + iChannel] = predictor; - + pWav->ima.stepIndex[iChannel] = + drwav_clamp(pWav->ima.stepIndex[iChannel] + indexTable[nibble0], 0, + (drwav_int32)drwav_countof(stepTable) - 1); + pWav->ima.cachedSamples[(drwav_countof(pWav->ima.cachedSamples) - + pWav->ima.cachedSampleCount) + + (iByte * 2 + 0) * pWav->channels + iChannel] = predictor; step = stepTable[pWav->ima.stepIndex[iChannel]]; predictor = pWav->ima.predictor[iChannel]; - diff = step >> 3; - if (nibble1 & 1) diff += step >> 2; - if (nibble1 & 2) diff += step >> 1; - if (nibble1 & 4) diff += step; - if (nibble1 & 8) diff = -diff; - - predictor = drwav_clamp(predictor + diff, -32768, 32767); + diff = step >> 3; + if (nibble1 & 1) + diff += step >> 2; + if (nibble1 & 2) + diff += step >> 1; + if (nibble1 & 4) + diff += step; + if (nibble1 & 8) + diff = -diff; + + predictor = drwav_clamp(predictor + diff, -32768, 32767); pWav->ima.predictor[iChannel] = predictor; - pWav->ima.stepIndex[iChannel] = drwav_clamp(pWav->ima.stepIndex[iChannel] + indexTable[nibble1], 0, (drwav_int32)drwav_countof(stepTable)-1); - pWav->ima.cachedSamples[(drwav_countof(pWav->ima.cachedSamples) - pWav->ima.cachedSampleCount) + (iByte*2+1)*pWav->channels + iChannel] = predictor; + pWav->ima.stepIndex[iChannel] = + drwav_clamp(pWav->ima.stepIndex[iChannel] + indexTable[nibble1], 0, + (drwav_int32)drwav_countof(stepTable) - 1); + pWav->ima.cachedSamples[(drwav_countof(pWav->ima.cachedSamples) - + pWav->ima.cachedSampleCount) + + (iByte * 2 + 1) * pWav->channels + iChannel] = predictor; } } } @@ -2363,44 +2703,51 @@ drwav_uint64 drwav_read_s16__ima(drwav* pWav, drwav_uint64 samplesToRead, drwav_ return totalSamplesRead; } - #ifndef DR_WAV_NO_CONVERSION_API static unsigned short g_drwavAlawTable[256] = { - 0xEA80, 0xEB80, 0xE880, 0xE980, 0xEE80, 0xEF80, 0xEC80, 0xED80, 0xE280, 0xE380, 0xE080, 0xE180, 0xE680, 0xE780, 0xE480, 0xE580, - 0xF540, 0xF5C0, 0xF440, 0xF4C0, 0xF740, 0xF7C0, 0xF640, 0xF6C0, 0xF140, 0xF1C0, 0xF040, 0xF0C0, 0xF340, 0xF3C0, 0xF240, 0xF2C0, - 0xAA00, 0xAE00, 0xA200, 0xA600, 0xBA00, 0xBE00, 0xB200, 0xB600, 0x8A00, 0x8E00, 0x8200, 0x8600, 0x9A00, 0x9E00, 0x9200, 0x9600, - 0xD500, 0xD700, 0xD100, 0xD300, 0xDD00, 0xDF00, 0xD900, 0xDB00, 0xC500, 0xC700, 0xC100, 0xC300, 0xCD00, 0xCF00, 0xC900, 0xCB00, - 0xFEA8, 0xFEB8, 0xFE88, 0xFE98, 0xFEE8, 0xFEF8, 0xFEC8, 0xFED8, 0xFE28, 0xFE38, 0xFE08, 0xFE18, 0xFE68, 0xFE78, 0xFE48, 0xFE58, - 0xFFA8, 0xFFB8, 0xFF88, 0xFF98, 0xFFE8, 0xFFF8, 0xFFC8, 0xFFD8, 0xFF28, 0xFF38, 0xFF08, 0xFF18, 0xFF68, 0xFF78, 0xFF48, 0xFF58, - 0xFAA0, 0xFAE0, 0xFA20, 0xFA60, 0xFBA0, 0xFBE0, 0xFB20, 0xFB60, 0xF8A0, 0xF8E0, 0xF820, 0xF860, 0xF9A0, 0xF9E0, 0xF920, 0xF960, - 0xFD50, 0xFD70, 0xFD10, 0xFD30, 0xFDD0, 0xFDF0, 0xFD90, 0xFDB0, 0xFC50, 0xFC70, 0xFC10, 0xFC30, 0xFCD0, 0xFCF0, 0xFC90, 0xFCB0, - 0x1580, 0x1480, 0x1780, 0x1680, 0x1180, 0x1080, 0x1380, 0x1280, 0x1D80, 0x1C80, 0x1F80, 0x1E80, 0x1980, 0x1880, 0x1B80, 0x1A80, - 0x0AC0, 0x0A40, 0x0BC0, 0x0B40, 0x08C0, 0x0840, 0x09C0, 0x0940, 0x0EC0, 0x0E40, 0x0FC0, 0x0F40, 0x0CC0, 0x0C40, 0x0DC0, 0x0D40, - 0x5600, 0x5200, 0x5E00, 0x5A00, 0x4600, 0x4200, 0x4E00, 0x4A00, 0x7600, 0x7200, 0x7E00, 0x7A00, 0x6600, 0x6200, 0x6E00, 0x6A00, - 0x2B00, 0x2900, 0x2F00, 0x2D00, 0x2300, 0x2100, 0x2700, 0x2500, 0x3B00, 0x3900, 0x3F00, 0x3D00, 0x3300, 0x3100, 0x3700, 0x3500, - 0x0158, 0x0148, 0x0178, 0x0168, 0x0118, 0x0108, 0x0138, 0x0128, 0x01D8, 0x01C8, 0x01F8, 0x01E8, 0x0198, 0x0188, 0x01B8, 0x01A8, - 0x0058, 0x0048, 0x0078, 0x0068, 0x0018, 0x0008, 0x0038, 0x0028, 0x00D8, 0x00C8, 0x00F8, 0x00E8, 0x0098, 0x0088, 0x00B8, 0x00A8, - 0x0560, 0x0520, 0x05E0, 0x05A0, 0x0460, 0x0420, 0x04E0, 0x04A0, 0x0760, 0x0720, 0x07E0, 0x07A0, 0x0660, 0x0620, 0x06E0, 0x06A0, - 0x02B0, 0x0290, 0x02F0, 0x02D0, 0x0230, 0x0210, 0x0270, 0x0250, 0x03B0, 0x0390, 0x03F0, 0x03D0, 0x0330, 0x0310, 0x0370, 0x0350 + 0xEA80, 0xEB80, 0xE880, 0xE980, 0xEE80, 0xEF80, 0xEC80, 0xED80, 0xE280, 0xE380, 0xE080, 0xE180, 0xE680, + 0xE780, 0xE480, 0xE580, 0xF540, 0xF5C0, 0xF440, 0xF4C0, 0xF740, 0xF7C0, 0xF640, 0xF6C0, 0xF140, 0xF1C0, + 0xF040, 0xF0C0, 0xF340, 0xF3C0, 0xF240, 0xF2C0, 0xAA00, 0xAE00, 0xA200, 0xA600, 0xBA00, 0xBE00, 0xB200, + 0xB600, 0x8A00, 0x8E00, 0x8200, 0x8600, 0x9A00, 0x9E00, 0x9200, 0x9600, 0xD500, 0xD700, 0xD100, 0xD300, + 0xDD00, 0xDF00, 0xD900, 0xDB00, 0xC500, 0xC700, 0xC100, 0xC300, 0xCD00, 0xCF00, 0xC900, 0xCB00, 0xFEA8, + 0xFEB8, 0xFE88, 0xFE98, 0xFEE8, 0xFEF8, 0xFEC8, 0xFED8, 0xFE28, 0xFE38, 0xFE08, 0xFE18, 0xFE68, 0xFE78, + 0xFE48, 0xFE58, 0xFFA8, 0xFFB8, 0xFF88, 0xFF98, 0xFFE8, 0xFFF8, 0xFFC8, 0xFFD8, 0xFF28, 0xFF38, 0xFF08, + 0xFF18, 0xFF68, 0xFF78, 0xFF48, 0xFF58, 0xFAA0, 0xFAE0, 0xFA20, 0xFA60, 0xFBA0, 0xFBE0, 0xFB20, 0xFB60, + 0xF8A0, 0xF8E0, 0xF820, 0xF860, 0xF9A0, 0xF9E0, 0xF920, 0xF960, 0xFD50, 0xFD70, 0xFD10, 0xFD30, 0xFDD0, + 0xFDF0, 0xFD90, 0xFDB0, 0xFC50, 0xFC70, 0xFC10, 0xFC30, 0xFCD0, 0xFCF0, 0xFC90, 0xFCB0, 0x1580, 0x1480, + 0x1780, 0x1680, 0x1180, 0x1080, 0x1380, 0x1280, 0x1D80, 0x1C80, 0x1F80, 0x1E80, 0x1980, 0x1880, 0x1B80, + 0x1A80, 0x0AC0, 0x0A40, 0x0BC0, 0x0B40, 0x08C0, 0x0840, 0x09C0, 0x0940, 0x0EC0, 0x0E40, 0x0FC0, 0x0F40, + 0x0CC0, 0x0C40, 0x0DC0, 0x0D40, 0x5600, 0x5200, 0x5E00, 0x5A00, 0x4600, 0x4200, 0x4E00, 0x4A00, 0x7600, + 0x7200, 0x7E00, 0x7A00, 0x6600, 0x6200, 0x6E00, 0x6A00, 0x2B00, 0x2900, 0x2F00, 0x2D00, 0x2300, 0x2100, + 0x2700, 0x2500, 0x3B00, 0x3900, 0x3F00, 0x3D00, 0x3300, 0x3100, 0x3700, 0x3500, 0x0158, 0x0148, 0x0178, + 0x0168, 0x0118, 0x0108, 0x0138, 0x0128, 0x01D8, 0x01C8, 0x01F8, 0x01E8, 0x0198, 0x0188, 0x01B8, 0x01A8, + 0x0058, 0x0048, 0x0078, 0x0068, 0x0018, 0x0008, 0x0038, 0x0028, 0x00D8, 0x00C8, 0x00F8, 0x00E8, 0x0098, + 0x0088, 0x00B8, 0x00A8, 0x0560, 0x0520, 0x05E0, 0x05A0, 0x0460, 0x0420, 0x04E0, 0x04A0, 0x0760, 0x0720, + 0x07E0, 0x07A0, 0x0660, 0x0620, 0x06E0, 0x06A0, 0x02B0, 0x0290, 0x02F0, 0x02D0, 0x0230, 0x0210, 0x0270, + 0x0250, 0x03B0, 0x0390, 0x03F0, 0x03D0, 0x0330, 0x0310, 0x0370, 0x0350 }; static unsigned short g_drwavMulawTable[256] = { - 0x8284, 0x8684, 0x8A84, 0x8E84, 0x9284, 0x9684, 0x9A84, 0x9E84, 0xA284, 0xA684, 0xAA84, 0xAE84, 0xB284, 0xB684, 0xBA84, 0xBE84, - 0xC184, 0xC384, 0xC584, 0xC784, 0xC984, 0xCB84, 0xCD84, 0xCF84, 0xD184, 0xD384, 0xD584, 0xD784, 0xD984, 0xDB84, 0xDD84, 0xDF84, - 0xE104, 0xE204, 0xE304, 0xE404, 0xE504, 0xE604, 0xE704, 0xE804, 0xE904, 0xEA04, 0xEB04, 0xEC04, 0xED04, 0xEE04, 0xEF04, 0xF004, - 0xF0C4, 0xF144, 0xF1C4, 0xF244, 0xF2C4, 0xF344, 0xF3C4, 0xF444, 0xF4C4, 0xF544, 0xF5C4, 0xF644, 0xF6C4, 0xF744, 0xF7C4, 0xF844, - 0xF8A4, 0xF8E4, 0xF924, 0xF964, 0xF9A4, 0xF9E4, 0xFA24, 0xFA64, 0xFAA4, 0xFAE4, 0xFB24, 0xFB64, 0xFBA4, 0xFBE4, 0xFC24, 0xFC64, - 0xFC94, 0xFCB4, 0xFCD4, 0xFCF4, 0xFD14, 0xFD34, 0xFD54, 0xFD74, 0xFD94, 0xFDB4, 0xFDD4, 0xFDF4, 0xFE14, 0xFE34, 0xFE54, 0xFE74, - 0xFE8C, 0xFE9C, 0xFEAC, 0xFEBC, 0xFECC, 0xFEDC, 0xFEEC, 0xFEFC, 0xFF0C, 0xFF1C, 0xFF2C, 0xFF3C, 0xFF4C, 0xFF5C, 0xFF6C, 0xFF7C, - 0xFF88, 0xFF90, 0xFF98, 0xFFA0, 0xFFA8, 0xFFB0, 0xFFB8, 0xFFC0, 0xFFC8, 0xFFD0, 0xFFD8, 0xFFE0, 0xFFE8, 0xFFF0, 0xFFF8, 0x0000, - 0x7D7C, 0x797C, 0x757C, 0x717C, 0x6D7C, 0x697C, 0x657C, 0x617C, 0x5D7C, 0x597C, 0x557C, 0x517C, 0x4D7C, 0x497C, 0x457C, 0x417C, - 0x3E7C, 0x3C7C, 0x3A7C, 0x387C, 0x367C, 0x347C, 0x327C, 0x307C, 0x2E7C, 0x2C7C, 0x2A7C, 0x287C, 0x267C, 0x247C, 0x227C, 0x207C, - 0x1EFC, 0x1DFC, 0x1CFC, 0x1BFC, 0x1AFC, 0x19FC, 0x18FC, 0x17FC, 0x16FC, 0x15FC, 0x14FC, 0x13FC, 0x12FC, 0x11FC, 0x10FC, 0x0FFC, - 0x0F3C, 0x0EBC, 0x0E3C, 0x0DBC, 0x0D3C, 0x0CBC, 0x0C3C, 0x0BBC, 0x0B3C, 0x0ABC, 0x0A3C, 0x09BC, 0x093C, 0x08BC, 0x083C, 0x07BC, - 0x075C, 0x071C, 0x06DC, 0x069C, 0x065C, 0x061C, 0x05DC, 0x059C, 0x055C, 0x051C, 0x04DC, 0x049C, 0x045C, 0x041C, 0x03DC, 0x039C, - 0x036C, 0x034C, 0x032C, 0x030C, 0x02EC, 0x02CC, 0x02AC, 0x028C, 0x026C, 0x024C, 0x022C, 0x020C, 0x01EC, 0x01CC, 0x01AC, 0x018C, - 0x0174, 0x0164, 0x0154, 0x0144, 0x0134, 0x0124, 0x0114, 0x0104, 0x00F4, 0x00E4, 0x00D4, 0x00C4, 0x00B4, 0x00A4, 0x0094, 0x0084, - 0x0078, 0x0070, 0x0068, 0x0060, 0x0058, 0x0050, 0x0048, 0x0040, 0x0038, 0x0030, 0x0028, 0x0020, 0x0018, 0x0010, 0x0008, 0x0000 + 0x8284, 0x8684, 0x8A84, 0x8E84, 0x9284, 0x9684, 0x9A84, 0x9E84, 0xA284, 0xA684, 0xAA84, 0xAE84, 0xB284, + 0xB684, 0xBA84, 0xBE84, 0xC184, 0xC384, 0xC584, 0xC784, 0xC984, 0xCB84, 0xCD84, 0xCF84, 0xD184, 0xD384, + 0xD584, 0xD784, 0xD984, 0xDB84, 0xDD84, 0xDF84, 0xE104, 0xE204, 0xE304, 0xE404, 0xE504, 0xE604, 0xE704, + 0xE804, 0xE904, 0xEA04, 0xEB04, 0xEC04, 0xED04, 0xEE04, 0xEF04, 0xF004, 0xF0C4, 0xF144, 0xF1C4, 0xF244, + 0xF2C4, 0xF344, 0xF3C4, 0xF444, 0xF4C4, 0xF544, 0xF5C4, 0xF644, 0xF6C4, 0xF744, 0xF7C4, 0xF844, 0xF8A4, + 0xF8E4, 0xF924, 0xF964, 0xF9A4, 0xF9E4, 0xFA24, 0xFA64, 0xFAA4, 0xFAE4, 0xFB24, 0xFB64, 0xFBA4, 0xFBE4, + 0xFC24, 0xFC64, 0xFC94, 0xFCB4, 0xFCD4, 0xFCF4, 0xFD14, 0xFD34, 0xFD54, 0xFD74, 0xFD94, 0xFDB4, 0xFDD4, + 0xFDF4, 0xFE14, 0xFE34, 0xFE54, 0xFE74, 0xFE8C, 0xFE9C, 0xFEAC, 0xFEBC, 0xFECC, 0xFEDC, 0xFEEC, 0xFEFC, + 0xFF0C, 0xFF1C, 0xFF2C, 0xFF3C, 0xFF4C, 0xFF5C, 0xFF6C, 0xFF7C, 0xFF88, 0xFF90, 0xFF98, 0xFFA0, 0xFFA8, + 0xFFB0, 0xFFB8, 0xFFC0, 0xFFC8, 0xFFD0, 0xFFD8, 0xFFE0, 0xFFE8, 0xFFF0, 0xFFF8, 0x0000, 0x7D7C, 0x797C, + 0x757C, 0x717C, 0x6D7C, 0x697C, 0x657C, 0x617C, 0x5D7C, 0x597C, 0x557C, 0x517C, 0x4D7C, 0x497C, 0x457C, + 0x417C, 0x3E7C, 0x3C7C, 0x3A7C, 0x387C, 0x367C, 0x347C, 0x327C, 0x307C, 0x2E7C, 0x2C7C, 0x2A7C, 0x287C, + 0x267C, 0x247C, 0x227C, 0x207C, 0x1EFC, 0x1DFC, 0x1CFC, 0x1BFC, 0x1AFC, 0x19FC, 0x18FC, 0x17FC, 0x16FC, + 0x15FC, 0x14FC, 0x13FC, 0x12FC, 0x11FC, 0x10FC, 0x0FFC, 0x0F3C, 0x0EBC, 0x0E3C, 0x0DBC, 0x0D3C, 0x0CBC, + 0x0C3C, 0x0BBC, 0x0B3C, 0x0ABC, 0x0A3C, 0x09BC, 0x093C, 0x08BC, 0x083C, 0x07BC, 0x075C, 0x071C, 0x06DC, + 0x069C, 0x065C, 0x061C, 0x05DC, 0x059C, 0x055C, 0x051C, 0x04DC, 0x049C, 0x045C, 0x041C, 0x03DC, 0x039C, + 0x036C, 0x034C, 0x032C, 0x030C, 0x02EC, 0x02CC, 0x02AC, 0x028C, 0x026C, 0x024C, 0x022C, 0x020C, 0x01EC, + 0x01CC, 0x01AC, 0x018C, 0x0174, 0x0164, 0x0154, 0x0144, 0x0134, 0x0124, 0x0114, 0x0104, 0x00F4, 0x00E4, + 0x00D4, 0x00C4, 0x00B4, 0x00A4, 0x0094, 0x0084, 0x0078, 0x0070, 0x0068, 0x0060, 0x0058, 0x0050, 0x0048, + 0x0040, 0x0038, 0x0030, 0x0028, 0x0020, 0x0018, 0x0010, 0x0008, 0x0000 }; static DRWAV_INLINE drwav_int16 drwav__alaw_to_s16(drwav_uint8 sampleIn) @@ -2413,50 +2760,54 @@ static DRWAV_INLINE drwav_int16 drwav__mulaw_to_s16(drwav_uint8 sampleIn) return (short)g_drwavMulawTable[sampleIn]; } - - -static void drwav__pcm_to_s16(drwav_int16* pOut, const unsigned char* pIn, size_t totalSampleCount, unsigned short bytesPerSample) +static void drwav__pcm_to_s16(drwav_int16* pOut, const unsigned char* pIn, size_t totalSampleCount, + unsigned short bytesPerSample) { // Special case for 8-bit sample data because it's treated as unsigned. - if (bytesPerSample == 1) { + if (bytesPerSample == 1) + { drwav_u8_to_s16(pOut, pIn, totalSampleCount); return; } - // Slightly more optimal implementation for common formats. - if (bytesPerSample == 2) { - for (unsigned int i = 0; i < totalSampleCount; ++i) { - *pOut++ = ((const drwav_int16*)pIn)[i]; + if (bytesPerSample == 2) + { + for (unsigned int i = 0; i < totalSampleCount; ++i) + { + *pOut++ = ((const drwav_int16*)pIn)[i]; } return; } - if (bytesPerSample == 3) { + if (bytesPerSample == 3) + { drwav_s24_to_s16(pOut, pIn, totalSampleCount); return; } - if (bytesPerSample == 4) { + if (bytesPerSample == 4) + { drwav_s32_to_s16(pOut, (const drwav_int32*)pIn, totalSampleCount); return; } - // Anything more than 64 bits per sample is not supported. - if (bytesPerSample > 8) { + if (bytesPerSample > 8) + { drwav_zero_memory(pOut, totalSampleCount * sizeof(*pOut)); return; } - // Generic, slow converter. - for (unsigned int i = 0; i < totalSampleCount; ++i) { + for (unsigned int i = 0; i < totalSampleCount; ++i) + { drwav_uint64 sample = 0; unsigned int shift = (8 - bytesPerSample) * 8; unsigned int j; - for (j = 0; j < bytesPerSample && j < 8; j += 1) { + for (j = 0; j < bytesPerSample && j < 8; j += 1) + { sample |= (drwav_uint64)(pIn[j]) << shift; - shift += 8; + shift += 8; } pIn += j; @@ -2464,16 +2815,23 @@ static void drwav__pcm_to_s16(drwav_int16* pOut, const unsigned char* pIn, size_ } } -static void drwav__ieee_to_s16(drwav_int16* pOut, const unsigned char* pIn, size_t totalSampleCount, unsigned short bytesPerSample) +static void drwav__ieee_to_s16(drwav_int16* pOut, const unsigned char* pIn, size_t totalSampleCount, + unsigned short bytesPerSample) { - if (bytesPerSample == 4) { + if (bytesPerSample == 4) + { drwav_f32_to_s16(pOut, (const float*)pIn, totalSampleCount); return; - } else if (bytesPerSample == 8) { + } + else if (bytesPerSample == 8) + { drwav_f64_to_s16(pOut, (const double*)pIn, totalSampleCount); return; - } else { - // Only supporting 32- and 64-bit float. Output silence in all other cases. Contributions welcome for 16-bit float. + } + else + { + // Only supporting 32- and 64-bit float. Output silence in all other cases. Contributions welcome for + // 16-bit float. drwav_zero_memory(pOut, totalSampleCount * sizeof(*pOut)); return; } @@ -2482,22 +2840,26 @@ static void drwav__ieee_to_s16(drwav_int16* pOut, const unsigned char* pIn, size drwav_uint64 drwav_read_s16__pcm(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16* pBufferOut) { // Fast path. - if (pWav->bytesPerSample == 2) { + if (pWav->bytesPerSample == 2) + { return drwav_read(pWav, samplesToRead, pBufferOut); } drwav_uint64 totalSamplesRead = 0; unsigned char sampleData[4096]; - while (samplesToRead > 0) { - drwav_uint64 samplesRead = drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData)/pWav->bytesPerSample), sampleData); - if (samplesRead == 0) { + while (samplesToRead > 0) + { + drwav_uint64 samplesRead = + drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData) / pWav->bytesPerSample), sampleData); + if (samplesRead == 0) + { break; } drwav__pcm_to_s16(pBufferOut, sampleData, (size_t)samplesRead, pWav->bytesPerSample); - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -2508,16 +2870,19 @@ drwav_uint64 drwav_read_s16__ieee(drwav* pWav, drwav_uint64 samplesToRead, drwav { drwav_uint64 totalSamplesRead = 0; unsigned char sampleData[4096]; - while (samplesToRead > 0) { - drwav_uint64 samplesRead = drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData)/pWav->bytesPerSample), sampleData); - if (samplesRead == 0) { + while (samplesToRead > 0) + { + drwav_uint64 samplesRead = + drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData) / pWav->bytesPerSample), sampleData); + if (samplesRead == 0) + { break; } drwav__ieee_to_s16(pBufferOut, sampleData, (size_t)samplesRead, pWav->bytesPerSample); - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -2528,16 +2893,19 @@ drwav_uint64 drwav_read_s16__alaw(drwav* pWav, drwav_uint64 samplesToRead, drwav { drwav_uint64 totalSamplesRead = 0; unsigned char sampleData[4096]; - while (samplesToRead > 0) { - drwav_uint64 samplesRead = drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData)/pWav->bytesPerSample), sampleData); - if (samplesRead == 0) { + while (samplesToRead > 0) + { + drwav_uint64 samplesRead = + drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData) / pWav->bytesPerSample), sampleData); + if (samplesRead == 0) + { break; } drwav_alaw_to_s16(pBufferOut, sampleData, (size_t)samplesRead); - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -2548,16 +2916,19 @@ drwav_uint64 drwav_read_s16__mulaw(drwav* pWav, drwav_uint64 samplesToRead, drwa { drwav_uint64 totalSamplesRead = 0; unsigned char sampleData[4096]; - while (samplesToRead > 0) { - drwav_uint64 samplesRead = drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData)/pWav->bytesPerSample), sampleData); - if (samplesRead == 0) { + while (samplesToRead > 0) + { + drwav_uint64 samplesRead = + drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData) / pWav->bytesPerSample), sampleData); + if (samplesRead == 0) + { break; } drwav_mulaw_to_s16(pBufferOut, sampleData, (size_t)samplesRead); - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -2566,36 +2937,44 @@ drwav_uint64 drwav_read_s16__mulaw(drwav* pWav, drwav_uint64 samplesToRead, drwa drwav_uint64 drwav_read_s16(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16* pBufferOut) { - if (pWav == NULL || samplesToRead == 0 || pBufferOut == NULL) { + if (pWav == NULL || samplesToRead == 0 || pBufferOut == NULL) + { return 0; } // Don't try to read more samples than can potentially fit in the output buffer. - if (samplesToRead * sizeof(drwav_int16) > DRWAV_SIZE_MAX) { + if (samplesToRead * sizeof(drwav_int16) > DRWAV_SIZE_MAX) + { samplesToRead = DRWAV_SIZE_MAX / sizeof(drwav_int16); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM) + { return drwav_read_s16__pcm(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) + { return drwav_read_s16__msadpcm(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_IEEE_FLOAT) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_IEEE_FLOAT) + { return drwav_read_s16__ieee(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ALAW) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ALAW) + { return drwav_read_s16__alaw(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_MULAW) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_MULAW) + { return drwav_read_s16__mulaw(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) + { return drwav_read_s16__ima(pWav, samplesToRead, pBufferOut); } @@ -2605,10 +2984,11 @@ drwav_uint64 drwav_read_s16(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16 void drwav_u8_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount) { int r; - for (size_t i = 0; i < sampleCount; ++i) { - int x = pIn[i]; - r = x - 128; - r = r << 8; + for (size_t i = 0; i < sampleCount; ++i) + { + int x = pIn[i]; + r = x - 128; + r = r << 8; pOut[i] = (short)r; } } @@ -2616,9 +2996,13 @@ void drwav_u8_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCou void drwav_s24_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount) { int r; - for (size_t i = 0; i < sampleCount; ++i) { - int x = ((int)(((unsigned int)(((const unsigned char*)pIn)[i*3+0]) << 8) | ((unsigned int)(((const unsigned char*)pIn)[i*3+1]) << 16) | ((unsigned int)(((const unsigned char*)pIn)[i*3+2])) << 24)) >> 8; - r = x >> 8; + for (size_t i = 0; i < sampleCount; ++i) + { + int x = ((int)(((unsigned int)(((const unsigned char*)pIn)[i * 3 + 0]) << 8) | + ((unsigned int)(((const unsigned char*)pIn)[i * 3 + 1]) << 16) | + ((unsigned int)(((const unsigned char*)pIn)[i * 3 + 2])) << 24)) >> + 8; + r = x >> 8; pOut[i] = (short)r; } } @@ -2626,9 +3010,10 @@ void drwav_s24_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCo void drwav_s32_to_s16(drwav_int16* pOut, const drwav_int32* pIn, size_t sampleCount) { int r; - for (size_t i = 0; i < sampleCount; ++i) { - int x = pIn[i]; - r = x >> 16; + for (size_t i = 0; i < sampleCount; ++i) + { + int x = pIn[i]; + r = x >> 16; pOut[i] = (short)r; } } @@ -2636,13 +3021,14 @@ void drwav_s32_to_s16(drwav_int16* pOut, const drwav_int32* pIn, size_t sampleCo void drwav_f32_to_s16(drwav_int16* pOut, const float* pIn, size_t sampleCount) { int r; - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { float x = pIn[i]; float c; - c = ((x < -1) ? -1 : ((x > 1) ? 1 : x)); - c = c + 1; - r = (int)(c * 32767.5f); - r = r - 32768; + c = ((x < -1) ? -1 : ((x > 1) ? 1 : x)); + c = c + 1; + r = (int)(c * 32767.5f); + r = r - 32768; pOut[i] = (short)r; } } @@ -2650,72 +3036,79 @@ void drwav_f32_to_s16(drwav_int16* pOut, const float* pIn, size_t sampleCount) void drwav_f64_to_s16(drwav_int16* pOut, const double* pIn, size_t sampleCount) { int r; - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { double x = pIn[i]; double c; - c = ((x < -1) ? -1 : ((x > 1) ? 1 : x)); - c = c + 1; - r = (int)(c * 32767.5); - r = r - 32768; + c = ((x < -1) ? -1 : ((x > 1) ? 1 : x)); + c = c + 1; + r = (int)(c * 32767.5); + r = r - 32768; pOut[i] = (short)r; } } void drwav_alaw_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount) { - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { pOut[i] = drwav__alaw_to_s16(pIn[i]); } } void drwav_mulaw_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount) { - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { pOut[i] = drwav__mulaw_to_s16(pIn[i]); } } - - -static void drwav__pcm_to_f32(float* pOut, const unsigned char* pIn, size_t sampleCount, unsigned short bytesPerSample) +static void drwav__pcm_to_f32(float* pOut, const unsigned char* pIn, size_t sampleCount, + unsigned short bytesPerSample) { // Special case for 8-bit sample data because it's treated as unsigned. - if (bytesPerSample == 1) { + if (bytesPerSample == 1) + { drwav_u8_to_f32(pOut, pIn, sampleCount); return; } // Slightly more optimal implementation for common formats. - if (bytesPerSample == 2) { + if (bytesPerSample == 2) + { drwav_s16_to_f32(pOut, (const drwav_int16*)pIn, sampleCount); return; } - if (bytesPerSample == 3) { + if (bytesPerSample == 3) + { drwav_s24_to_f32(pOut, pIn, sampleCount); return; } - if (bytesPerSample == 4) { + if (bytesPerSample == 4) + { drwav_s32_to_f32(pOut, (const drwav_int32*)pIn, sampleCount); return; } - // Anything more than 64 bits per sample is not supported. - if (bytesPerSample > 8) { + if (bytesPerSample > 8) + { drwav_zero_memory(pOut, sampleCount * sizeof(*pOut)); return; } - // Generic, slow converter. - for (unsigned int i = 0; i < sampleCount; ++i) { + for (unsigned int i = 0; i < sampleCount; ++i) + { drwav_uint64 sample = 0; unsigned int shift = (8 - bytesPerSample) * 8; unsigned int j; - for (j = 0; j < bytesPerSample && j < 8; j += 1) { + for (j = 0; j < bytesPerSample && j < 8; j += 1) + { sample |= (drwav_uint64)(pIn[j]) << shift; - shift += 8; + shift += 8; } pIn += j; @@ -2723,42 +3116,53 @@ static void drwav__pcm_to_f32(float* pOut, const unsigned char* pIn, size_t samp } } -static void drwav__ieee_to_f32(float* pOut, const unsigned char* pIn, size_t sampleCount, unsigned short bytesPerSample) +static void drwav__ieee_to_f32(float* pOut, const unsigned char* pIn, size_t sampleCount, + unsigned short bytesPerSample) { - if (bytesPerSample == 4) { - for (unsigned int i = 0; i < sampleCount; ++i) { + if (bytesPerSample == 4) + { + for (unsigned int i = 0; i < sampleCount; ++i) + { *pOut++ = ((const float*)pIn)[i]; } return; - } else if (bytesPerSample == 8) { + } + else if (bytesPerSample == 8) + { drwav_f64_to_f32(pOut, (const double*)pIn, sampleCount); return; - } else { - // Only supporting 32- and 64-bit float. Output silence in all other cases. Contributions welcome for 16-bit float. + } + else + { + // Only supporting 32- and 64-bit float. Output silence in all other cases. Contributions welcome for + // 16-bit float. drwav_zero_memory(pOut, sampleCount * sizeof(*pOut)); return; } } - drwav_uint64 drwav_read_f32__pcm(drwav* pWav, drwav_uint64 samplesToRead, float* pBufferOut) { - if (pWav->bytesPerSample == 0) { + if (pWav->bytesPerSample == 0) + { return 0; } drwav_uint64 totalSamplesRead = 0; unsigned char sampleData[4096]; - while (samplesToRead > 0) { - drwav_uint64 samplesRead = drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData)/pWav->bytesPerSample), sampleData); - if (samplesRead == 0) { + while (samplesToRead > 0) + { + drwav_uint64 samplesRead = + drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData) / pWav->bytesPerSample), sampleData); + if (samplesRead == 0) + { break; } drwav__pcm_to_f32(pBufferOut, sampleData, (size_t)samplesRead, pWav->bytesPerSample); pBufferOut += samplesRead; - samplesToRead -= samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -2767,20 +3171,23 @@ drwav_uint64 drwav_read_f32__pcm(drwav* pWav, drwav_uint64 samplesToRead, float* drwav_uint64 drwav_read_f32__msadpcm(drwav* pWav, drwav_uint64 samplesToRead, float* pBufferOut) { - // We're just going to borrow the implementation from the drwav_read_s16() since ADPCM is a little bit more complicated than other formats and I don't - // want to duplicate that code. + // We're just going to borrow the implementation from the drwav_read_s16() since ADPCM is a little bit + // more complicated than other formats and I don't want to duplicate that code. drwav_uint64 totalSamplesRead = 0; drwav_int16 samples16[2048]; - while (samplesToRead > 0) { + while (samplesToRead > 0) + { drwav_uint64 samplesRead = drwav_read_s16(pWav, drwav_min(samplesToRead, 2048), samples16); - if (samplesRead == 0) { + if (samplesRead == 0) + { break; } - drwav_s16_to_f32(pBufferOut, samples16, (size_t)samplesRead); // <-- Safe cast because we're clamping to 2048. + drwav_s16_to_f32(pBufferOut, samples16, + (size_t)samplesRead); // <-- Safe cast because we're clamping to 2048. - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -2789,20 +3196,23 @@ drwav_uint64 drwav_read_f32__msadpcm(drwav* pWav, drwav_uint64 samplesToRead, fl drwav_uint64 drwav_read_f32__ima(drwav* pWav, drwav_uint64 samplesToRead, float* pBufferOut) { - // We're just going to borrow the implementation from the drwav_read_s16() since IMA-ADPCM is a little bit more complicated than other formats and I don't - // want to duplicate that code. + // We're just going to borrow the implementation from the drwav_read_s16() since IMA-ADPCM is a little bit + // more complicated than other formats and I don't want to duplicate that code. drwav_uint64 totalSamplesRead = 0; drwav_int16 samples16[2048]; - while (samplesToRead > 0) { + while (samplesToRead > 0) + { drwav_uint64 samplesRead = drwav_read_s16(pWav, drwav_min(samplesToRead, 2048), samples16); - if (samplesRead == 0) { + if (samplesRead == 0) + { break; } - drwav_s16_to_f32(pBufferOut, samples16, (size_t)samplesRead); // <-- Safe cast because we're clamping to 2048. + drwav_s16_to_f32(pBufferOut, samples16, + (size_t)samplesRead); // <-- Safe cast because we're clamping to 2048. - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -2812,26 +3222,31 @@ drwav_uint64 drwav_read_f32__ima(drwav* pWav, drwav_uint64 samplesToRead, float* drwav_uint64 drwav_read_f32__ieee(drwav* pWav, drwav_uint64 samplesToRead, float* pBufferOut) { // Fast path. - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_IEEE_FLOAT && pWav->bytesPerSample == 4) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_IEEE_FLOAT && pWav->bytesPerSample == 4) + { return drwav_read(pWav, samplesToRead, pBufferOut); } - if (pWav->bytesPerSample == 0) { + if (pWav->bytesPerSample == 0) + { return 0; } drwav_uint64 totalSamplesRead = 0; unsigned char sampleData[4096]; - while (samplesToRead > 0) { - drwav_uint64 samplesRead = drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData)/pWav->bytesPerSample), sampleData); - if (samplesRead == 0) { + while (samplesToRead > 0) + { + drwav_uint64 samplesRead = + drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData) / pWav->bytesPerSample), sampleData); + if (samplesRead == 0) + { break; } drwav__ieee_to_f32(pBufferOut, sampleData, (size_t)samplesRead, pWav->bytesPerSample); - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -2840,22 +3255,26 @@ drwav_uint64 drwav_read_f32__ieee(drwav* pWav, drwav_uint64 samplesToRead, float drwav_uint64 drwav_read_f32__alaw(drwav* pWav, drwav_uint64 samplesToRead, float* pBufferOut) { - if (pWav->bytesPerSample == 0) { + if (pWav->bytesPerSample == 0) + { return 0; } drwav_uint64 totalSamplesRead = 0; unsigned char sampleData[4096]; - while (samplesToRead > 0) { - drwav_uint64 samplesRead = drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData)/pWav->bytesPerSample), sampleData); - if (samplesRead == 0) { + while (samplesToRead > 0) + { + drwav_uint64 samplesRead = + drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData) / pWav->bytesPerSample), sampleData); + if (samplesRead == 0) + { break; } drwav_alaw_to_f32(pBufferOut, sampleData, (size_t)samplesRead); - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -2864,22 +3283,26 @@ drwav_uint64 drwav_read_f32__alaw(drwav* pWav, drwav_uint64 samplesToRead, float drwav_uint64 drwav_read_f32__mulaw(drwav* pWav, drwav_uint64 samplesToRead, float* pBufferOut) { - if (pWav->bytesPerSample == 0) { + if (pWav->bytesPerSample == 0) + { return 0; } drwav_uint64 totalSamplesRead = 0; unsigned char sampleData[4096]; - while (samplesToRead > 0) { - drwav_uint64 samplesRead = drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData)/pWav->bytesPerSample), sampleData); - if (samplesRead == 0) { + while (samplesToRead > 0) + { + drwav_uint64 samplesRead = + drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData) / pWav->bytesPerSample), sampleData); + if (samplesRead == 0) + { break; } drwav_mulaw_to_f32(pBufferOut, sampleData, (size_t)samplesRead); - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -2888,36 +3311,44 @@ drwav_uint64 drwav_read_f32__mulaw(drwav* pWav, drwav_uint64 samplesToRead, floa drwav_uint64 drwav_read_f32(drwav* pWav, drwav_uint64 samplesToRead, float* pBufferOut) { - if (pWav == NULL || samplesToRead == 0 || pBufferOut == NULL) { + if (pWav == NULL || samplesToRead == 0 || pBufferOut == NULL) + { return 0; } // Don't try to read more samples than can potentially fit in the output buffer. - if (samplesToRead * sizeof(float) > DRWAV_SIZE_MAX) { + if (samplesToRead * sizeof(float) > DRWAV_SIZE_MAX) + { samplesToRead = DRWAV_SIZE_MAX / sizeof(float); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM) + { return drwav_read_f32__pcm(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) + { return drwav_read_f32__msadpcm(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_IEEE_FLOAT) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_IEEE_FLOAT) + { return drwav_read_f32__ieee(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ALAW) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ALAW) + { return drwav_read_f32__alaw(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_MULAW) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_MULAW) + { return drwav_read_f32__mulaw(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) + { return drwav_read_f32__ima(pWav, samplesToRead, pBufferOut); } @@ -2926,20 +3357,24 @@ drwav_uint64 drwav_read_f32(drwav* pWav, drwav_uint64 samplesToRead, float* pBuf void drwav_u8_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } #ifdef DR_WAV_LIBSNDFILE_COMPAT - // It appears libsndfile uses slightly different logic for the u8 -> f32 conversion to dr_wav, which in my opinion is incorrect. It appears - // libsndfile performs the conversion something like "f32 = (u8 / 256) * 2 - 1", however I think it should be "f32 = (u8 / 255) * 2 - 1" (note - // the divisor of 256 vs 255). I use libsndfile as a benchmark for testing, so I'm therefore leaving this block here just for my automated + // It appears libsndfile uses slightly different logic for the u8 -> f32 conversion to dr_wav, which in my + // opinion is incorrect. It appears libsndfile performs the conversion something like "f32 = (u8 / 256) * + // 2 - 1", however I think it should be "f32 = (u8 / 255) * 2 - 1" (note the divisor of 256 vs 255). I use + // libsndfile as a benchmark for testing, so I'm therefore leaving this block here just for my automated // correctness testing. This is disabled by default. - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { *pOut++ = (pIn[i] / 256.0f) * 2 - 1; } #else - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { *pOut++ = (pIn[i] / 255.0f) * 2 - 1; } #endif @@ -2947,118 +3382,135 @@ void drwav_u8_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount) void drwav_s16_to_f32(float* pOut, const drwav_int16* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { *pOut++ = pIn[i] / 32768.0f; } } void drwav_s24_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } - for (size_t i = 0; i < sampleCount; ++i) { - unsigned int s0 = pIn[i*3 + 0]; - unsigned int s1 = pIn[i*3 + 1]; - unsigned int s2 = pIn[i*3 + 2]; + for (size_t i = 0; i < sampleCount; ++i) + { + unsigned int s0 = pIn[i * 3 + 0]; + unsigned int s1 = pIn[i * 3 + 1]; + unsigned int s2 = pIn[i * 3 + 2]; int sample32 = (int)((s0 << 8) | (s1 << 16) | (s2 << 24)); - *pOut++ = (float)(sample32 / 2147483648.0); + *pOut++ = (float)(sample32 / 2147483648.0); } } void drwav_s32_to_f32(float* pOut, const drwav_int32* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { *pOut++ = (float)(pIn[i] / 2147483648.0); } } void drwav_f64_to_f32(float* pOut, const double* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { *pOut++ = (float)pIn[i]; } } void drwav_alaw_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { *pOut++ = drwav__alaw_to_s16(pIn[i]) / 32768.0f; } } void drwav_mulaw_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { *pOut++ = drwav__mulaw_to_s16(pIn[i]) / 32768.0f; } } - - -static void drwav__pcm_to_s32(drwav_int32* pOut, const unsigned char* pIn, size_t totalSampleCount, unsigned short bytesPerSample) +static void drwav__pcm_to_s32(drwav_int32* pOut, const unsigned char* pIn, size_t totalSampleCount, + unsigned short bytesPerSample) { // Special case for 8-bit sample data because it's treated as unsigned. - if (bytesPerSample == 1) { + if (bytesPerSample == 1) + { drwav_u8_to_s32(pOut, pIn, totalSampleCount); return; } // Slightly more optimal implementation for common formats. - if (bytesPerSample == 2) { + if (bytesPerSample == 2) + { drwav_s16_to_s32(pOut, (const drwav_int16*)pIn, totalSampleCount); return; } - if (bytesPerSample == 3) { + if (bytesPerSample == 3) + { drwav_s24_to_s32(pOut, pIn, totalSampleCount); return; } - if (bytesPerSample == 4) { - for (unsigned int i = 0; i < totalSampleCount; ++i) { - *pOut++ = ((const drwav_int32*)pIn)[i]; + if (bytesPerSample == 4) + { + for (unsigned int i = 0; i < totalSampleCount; ++i) + { + *pOut++ = ((const drwav_int32*)pIn)[i]; } return; } - // Anything more than 64 bits per sample is not supported. - if (bytesPerSample > 8) { + if (bytesPerSample > 8) + { drwav_zero_memory(pOut, totalSampleCount * sizeof(*pOut)); return; } - // Generic, slow converter. - for (unsigned int i = 0; i < totalSampleCount; ++i) { + for (unsigned int i = 0; i < totalSampleCount; ++i) + { drwav_uint64 sample = 0; unsigned int shift = (8 - bytesPerSample) * 8; unsigned int j; - for (j = 0; j < bytesPerSample && j < 8; j += 1) { + for (j = 0; j < bytesPerSample && j < 8; j += 1) + { sample |= (drwav_uint64)(pIn[j]) << shift; - shift += 8; + shift += 8; } pIn += j; @@ -3066,45 +3518,56 @@ static void drwav__pcm_to_s32(drwav_int32* pOut, const unsigned char* pIn, size_ } } -static void drwav__ieee_to_s32(drwav_int32* pOut, const unsigned char* pIn, size_t totalSampleCount, unsigned short bytesPerSample) +static void drwav__ieee_to_s32(drwav_int32* pOut, const unsigned char* pIn, size_t totalSampleCount, + unsigned short bytesPerSample) { - if (bytesPerSample == 4) { + if (bytesPerSample == 4) + { drwav_f32_to_s32(pOut, (const float*)pIn, totalSampleCount); return; - } else if (bytesPerSample == 8) { + } + else if (bytesPerSample == 8) + { drwav_f64_to_s32(pOut, (const double*)pIn, totalSampleCount); return; - } else { - // Only supporting 32- and 64-bit float. Output silence in all other cases. Contributions welcome for 16-bit float. + } + else + { + // Only supporting 32- and 64-bit float. Output silence in all other cases. Contributions welcome for + // 16-bit float. drwav_zero_memory(pOut, totalSampleCount * sizeof(*pOut)); return; } } - drwav_uint64 drwav_read_s32__pcm(drwav* pWav, drwav_uint64 samplesToRead, drwav_int32* pBufferOut) { // Fast path. - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM && pWav->bytesPerSample == 4) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM && pWav->bytesPerSample == 4) + { return drwav_read(pWav, samplesToRead, pBufferOut); } - if (pWav->bytesPerSample == 0) { + if (pWav->bytesPerSample == 0) + { return 0; } drwav_uint64 totalSamplesRead = 0; unsigned char sampleData[4096]; - while (samplesToRead > 0) { - drwav_uint64 samplesRead = drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData)/pWav->bytesPerSample), sampleData); - if (samplesRead == 0) { + while (samplesToRead > 0) + { + drwav_uint64 samplesRead = + drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData) / pWav->bytesPerSample), sampleData); + if (samplesRead == 0) + { break; } drwav__pcm_to_s32(pBufferOut, sampleData, (size_t)samplesRead, pWav->bytesPerSample); - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -3113,20 +3576,23 @@ drwav_uint64 drwav_read_s32__pcm(drwav* pWav, drwav_uint64 samplesToRead, drwav_ drwav_uint64 drwav_read_s32__msadpcm(drwav* pWav, drwav_uint64 samplesToRead, drwav_int32* pBufferOut) { - // We're just going to borrow the implementation from the drwav_read_s16() since ADPCM is a little bit more complicated than other formats and I don't - // want to duplicate that code. + // We're just going to borrow the implementation from the drwav_read_s16() since ADPCM is a little bit + // more complicated than other formats and I don't want to duplicate that code. drwav_uint64 totalSamplesRead = 0; drwav_int16 samples16[2048]; - while (samplesToRead > 0) { + while (samplesToRead > 0) + { drwav_uint64 samplesRead = drwav_read_s16(pWav, drwav_min(samplesToRead, 2048), samples16); - if (samplesRead == 0) { + if (samplesRead == 0) + { break; } - drwav_s16_to_s32(pBufferOut, samples16, (size_t)samplesRead); // <-- Safe cast because we're clamping to 2048. + drwav_s16_to_s32(pBufferOut, samples16, + (size_t)samplesRead); // <-- Safe cast because we're clamping to 2048. - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -3135,20 +3601,23 @@ drwav_uint64 drwav_read_s32__msadpcm(drwav* pWav, drwav_uint64 samplesToRead, dr drwav_uint64 drwav_read_s32__ima(drwav* pWav, drwav_uint64 samplesToRead, drwav_int32* pBufferOut) { - // We're just going to borrow the implementation from the drwav_read_s16() since IMA-ADPCM is a little bit more complicated than other formats and I don't - // want to duplicate that code. + // We're just going to borrow the implementation from the drwav_read_s16() since IMA-ADPCM is a little bit + // more complicated than other formats and I don't want to duplicate that code. drwav_uint64 totalSamplesRead = 0; drwav_int16 samples16[2048]; - while (samplesToRead > 0) { + while (samplesToRead > 0) + { drwav_uint64 samplesRead = drwav_read_s16(pWav, drwav_min(samplesToRead, 2048), samples16); - if (samplesRead == 0) { + if (samplesRead == 0) + { break; } - drwav_s16_to_s32(pBufferOut, samples16, (size_t)samplesRead); // <-- Safe cast because we're clamping to 2048. + drwav_s16_to_s32(pBufferOut, samples16, + (size_t)samplesRead); // <-- Safe cast because we're clamping to 2048. - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -3157,22 +3626,26 @@ drwav_uint64 drwav_read_s32__ima(drwav* pWav, drwav_uint64 samplesToRead, drwav_ drwav_uint64 drwav_read_s32__ieee(drwav* pWav, drwav_uint64 samplesToRead, drwav_int32* pBufferOut) { - if (pWav->bytesPerSample == 0) { + if (pWav->bytesPerSample == 0) + { return 0; } drwav_uint64 totalSamplesRead = 0; unsigned char sampleData[4096]; - while (samplesToRead > 0) { - drwav_uint64 samplesRead = drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData)/pWav->bytesPerSample), sampleData); - if (samplesRead == 0) { + while (samplesToRead > 0) + { + drwav_uint64 samplesRead = + drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData) / pWav->bytesPerSample), sampleData); + if (samplesRead == 0) + { break; } drwav__ieee_to_s32(pBufferOut, sampleData, (size_t)samplesRead, pWav->bytesPerSample); - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -3181,22 +3654,26 @@ drwav_uint64 drwav_read_s32__ieee(drwav* pWav, drwav_uint64 samplesToRead, drwav drwav_uint64 drwav_read_s32__alaw(drwav* pWav, drwav_uint64 samplesToRead, drwav_int32* pBufferOut) { - if (pWav->bytesPerSample == 0) { + if (pWav->bytesPerSample == 0) + { return 0; } drwav_uint64 totalSamplesRead = 0; unsigned char sampleData[4096]; - while (samplesToRead > 0) { - drwav_uint64 samplesRead = drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData)/pWav->bytesPerSample), sampleData); - if (samplesRead == 0) { + while (samplesToRead > 0) + { + drwav_uint64 samplesRead = + drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData) / pWav->bytesPerSample), sampleData); + if (samplesRead == 0) + { break; } drwav_alaw_to_s32(pBufferOut, sampleData, (size_t)samplesRead); - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -3205,22 +3682,26 @@ drwav_uint64 drwav_read_s32__alaw(drwav* pWav, drwav_uint64 samplesToRead, drwav drwav_uint64 drwav_read_s32__mulaw(drwav* pWav, drwav_uint64 samplesToRead, drwav_int32* pBufferOut) { - if (pWav->bytesPerSample == 0) { + if (pWav->bytesPerSample == 0) + { return 0; } drwav_uint64 totalSamplesRead = 0; unsigned char sampleData[4096]; - while (samplesToRead > 0) { - drwav_uint64 samplesRead = drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData)/pWav->bytesPerSample), sampleData); - if (samplesRead == 0) { + while (samplesToRead > 0) + { + drwav_uint64 samplesRead = + drwav_read(pWav, drwav_min(samplesToRead, sizeof(sampleData) / pWav->bytesPerSample), sampleData); + if (samplesRead == 0) + { break; } drwav_mulaw_to_s32(pBufferOut, sampleData, (size_t)samplesRead); - pBufferOut += samplesRead; - samplesToRead -= samplesRead; + pBufferOut += samplesRead; + samplesToRead -= samplesRead; totalSamplesRead += samplesRead; } @@ -3229,37 +3710,44 @@ drwav_uint64 drwav_read_s32__mulaw(drwav* pWav, drwav_uint64 samplesToRead, drwa drwav_uint64 drwav_read_s32(drwav* pWav, drwav_uint64 samplesToRead, drwav_int32* pBufferOut) { - if (pWav == NULL || samplesToRead == 0 || pBufferOut == NULL) { + if (pWav == NULL || samplesToRead == 0 || pBufferOut == NULL) + { return 0; } // Don't try to read more samples than can potentially fit in the output buffer. - if (samplesToRead * sizeof(drwav_int32) > DRWAV_SIZE_MAX) { + if (samplesToRead * sizeof(drwav_int32) > DRWAV_SIZE_MAX) + { samplesToRead = DRWAV_SIZE_MAX / sizeof(drwav_int32); } - - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM) + { return drwav_read_s32__pcm(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) + { return drwav_read_s32__msadpcm(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_IEEE_FLOAT) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_IEEE_FLOAT) + { return drwav_read_s32__ieee(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ALAW) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ALAW) + { return drwav_read_s32__alaw(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_MULAW) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_MULAW) + { return drwav_read_s32__mulaw(pWav, samplesToRead, pBufferOut); } - if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) { + if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) + { return drwav_read_s32__ima(pWav, samplesToRead, pBufferOut); } @@ -3268,218 +3756,271 @@ drwav_uint64 drwav_read_s32(drwav* pWav, drwav_uint64 samplesToRead, drwav_int32 void drwav_u8_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { *pOut++ = ((int)pIn[i] - 128) << 24; } } void drwav_s16_to_s32(drwav_int32* pOut, const drwav_int16* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { *pOut++ = pIn[i] << 16; } } void drwav_s24_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } - for (size_t i = 0; i < sampleCount; ++i) { - unsigned int s0 = pIn[i*3 + 0]; - unsigned int s1 = pIn[i*3 + 1]; - unsigned int s2 = pIn[i*3 + 2]; + for (size_t i = 0; i < sampleCount; ++i) + { + unsigned int s0 = pIn[i * 3 + 0]; + unsigned int s1 = pIn[i * 3 + 1]; + unsigned int s2 = pIn[i * 3 + 2]; drwav_int32 sample32 = (drwav_int32)((s0 << 8) | (s1 << 16) | (s2 << 24)); - *pOut++ = sample32; + *pOut++ = sample32; } } void drwav_f32_to_s32(drwav_int32* pOut, const float* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { *pOut++ = (drwav_int32)(2147483648.0 * pIn[i]); } } void drwav_f64_to_s32(drwav_int32* pOut, const double* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { *pOut++ = (drwav_int32)(2147483648.0 * pIn[i]); } } void drwav_alaw_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } - for (size_t i = 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { *pOut++ = ((drwav_int32)drwav__alaw_to_s16(pIn[i])) << 16; } } void drwav_mulaw_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount) { - if (pOut == NULL || pIn == NULL) { + if (pOut == NULL || pIn == NULL) + { return; } - for (size_t i= 0; i < sampleCount; ++i) { + for (size_t i = 0; i < sampleCount; ++i) + { *pOut++ = ((drwav_int32)drwav__mulaw_to_s16(pIn[i])) << 16; } } - - -drwav_int16* drwav__read_and_close_s16(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount) +drwav_int16* drwav__read_and_close_s16(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, + drwav_uint64* totalSampleCount) { drwav_assert(pWav != NULL); drwav_uint64 sampleDataSize = pWav->totalSampleCount * sizeof(drwav_int16); - if (sampleDataSize > DRWAV_SIZE_MAX) { + if (sampleDataSize > DRWAV_SIZE_MAX) + { drwav_uninit(pWav); - return NULL; // File's too big. + return NULL; // File's too big. } - drwav_int16* pSampleData = (drwav_int16*)DRWAV_MALLOC((size_t)sampleDataSize); // <-- Safe cast due to the check above. - if (pSampleData == NULL) { + drwav_int16* pSampleData = + (drwav_int16*)DRWAV_MALLOC((size_t)sampleDataSize); // <-- Safe cast due to the check above. + if (pSampleData == NULL) + { drwav_uninit(pWav); - return NULL; // Failed to allocate memory. + return NULL; // Failed to allocate memory. } drwav_uint64 samplesRead = drwav_read_s16(pWav, (size_t)pWav->totalSampleCount, pSampleData); - if (samplesRead != pWav->totalSampleCount) { + if (samplesRead != pWav->totalSampleCount) + { DRWAV_FREE(pSampleData); drwav_uninit(pWav); - return NULL; // There was an error reading the samples. + return NULL; // There was an error reading the samples. } drwav_uninit(pWav); - if (sampleRate) *sampleRate = pWav->sampleRate; - if (channels) *channels = pWav->channels; - if (totalSampleCount) *totalSampleCount = pWav->totalSampleCount; + if (sampleRate) + *sampleRate = pWav->sampleRate; + if (channels) + *channels = pWav->channels; + if (totalSampleCount) + *totalSampleCount = pWav->totalSampleCount; return pSampleData; } -float* drwav__read_and_close_f32(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount) +float* drwav__read_and_close_f32(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, + drwav_uint64* totalSampleCount) { drwav_assert(pWav != NULL); drwav_uint64 sampleDataSize = pWav->totalSampleCount * sizeof(float); - if (sampleDataSize > DRWAV_SIZE_MAX) { + if (sampleDataSize > DRWAV_SIZE_MAX) + { drwav_uninit(pWav); - return NULL; // File's too big. + return NULL; // File's too big. } - float* pSampleData = (float*)DRWAV_MALLOC((size_t)sampleDataSize); // <-- Safe cast due to the check above. - if (pSampleData == NULL) { + float* pSampleData = + (float*)DRWAV_MALLOC((size_t)sampleDataSize); // <-- Safe cast due to the check above. + if (pSampleData == NULL) + { drwav_uninit(pWav); - return NULL; // Failed to allocate memory. + return NULL; // Failed to allocate memory. } drwav_uint64 samplesRead = drwav_read_f32(pWav, (size_t)pWav->totalSampleCount, pSampleData); - if (samplesRead != pWav->totalSampleCount) { + if (samplesRead != pWav->totalSampleCount) + { DRWAV_FREE(pSampleData); drwav_uninit(pWav); - return NULL; // There was an error reading the samples. + return NULL; // There was an error reading the samples. } drwav_uninit(pWav); - if (sampleRate) *sampleRate = pWav->sampleRate; - if (channels) *channels = pWav->channels; - if (totalSampleCount) *totalSampleCount = pWav->totalSampleCount; + if (sampleRate) + *sampleRate = pWav->sampleRate; + if (channels) + *channels = pWav->channels; + if (totalSampleCount) + *totalSampleCount = pWav->totalSampleCount; return pSampleData; } -drwav_int32* drwav__read_and_close_s32(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount) +drwav_int32* drwav__read_and_close_s32(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, + drwav_uint64* totalSampleCount) { drwav_assert(pWav != NULL); drwav_uint64 sampleDataSize = pWav->totalSampleCount * sizeof(drwav_int32); - if (sampleDataSize > DRWAV_SIZE_MAX) { + if (sampleDataSize > DRWAV_SIZE_MAX) + { drwav_uninit(pWav); - return NULL; // File's too big. + return NULL; // File's too big. } - drwav_int32* pSampleData = (drwav_int32*)DRWAV_MALLOC((size_t)sampleDataSize); // <-- Safe cast due to the check above. - if (pSampleData == NULL) { + drwav_int32* pSampleData = + (drwav_int32*)DRWAV_MALLOC((size_t)sampleDataSize); // <-- Safe cast due to the check above. + if (pSampleData == NULL) + { drwav_uninit(pWav); - return NULL; // Failed to allocate memory. + return NULL; // Failed to allocate memory. } drwav_uint64 samplesRead = drwav_read_s32(pWav, (size_t)pWav->totalSampleCount, pSampleData); - if (samplesRead != pWav->totalSampleCount) { + if (samplesRead != pWav->totalSampleCount) + { DRWAV_FREE(pSampleData); drwav_uninit(pWav); - return NULL; // There was an error reading the samples. + return NULL; // There was an error reading the samples. } drwav_uninit(pWav); - if (sampleRate) *sampleRate = pWav->sampleRate; - if (channels) *channels = pWav->channels; - if (totalSampleCount) *totalSampleCount = pWav->totalSampleCount; + if (sampleRate) + *sampleRate = pWav->sampleRate; + if (channels) + *channels = pWav->channels; + if (totalSampleCount) + *totalSampleCount = pWav->totalSampleCount; return pSampleData; } - -drwav_int16* drwav_open_and_read_s16(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount) +drwav_int16* drwav_open_and_read_s16(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, + unsigned int* channels, unsigned int* sampleRate, + drwav_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drwav wav; - if (!drwav_init(&wav, onRead, onSeek, pUserData)) { + if (!drwav_init(&wav, onRead, onSeek, pUserData)) + { return NULL; } return drwav__read_and_close_s16(&wav, channels, sampleRate, totalSampleCount); } -float* drwav_open_and_read_f32(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount) +float* drwav_open_and_read_f32(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, + unsigned int* channels, unsigned int* sampleRate, + drwav_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drwav wav; - if (!drwav_init(&wav, onRead, onSeek, pUserData)) { + if (!drwav_init(&wav, onRead, onSeek, pUserData)) + { return NULL; } return drwav__read_and_close_f32(&wav, channels, sampleRate, totalSampleCount); } -drwav_int32* drwav_open_and_read_s32(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount) +drwav_int32* drwav_open_and_read_s32(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, + unsigned int* channels, unsigned int* sampleRate, + drwav_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drwav wav; - if (!drwav_init(&wav, onRead, onSeek, pUserData)) { + if (!drwav_init(&wav, onRead, onSeek, pUserData)) + { return NULL; } @@ -3487,42 +4028,57 @@ drwav_int32* drwav_open_and_read_s32(drwav_read_proc onRead, drwav_seek_proc onS } #ifndef DR_WAV_NO_STDIO -drwav_int16* drwav_open_and_read_file_s16(const char* filename, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount) +drwav_int16* drwav_open_and_read_file_s16(const char* filename, unsigned int* channels, + unsigned int* sampleRate, drwav_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drwav wav; - if (!drwav_init_file(&wav, filename)) { + if (!drwav_init_file(&wav, filename)) + { return NULL; } return drwav__read_and_close_s16(&wav, channels, sampleRate, totalSampleCount); } -float* drwav_open_and_read_file_f32(const char* filename, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount) +float* drwav_open_and_read_file_f32(const char* filename, unsigned int* channels, unsigned int* sampleRate, + drwav_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drwav wav; - if (!drwav_init_file(&wav, filename)) { + if (!drwav_init_file(&wav, filename)) + { return NULL; } return drwav__read_and_close_f32(&wav, channels, sampleRate, totalSampleCount); } -drwav_int32* drwav_open_and_read_file_s32(const char* filename, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount) +drwav_int32* drwav_open_and_read_file_s32(const char* filename, unsigned int* channels, + unsigned int* sampleRate, drwav_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drwav wav; - if (!drwav_init_file(&wav, filename)) { + if (!drwav_init_file(&wav, filename)) + { return NULL; } @@ -3530,57 +4086,67 @@ drwav_int32* drwav_open_and_read_file_s32(const char* filename, unsigned int* ch } #endif -drwav_int16* drwav_open_and_read_memory_s16(const void* data, size_t dataSize, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount) +drwav_int16* drwav_open_and_read_memory_s16(const void* data, size_t dataSize, unsigned int* channels, + unsigned int* sampleRate, drwav_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drwav wav; - if (!drwav_init_memory(&wav, data, dataSize)) { + if (!drwav_init_memory(&wav, data, dataSize)) + { return NULL; } return drwav__read_and_close_s16(&wav, channels, sampleRate, totalSampleCount); } -float* drwav_open_and_read_memory_f32(const void* data, size_t dataSize, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount) +float* drwav_open_and_read_memory_f32(const void* data, size_t dataSize, unsigned int* channels, + unsigned int* sampleRate, drwav_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drwav wav; - if (!drwav_init_memory(&wav, data, dataSize)) { + if (!drwav_init_memory(&wav, data, dataSize)) + { return NULL; } return drwav__read_and_close_f32(&wav, channels, sampleRate, totalSampleCount); } -drwav_int32* drwav_open_and_read_memory_s32(const void* data, size_t dataSize, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalSampleCount) +drwav_int32* drwav_open_and_read_memory_s32(const void* data, size_t dataSize, unsigned int* channels, + unsigned int* sampleRate, drwav_uint64* totalSampleCount) { - if (sampleRate) *sampleRate = 0; - if (channels) *channels = 0; - if (totalSampleCount) *totalSampleCount = 0; + if (sampleRate) + *sampleRate = 0; + if (channels) + *channels = 0; + if (totalSampleCount) + *totalSampleCount = 0; drwav wav; - if (!drwav_init_memory(&wav, data, dataSize)) { + if (!drwav_init_memory(&wav, data, dataSize)) + { return NULL; } return drwav__read_and_close_s32(&wav, channels, sampleRate, totalSampleCount); } -#endif //DR_WAV_NO_CONVERSION_API - - -void drwav_free(void* pDataReturnedByOpenAndRead) -{ - DRWAV_FREE(pDataReturnedByOpenAndRead); -} +#endif // DR_WAV_NO_CONVERSION_API -#endif //DR_WAV_IMPLEMENTATION +void drwav_free(void* pDataReturnedByOpenAndRead) { DRWAV_FREE(pDataReturnedByOpenAndRead); } +#endif // DR_WAV_IMPLEMENTATION // REVISION HISTORY // @@ -3664,7 +4230,8 @@ void drwav_free(void* pDataReturnedByOpenAndRead) // - Improve A-law and mu-law efficiency. // // v0.5 - 2016-09-29 -// - API CHANGE. Swap the order of "channels" and "sampleRate" parameters in drwav_open_and_read*(). Rationale for this is to +// - API CHANGE. Swap the order of "channels" and "sampleRate" parameters in drwav_open_and_read*(). +// Rationale for this is to // keep it consistent with dr_audio and dr_flac. // // v0.4b - 2016-09-18 @@ -3693,12 +4260,12 @@ void drwav_free(void* pDataReturnedByOpenAndRead) // - Added support for reading data as signed 32-bit PCM for consistency with dr_flac. // // v0.1a - 2016-05-07 -// - Fixed a bug in drwav_open_file() where the file handle would not be closed if the loader failed to initialize. +// - Fixed a bug in drwav_open_file() where the file handle would not be closed if the loader failed to +// initialize. // // v0.1 - 2016-05-04 // - Initial versioned release. - /* This is free and unencumbered software released into the public domain. diff --git a/include/kfr/io/file.hpp b/include/kfr/io/file.hpp @@ -149,16 +149,16 @@ using binary_reader = abstract_reader<>; using binary_writer = abstract_writer<>; /// @brief Byte reader -using byte_reader = abstract_reader<u8>; +using byte_reader = abstract_reader<u8>; /// @brief Byte writer -using byte_writer = abstract_writer<u8>; +using byte_writer = abstract_writer<u8>; /// @brief float reader -using f32_reader = abstract_reader<f32>; +using f32_reader = abstract_reader<f32>; /// @brief float writer -using f32_writer = abstract_writer<f32>; +using f32_writer = abstract_writer<f32>; struct file_handle { diff --git a/include/kfr/io/tostring.hpp b/include/kfr/io/tostring.hpp @@ -106,7 +106,7 @@ inline std::string array_to_string(const kfr::complex<T>* source, size_t N) } return str; } -} +} // namespace details template <typename T> struct representation<kfr::complex<T>> @@ -157,7 +157,7 @@ struct representation<kfr::univector<T, Tag>> return details::array_to_string(value.data(), value.size()); } }; -} +} // namespace cometa namespace kfr { @@ -198,7 +198,7 @@ struct expression_debug_printer : output_expression return input; } }; -} +} // namespace internal /// @brief Returns an output expression that prints the values inline internal::expression_printer printer() { return internal::expression_printer(); } @@ -223,4 +223,4 @@ std::string dB_to_utf8string(const T& value, double minimum = -140.0) return "-\xE2\x88\x9E dB"; // infinity symbol return as_string(fmtwidth<0, 2>(value), " dB"); } -} +} // namespace kfr diff --git a/include/kfr/testo/assert.hpp b/include/kfr/testo/assert.hpp @@ -50,7 +50,7 @@ bool check_assertion(const half_comparison<L>& comparison, const char* expr, con return result; } -#define TESTO_ASSERT_ACTIVE(...) \ +#define TESTO_ASSERT_ACTIVE(...) \ do \ { \ if (!::testo::check_assertion(::testo::make_comparison() <= __VA_ARGS__, #__VA_ARGS__, __FILE__, \ @@ -58,8 +58,8 @@ bool check_assertion(const half_comparison<L>& comparison, const char* expr, con TESTO_BREAKPOINT; \ } while (0) -#define TESTO_ASSERT_INACTIVE(...) \ - do \ +#define TESTO_ASSERT_INACTIVE(...) \ + do \ { \ } while (false && (__VA_ARGS__)) diff --git a/include/kfr/testo/comparison.hpp b/include/kfr/testo/comparison.hpp @@ -222,6 +222,6 @@ struct make_comparison return half_comparison<L>(std::forward<L>(left)); } }; -} +} // namespace testo CMT_PRAGMA_GNU(GCC diagnostic pop) diff --git a/include/kfr/version.hpp b/include/kfr/version.hpp @@ -34,4 +34,4 @@ namespace kfr /// @brief Returns string representation of the KFR version (including target architecture) inline static const char* library_version() { return KFR_VERSION_FULL; } inline static const char* cpu_runtime() { return cpu_name(get_cpu()); } -} +} // namespace kfr diff --git a/tests/base_test.cpp b/tests/base_test.cpp @@ -420,10 +420,10 @@ TEST(sample_interleave_deinterleave) in.push_back(truncate(counter() * 3.f + 1.f, size)); in.push_back(truncate(counter() * 3.f + 2.f, size)); univector<float> out(size * 3); - interleave(out.data(), (const float*[]){ in[0].data(), in[1].data(), in[2].data() }, 3, size); + interleave(out.data(), (const float* []){ in[0].data(), in[1].data(), in[2].data() }, 3, size); CHECK(maxof(out - render(counter() * 1.f, out.size())) == 0); - deinterleave((float*[]){ in[0].data(), in[1].data(), in[2].data() }, out.data(), 3, size); + deinterleave((float* []){ in[0].data(), in[1].data(), in[2].data() }, out.data(), 3, size); CHECK(absmaxof(in[0] - render(counter() * 3.f + 0.f, size)) == 0); CHECK(absmaxof(in[1] - render(counter() * 3.f + 1.f, size)) == 0); diff --git a/tests/mpfr/mpfrplus.hpp b/tests/mpfr/mpfrplus.hpp @@ -43,7 +43,7 @@ struct with_precision_t }; constexpr with_precision_t with_precision{}; -} +} // namespace internal namespace internal { @@ -60,7 +60,7 @@ static mpfr_rnd_t& rounding_mode() static MPFR_THREAD_LOCAL mpfr_rnd_t rnd = mpfr_get_default_rounding_mode(); return rnd; } -} +} // namespace internal /// Temporarily sets the precision struct scoped_precision @@ -707,7 +707,7 @@ MPFR_FN(infinity) MPFR_FN(zero) MPFR_FN(fraction) MPFR_FN(reciprocal) -} +} // namespace mpfr #undef MPFR_CXX_UNARY #undef MPFR_CXX_UNARY_RND