oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity
ca68b1c80a
mpd/src/crossfade.c

77 lines
2.2 KiB
C
Raw Normal View History

moved code to crossfade.c decode.c should be a lot smaller; start by moving all code which handles cross-fading to crossfade.c. Also includes camelCase conversion.
2008-08-26 08:27:09 +02:00
/* the Music Player Daemon (MPD)
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
* Copyright (C) 2008 Max Kellermann <max@duempel.org>
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "crossfade.h"
#include "audio.h"
#include "pcm_utils.h"
unsigned cross_fade_calc(float duration, float total_time,
audio_format: converted typedef AudioFormat to struct audio_format Get rid of CamelCase, and don't use a typedef, so we can forward-declare it, and unclutter the include dependencies.
2008-09-07 19:19:55 +02:00
const struct audio_format *af,
moved code to crossfade.c decode.c should be a lot smaller; start by moving all code which handles cross-fading to crossfade.c. Also includes camelCase conversion.
2008-08-26 08:27:09 +02:00
unsigned max_chunks)
{
unsigned int chunks;
if (duration <= 0 || duration >= total_time ||
!isCurrentAudioFormat(af))
return 0;
assert(duration > 0);
assert(af->bits > 0);
assert(af->channels > 0);
assert(af->sampleRate > 0);
chunks = audio_format_time_to_size(af) / CHUNK_SIZE;
chunks = (chunks * duration + 0.5);
if (chunks > max_chunks)
chunks = max_chunks;
return chunks;
}
void cross_fade_apply(ob_chunk * a, const ob_chunk * b,
audio_format: converted typedef AudioFormat to struct audio_format Get rid of CamelCase, and don't use a typedef, so we can forward-declare it, and unclutter the include dependencies.
2008-09-07 19:19:55 +02:00
const struct audio_format *format,
moved code to crossfade.c decode.c should be a lot smaller; start by moving all code which handles cross-fading to crossfade.c. Also includes camelCase conversion.
2008-08-26 08:27:09 +02:00
unsigned int current_chunk, unsigned int num_chunks)
{
pcm_utils: pass only one buffer size to pcm_mix() pcm_mix() might overflow the destination buffer if it is smaller than the second buffer. This is ok because the physical buffer size passed by cross_fade_apply() is always big enough, but clutters pcm_mix() with complicated length checks and contains a dangerous buffer overflow pitfall. Simplify pcm_mix()/pcm_add() and pass only the smaller buffer size; let cross_fade_apply() do the memcpy().
2008-09-29 17:25:08 +02:00
size_t size;
moved code to crossfade.c decode.c should be a lot smaller; start by moving all code which handles cross-fading to crossfade.c. Also includes camelCase conversion.
2008-08-26 08:27:09 +02:00
assert(current_chunk <= num_chunks);
pcm_utils: pass only one buffer size to pcm_mix() pcm_mix() might overflow the destination buffer if it is smaller than the second buffer. This is ok because the physical buffer size passed by cross_fade_apply() is always big enough, but clutters pcm_mix() with complicated length checks and contains a dangerous buffer overflow pitfall. Simplify pcm_mix()/pcm_add() and pass only the smaller buffer size; let cross_fade_apply() do the memcpy().
2008-09-29 17:25:08 +02:00
size = b->chunkSize > a->chunkSize
? a->chunkSize
: b->chunkSize;
moved code to crossfade.c decode.c should be a lot smaller; start by moving all code which handles cross-fading to crossfade.c. Also includes camelCase conversion.
2008-08-26 08:27:09 +02:00
pcm_mix(a->data,
b->data,
pcm_utils: pass only one buffer size to pcm_mix() pcm_mix() might overflow the destination buffer if it is smaller than the second buffer. This is ok because the physical buffer size passed by cross_fade_apply() is always big enough, but clutters pcm_mix() with complicated length checks and contains a dangerous buffer overflow pitfall. Simplify pcm_mix()/pcm_add() and pass only the smaller buffer size; let cross_fade_apply() do the memcpy().
2008-09-29 17:25:08 +02:00
size,
moved code to crossfade.c decode.c should be a lot smaller; start by moving all code which handles cross-fading to crossfade.c. Also includes camelCase conversion.
2008-08-26 08:27:09 +02:00
format,
((float)current_chunk) / num_chunks);
pcm_utils: pass only one buffer size to pcm_mix() pcm_mix() might overflow the destination buffer if it is smaller than the second buffer. This is ok because the physical buffer size passed by cross_fade_apply() is always big enough, but clutters pcm_mix() with complicated length checks and contains a dangerous buffer overflow pitfall. Simplify pcm_mix()/pcm_add() and pass only the smaller buffer size; let cross_fade_apply() do the memcpy().
2008-09-29 17:25:08 +02:00
if (b->chunkSize > a->chunkSize) {
/* the second buffer is larger than the first one:
there is unmixed rest at the end. Copy it over.
The output buffer API guarantees that there is
enough room in a->data. */
memcpy(a->data + a->chunkSize,
b->data + a->chunkSize,
b->chunkSize - a->chunkSize);
moved code to crossfade.c decode.c should be a lot smaller; start by moving all code which handles cross-fading to crossfade.c. Also includes camelCase conversion.
2008-08-26 08:27:09 +02:00
a->chunkSize = b->chunkSize;
pcm_utils: pass only one buffer size to pcm_mix() pcm_mix() might overflow the destination buffer if it is smaller than the second buffer. This is ok because the physical buffer size passed by cross_fade_apply() is always big enough, but clutters pcm_mix() with complicated length checks and contains a dangerous buffer overflow pitfall. Simplify pcm_mix()/pcm_add() and pass only the smaller buffer size; let cross_fade_apply() do the memcpy().
2008-09-29 17:25:08 +02:00
}
moved code to crossfade.c decode.c should be a lot smaller; start by moving all code which handles cross-fading to crossfade.c. Also includes camelCase conversion.
2008-08-26 08:27:09 +02:00
}
Reference in New Issue Copy Permalink