Skip to content

M
mpd
Commit ee64bba4 authored by Max Kellermann's avatar Max Kellermann Committed by Eric Wong
Browse files
Options

some assertions to check the unsigned changes

git-svn-id: https://svn.musicpd.org/mpd/trunk@7297 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent 1ad2f07a
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
src/decode.c
View file @ ee64bba4
...@@ -88,6 +88,7 @@ static unsigned calculateCrossFadeChunks(PlayerControl * pc, AudioFormat * af, ...@@ -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, ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment