oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

player/CrossFade, ...: use lround()

Browse Source
This commit is contained in:
Max Kellermann
2018-09-22 19:08:03 +02:00
parent d3d1d37782
commit 863722545f
6 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pcm/PcmMix.cxx
View File

@@ -26,8 +26,9 @@
#include "PcmDither.cxx" // including the .cxx file to get inlined templates
#include <cmath>
#include <assert.h>
#include <math.h>
template<SampleFormat F, class Traits=SampleTraits<F>>
static typename Traits::value_type
@@ -225,7 +226,7 @@ pcm_mix(PcmDither &dither, void *buffer1, const void *buffer2, size_t size,
s = sin(M_PI_2 * portion1);
s *= s;
int vol1 = s * PCM_VOLUME_1S + 0.5;
int vol1 = std::lround(s * PCM_VOLUME_1S);
vol1 = Clamp<int>(vol1, 0, PCM_VOLUME_1S);
return pcm_add_vol(dither, buffer1, buffer2, size,