some assertions to check the unsigned changes
git-svn-id: https://svn.musicpd.org/mpd/trunk@7297 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
parent
1ad2f07a39
commit
ee64bba4d9
@ -88,6 +88,7 @@ static unsigned calculateCrossFadeChunks(PlayerControl * pc, AudioFormat * af,
|
|||||||
chunks = (af->sampleRate * af->bits * af->channels / 8.0 / CHUNK_SIZE);
|
chunks = (af->sampleRate * af->bits * af->channels / 8.0 / CHUNK_SIZE);
|
||||||
chunks = (chunks * pc->crossFade + 0.5);
|
chunks = (chunks * pc->crossFade + 0.5);
|
||||||
|
|
||||||
|
assert(buffered_chunks >= buffered_before_play);
|
||||||
if (chunks > (buffered_chunks - buffered_before_play)) {
|
if (chunks > (buffered_chunks - buffered_before_play)) {
|
||||||
chunks = buffered_chunks - buffered_before_play;
|
chunks = buffered_chunks - buffered_before_play;
|
||||||
}
|
}
|
||||||
@ -367,6 +368,8 @@ static void crossFade(OutputBufferChunk * a, OutputBufferChunk * b,
|
|||||||
AudioFormat * format,
|
AudioFormat * format,
|
||||||
unsigned int fadePosition, unsigned int crossFadeChunks)
|
unsigned int fadePosition, unsigned int crossFadeChunks)
|
||||||
{
|
{
|
||||||
|
assert(fadePosition <= crossFadeChunks);
|
||||||
|
|
||||||
pcm_mix(a->data,
|
pcm_mix(a->data,
|
||||||
b->data,
|
b->data,
|
||||||
a->chunkSize,
|
a->chunkSize,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user