Skip to content

M
mpd
Commit 9716c3a3 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

pcm_{channels,resample}: pass channel count as integer, not uint8_t

Reduces number of implicit integer conversions.
parent c4c44c44
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
src/pcm_channels.c
View file @ 9716c3a3
...@@ -71,8 +71,8 @@ pcm_convert_channels_16_n_to_2(int16_t *dest, ...@@ -71,8 +71,8 @@ pcm_convert_channels_16_n_to_2(int16_t *dest,
const int16_t * const int16_t *
pcm_convert_channels_16(struct pcm_buffer *buffer, pcm_convert_channels_16(struct pcm_buffer *buffer,
uint8_t dest_channels, unsigned dest_channels,
uint8_t src_channels, const int16_t *src, unsigned src_channels, const int16_t *src,
size_t src_size, size_t *dest_size_r) size_t src_size, size_t *dest_size_r)
{ {
assert(src_size % (sizeof(*src) * src_channels) == 0); assert(src_size % (sizeof(*src) * src_channels) == 0);
...@@ -144,8 +144,8 @@ pcm_convert_channels_24_n_to_2(int32_t *dest, ...@@ -144,8 +144,8 @@ pcm_convert_channels_24_n_to_2(int32_t *dest,
const int32_t * const int32_t *
pcm_convert_channels_24(struct pcm_buffer *buffer, pcm_convert_channels_24(struct pcm_buffer *buffer,
uint8_t dest_channels, unsigned dest_channels,
uint8_t src_channels, const int32_t *src, unsigned src_channels, const int32_t *src,
size_t src_size, size_t *dest_size_r) size_t src_size, size_t *dest_size_r)
{ {
assert(src_size % (sizeof(*src) * src_channels) == 0); assert(src_size % (sizeof(*src) * src_channels) == 0);
...@@ -212,8 +212,8 @@ pcm_convert_channels_32_n_to_2(int32_t *dest, ...@@ -212,8 +212,8 @@ pcm_convert_channels_32_n_to_2(int32_t *dest,
const int32_t * const int32_t *
pcm_convert_channels_32(struct pcm_buffer *buffer, pcm_convert_channels_32(struct pcm_buffer *buffer,
uint8_t dest_channels, unsigned dest_channels,
uint8_t src_channels, const int32_t *src, unsigned src_channels, const int32_t *src,
size_t src_size, size_t *dest_size_r) size_t src_size, size_t *dest_size_r)
{ {
assert(src_size % (sizeof(*src) * src_channels) == 0); assert(src_size % (sizeof(*src) * src_channels) == 0);
......
src/pcm_channels.h
View file @ 9716c3a3
...@@ -38,8 +38,8 @@ struct pcm_buffer; ...@@ -38,8 +38,8 @@ struct pcm_buffer;
*/ */
const int16_t * const int16_t *
pcm_convert_channels_16(struct pcm_buffer *buffer, pcm_convert_channels_16(struct pcm_buffer *buffer,
uint8_t dest_channels, unsigned dest_channels,
uint8_t src_channels, const int16_t *src, unsigned src_channels, const int16_t *src,
size_t src_size, size_t *dest_size_r); size_t src_size, size_t *dest_size_r);
/** /**
...@@ -56,8 +56,8 @@ pcm_convert_channels_16(struct pcm_buffer *buffer, ...@@ -56,8 +56,8 @@ pcm_convert_channels_16(struct pcm_buffer *buffer,
*/ */
const int32_t * const int32_t *
pcm_convert_channels_24(struct pcm_buffer *buffer, pcm_convert_channels_24(struct pcm_buffer *buffer,
uint8_t dest_channels, unsigned dest_channels,
uint8_t src_channels, const int32_t *src, unsigned src_channels, const int32_t *src,
size_t src_size, size_t *dest_size_r); size_t src_size, size_t *dest_size_r);
/** /**
...@@ -73,8 +73,8 @@ pcm_convert_channels_24(struct pcm_buffer *buffer, ...@@ -73,8 +73,8 @@ pcm_convert_channels_24(struct pcm_buffer *buffer,
*/ */
const int32_t * const int32_t *
pcm_convert_channels_32(struct pcm_buffer *buffer, pcm_convert_channels_32(struct pcm_buffer *buffer,
uint8_t dest_channels, unsigned dest_channels,
uint8_t src_channels, const int32_t *src, unsigned src_channels, const int32_t *src,
size_t src_size, size_t *dest_size_r); size_t src_size, size_t *dest_size_r);
#endif #endif
src/pcm_resample.c
View file @ 9716c3a3
...@@ -78,7 +78,7 @@ void pcm_resample_deinit(struct pcm_resample_state *state) ...@@ -78,7 +78,7 @@ void pcm_resample_deinit(struct pcm_resample_state *state)
const int16_t * const int16_t *
pcm_resample_16(struct pcm_resample_state *state, pcm_resample_16(struct pcm_resample_state *state,
uint8_t channels, unsigned channels,
unsigned src_rate, const int16_t *src_buffer, size_t src_size, unsigned src_rate, const int16_t *src_buffer, size_t src_size,
unsigned dest_rate, size_t *dest_size_r, unsigned dest_rate, size_t *dest_size_r,
GError **error_r) GError **error_r)
...@@ -100,7 +100,7 @@ pcm_resample_16(struct pcm_resample_state *state, ...@@ -100,7 +100,7 @@ pcm_resample_16(struct pcm_resample_state *state,
const int32_t * const int32_t *
pcm_resample_32(struct pcm_resample_state *state, pcm_resample_32(struct pcm_resample_state *state,
uint8_t channels, unsigned channels,
unsigned src_rate, const int32_t *src_buffer, size_t src_size, unsigned src_rate, const int32_t *src_buffer, size_t src_size,
unsigned dest_rate, size_t *dest_size_r, unsigned dest_rate, size_t *dest_size_r,
GError **error_r) GError **error_r)
......
src/pcm_resample.h
View file @ 9716c3a3
...@@ -45,7 +45,7 @@ struct pcm_resample_state { ...@@ -45,7 +45,7 @@ struct pcm_resample_state {
struct { struct {
unsigned src_rate; unsigned src_rate;
unsigned dest_rate; unsigned dest_rate;
uint8_t channels; unsigned channels;
} prev; } prev;
int error; int error;
...@@ -82,7 +82,7 @@ void pcm_resample_deinit(struct pcm_resample_state *state); ...@@ -82,7 +82,7 @@ void pcm_resample_deinit(struct pcm_resample_state *state);
*/ */
const int16_t * const int16_t *
pcm_resample_16(struct pcm_resample_state *state, pcm_resample_16(struct pcm_resample_state *state,
uint8_t channels, unsigned channels,
unsigned src_rate, unsigned src_rate,
const int16_t *src_buffer, size_t src_size, const int16_t *src_buffer, size_t src_size,
unsigned dest_rate, size_t *dest_size_r, unsigned dest_rate, size_t *dest_size_r,
...@@ -102,7 +102,7 @@ pcm_resample_16(struct pcm_resample_state *state, ...@@ -102,7 +102,7 @@ pcm_resample_16(struct pcm_resample_state *state,
*/ */
const int32_t * const int32_t *
pcm_resample_32(struct pcm_resample_state *state, pcm_resample_32(struct pcm_resample_state *state,
uint8_t channels, unsigned channels,
unsigned src_rate, unsigned src_rate,
const int32_t *src_buffer, size_t src_size, const int32_t *src_buffer, size_t src_size,
unsigned dest_rate, size_t *dest_size_r, unsigned dest_rate, size_t *dest_size_r,
...@@ -122,7 +122,7 @@ pcm_resample_32(struct pcm_resample_state *state, ...@@ -122,7 +122,7 @@ pcm_resample_32(struct pcm_resample_state *state,
*/ */
static inline const int32_t * static inline const int32_t *
pcm_resample_24(struct pcm_resample_state *state, pcm_resample_24(struct pcm_resample_state *state,
uint8_t channels, unsigned channels,
unsigned src_rate, unsigned src_rate,
const int32_t *src_buffer, size_t src_size, const int32_t *src_buffer, size_t src_size,
unsigned dest_rate, size_t *dest_size_r, unsigned dest_rate, size_t *dest_size_r,
......
src/pcm_resample_fallback.c
View file @ 9716c3a3
...@@ -37,7 +37,7 @@ pcm_resample_fallback_deinit(struct pcm_resample_state *state) ...@@ -37,7 +37,7 @@ pcm_resample_fallback_deinit(struct pcm_resample_state *state)
/* resampling code blatantly ripped from ESD */ /* resampling code blatantly ripped from ESD */
const int16_t * const int16_t *
pcm_resample_fallback_16(struct pcm_resample_state *state, pcm_resample_fallback_16(struct pcm_resample_state *state,
uint8_t channels, unsigned channels,
unsigned src_rate, unsigned src_rate,
const int16_t *src_buffer, size_t src_size, const int16_t *src_buffer, size_t src_size,
unsigned dest_rate, unsigned dest_rate,
...@@ -78,7 +78,7 @@ pcm_resample_fallback_16(struct pcm_resample_state *state, ...@@ -78,7 +78,7 @@ pcm_resample_fallback_16(struct pcm_resample_state *state,
const int32_t * const int32_t *
pcm_resample_fallback_32(struct pcm_resample_state *state, pcm_resample_fallback_32(struct pcm_resample_state *state,
uint8_t channels, unsigned channels,
unsigned src_rate, unsigned src_rate,
const int32_t *src_buffer, size_t src_size, const int32_t *src_buffer, size_t src_size,
unsigned dest_rate, unsigned dest_rate,
......
src/pcm_resample_internal.h
View file @ 9716c3a3
...@@ -43,7 +43,7 @@ pcm_resample_lsr_deinit(struct pcm_resample_state *state); ...@@ -43,7 +43,7 @@ pcm_resample_lsr_deinit(struct pcm_resample_state *state);
const int16_t * const int16_t *
pcm_resample_lsr_16(struct pcm_resample_state *state, pcm_resample_lsr_16(struct pcm_resample_state *state,
uint8_t channels, unsigned channels,
unsigned src_rate, unsigned src_rate,
const int16_t *src_buffer, size_t src_size, const int16_t *src_buffer, size_t src_size,
unsigned dest_rate, size_t *dest_size_r, unsigned dest_rate, size_t *dest_size_r,
...@@ -51,7 +51,7 @@ pcm_resample_lsr_16(struct pcm_resample_state *state, ...@@ -51,7 +51,7 @@ pcm_resample_lsr_16(struct pcm_resample_state *state,
const int32_t * const int32_t *
pcm_resample_lsr_32(struct pcm_resample_state *state, pcm_resample_lsr_32(struct pcm_resample_state *state,
uint8_t channels, unsigned channels,
unsigned src_rate, unsigned src_rate,
const int32_t *src_buffer, const int32_t *src_buffer,
G_GNUC_UNUSED size_t src_size, G_GNUC_UNUSED size_t src_size,
...@@ -68,7 +68,7 @@ pcm_resample_fallback_deinit(struct pcm_resample_state *state); ...@@ -68,7 +68,7 @@ pcm_resample_fallback_deinit(struct pcm_resample_state *state);
const int16_t * const int16_t *
pcm_resample_fallback_16(struct pcm_resample_state *state, pcm_resample_fallback_16(struct pcm_resample_state *state,
uint8_t channels, unsigned channels,
unsigned src_rate, unsigned src_rate,
const int16_t *src_buffer, size_t src_size, const int16_t *src_buffer, size_t src_size,
unsigned dest_rate, unsigned dest_rate,
...@@ -76,7 +76,7 @@ pcm_resample_fallback_16(struct pcm_resample_state *state, ...@@ -76,7 +76,7 @@ pcm_resample_fallback_16(struct pcm_resample_state *state,
const int32_t * const int32_t *
pcm_resample_fallback_32(struct pcm_resample_state *state, pcm_resample_fallback_32(struct pcm_resample_state *state,
uint8_t channels, unsigned channels,
unsigned src_rate, unsigned src_rate,
const int32_t *src_buffer, const int32_t *src_buffer,
G_GNUC_UNUSED size_t src_size, G_GNUC_UNUSED size_t src_size,
......
src/pcm_resample_libsamplerate.c
View file @ 9716c3a3
...@@ -106,7 +106,7 @@ pcm_resample_lsr_deinit(struct pcm_resample_state *state) ...@@ -106,7 +106,7 @@ pcm_resample_lsr_deinit(struct pcm_resample_state *state)
static bool static bool
pcm_resample_set(struct pcm_resample_state *state, pcm_resample_set(struct pcm_resample_state *state,
uint8_t channels, unsigned src_rate, unsigned dest_rate, unsigned channels, unsigned src_rate, unsigned dest_rate,
GError **error_r) GError **error_r)
{ {
int error; int error;
...@@ -159,7 +159,7 @@ lsr_process(struct pcm_resample_state *state, GError **error_r) ...@@ -159,7 +159,7 @@ lsr_process(struct pcm_resample_state *state, GError **error_r)
const int16_t * const int16_t *
pcm_resample_lsr_16(struct pcm_resample_state *state, pcm_resample_lsr_16(struct pcm_resample_state *state,
uint8_t channels, unsigned channels,
unsigned src_rate, unsigned src_rate,
const int16_t *src_buffer, size_t src_size, const int16_t *src_buffer, size_t src_size,
unsigned dest_rate, size_t *dest_size_r, unsigned dest_rate, size_t *dest_size_r,
...@@ -223,7 +223,7 @@ src_float_to_int_array (const float *in, int *out, int len) ...@@ -223,7 +223,7 @@ src_float_to_int_array (const float *in, int *out, int len)
const int32_t * const int32_t *
pcm_resample_lsr_32(struct pcm_resample_state *state, pcm_resample_lsr_32(struct pcm_resample_state *state,
uint8_t channels, unsigned channels,
unsigned src_rate, unsigned src_rate,
const int32_t *src_buffer, size_t src_size, const int32_t *src_buffer, size_t src_size,
unsigned dest_rate, size_t *dest_size_r, unsigned dest_rate, size_t *dest_size_r,
......
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