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

pcm_format: pass struct pcm_dither_24 to pcm_convert_to_16()

Browse Source 
The function does not need the full pcm_convert_state struct.
This commit is contained in:
Max Kellermann 2009-01-07 18:19:22 +01:00
parent df30a29391
commit 8b19c74e8e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pcm_format.c
View File

@ -17,7 +17,7 @@
*/ */
#include "pcm_format.h" #include "pcm_format.h"
#include "pcm_utils.h" #include "pcm_dither.h"
#include <glib.h> #include <glib.h>
@ -40,7 +40,7 @@ pcm_convert_24_to_16(struct pcm_dither_24 *dither,
} }
const int16_t * const int16_t *
pcm_convert_to_16(struct pcm_convert_state *convert, pcm_convert_to_16(struct pcm_dither_24 *dither,
uint8_t bits, const void *src, uint8_t bits, const void *src,
size_t src_size, size_t *dest_size_r) size_t src_size, size_t *dest_size_r)
{ {
@ -74,7 +74,7 @@ pcm_convert_to_16(struct pcm_convert_state *convert,
buf = g_realloc(buf, len); buf = g_realloc(buf, len);
} }
pcm_convert_24_to_16(&convert->dither, pcm_convert_24_to_16(dither,
(int16_t *)buf, (int16_t *)buf,
(const int32_t *)src, (const int32_t *)src,
num_samples); num_samples);

4
src/pcm_format.h
View File

@ -22,10 +22,10 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
struct pcm_convert_state; struct pcm_dither_24;
const int16_t * const int16_t *
pcm_convert_to_16(struct pcm_convert_state *convert, pcm_convert_to_16(struct pcm_dither_24 *dither,
uint8_t bits, const void *src, uint8_t bits, const void *src,
size_t src_size, size_t *dest_size_r); size_t src_size, size_t *dest_size_r);

2
src/pcm_utils.c
View File

@ -51,7 +51,7 @@ pcm_convert_16(const struct audio_format *src_format,
assert(dest_format->bits == 16); assert(dest_format->bits == 16);
buf = pcm_convert_to_16(state, src_format->bits, buf = pcm_convert_to_16(&state->dither, src_format->bits,
src_buffer, src_size, &len); src_buffer, src_size, &len);
if (!buf) if (!buf)
g_error("pcm_convert_to_16() failed"); g_error("pcm_convert_to_16() failed");