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

pcm_utils: added pcm_convert_init()

Browse Source 
Instead of manually calling memset(0) on the pcm_convert_state struct,
client code should use a library function from pcm_utils.c.  This way,
we can change the semantics of the struct easily.
This commit is contained in:
Max Kellermann 2008-10-21 22:53:16 +02:00
parent ca6e613a7f
commit e6d90d4e83
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/decoder_api.c
View File

@ -47,7 +47,7 @@ void decoder_initialized(struct decoder * decoder,
{
assert(dc.state == DECODE_STATE_START);
memset(&decoder->conv_state, 0, sizeof(decoder->conv_state));
pcm_convert_init(&decoder->conv_state);
if (audio_format != NULL) {
dc.audioFormat = *audio_format;

2
src/output_init.c
View File

@ -90,7 +90,7 @@ int audio_output_init(struct audio_output *ao, ConfigParam * param)
ao->convBuffer = NULL;
ao->convBufferLen = 0;
memset(&ao->convState, 0, sizeof(ao->convState));
pcm_convert_init(&ao->convState);
if (format) {
if (0 != parseAudioConfig(&ao->reqAudioFormat, format)) {

5
src/pcm_utils.c
View File

@ -205,6 +205,11 @@ void pcm_mix(char *buffer1, const char *buffer2, size_t size,
pcm_add(buffer1, buffer2, size, vol1, 1000 - vol1, format);
}
void pcm_convert_init(struct pcm_convert_state *state)
{
memset(state, 0, sizeof(*state));
}
#ifdef HAVE_LIBSAMPLERATE
static int pcm_resample_get_converter(void)
{

2
src/pcm_utils.h
View File

@ -51,6 +51,8 @@ void pcm_volume(char *buffer, int bufferSize,
void pcm_mix(char *buffer1, const char *buffer2, size_t size,
const struct audio_format *format, float portion1);
void pcm_convert_init(struct pcm_convert_state *state);
size_t pcm_convert(const struct audio_format *inFormat,
const char *inBuffer, size_t inSize,
const struct audio_format *outFormat,