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

pcm_channels: use pcm_buffer

Browse Source 
Replace a "static" buffer with the PCM buffer library.
This commit is contained in:
Max Kellermann 2009-01-07 23:56:35 +01:00
parent 5fe7e3bc14
commit aab85577bf
4 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/pcm_channels.c
View File

@ -17,6 +17,7 @@
*/ */
#include "pcm_channels.h" #include "pcm_channels.h"
#include "pcm_buffer.h"
#include <glib.h> #include <glib.h>
@ -72,28 +73,23 @@ pcm_convert_channels_16_n_to_2(int16_t *dest,
} }
const int16_t * const int16_t *
pcm_convert_channels_16(int8_t dest_channels, pcm_convert_channels_16(struct pcm_buffer *buffer,
int8_t dest_channels,
int8_t src_channels, const int16_t *src, int8_t src_channels, const int16_t *src,
size_t src_size, size_t *dest_size_r) size_t src_size, size_t *dest_size_r)
{ {
static int16_t *buf;
static size_t len;
unsigned num_frames = src_size / src_channels / sizeof(*src); unsigned num_frames = src_size / src_channels / sizeof(*src);
unsigned dest_size = num_frames * dest_channels * sizeof(*src); unsigned dest_size = num_frames * dest_channels * sizeof(*src);
int16_t *dest = pcm_buffer_get(buffer, dest_size);
if (dest_size > len) {
len = dest_size;
buf = g_realloc(buf, len);
}
*dest_size_r = dest_size; *dest_size_r = dest_size;
if (src_channels == 1 && dest_channels == 2) if (src_channels == 1 && dest_channels == 2)
pcm_convert_channels_16_1_to_2(buf, src, num_frames); pcm_convert_channels_16_1_to_2(dest, src, num_frames);
else if (src_channels == 2 && dest_channels == 1) else if (src_channels == 2 && dest_channels == 1)
pcm_convert_channels_16_2_to_1(buf, src, num_frames); pcm_convert_channels_16_2_to_1(dest, src, num_frames);
else if (dest_channels == 2) else if (dest_channels == 2)
pcm_convert_channels_16_n_to_2(buf, src_channels, src, pcm_convert_channels_16_n_to_2(dest, src_channels, src,
num_frames); num_frames);
else { else {
g_warning("conversion %u->%u channels is not supported", g_warning("conversion %u->%u channels is not supported",
@ -101,7 +97,7 @@ pcm_convert_channels_16(int8_t dest_channels,
return NULL; return NULL;
} }
return buf; return dest;
} }
static void static void
@ -151,28 +147,23 @@ pcm_convert_channels_24_n_to_2(int32_t *dest,
} }
const int32_t * const int32_t *
pcm_convert_channels_24(int8_t dest_channels, pcm_convert_channels_24(struct pcm_buffer *buffer,
int8_t dest_channels,
int8_t src_channels, const int32_t *src, int8_t src_channels, const int32_t *src,
size_t src_size, size_t *dest_size_r) size_t src_size, size_t *dest_size_r)
{ {
static int32_t *buf;
static size_t len;
unsigned num_frames = src_size / src_channels / sizeof(*src); unsigned num_frames = src_size / src_channels / sizeof(*src);
unsigned dest_size = num_frames * dest_channels * sizeof(*src); unsigned dest_size = num_frames * dest_channels * sizeof(*src);
int32_t *dest = pcm_buffer_get(buffer, dest_size);
if (dest_size > len) {
len = dest_size;
buf = g_realloc(buf, len);
}
*dest_size_r = dest_size; *dest_size_r = dest_size;
if (src_channels == 1 && dest_channels == 2) if (src_channels == 1 && dest_channels == 2)
pcm_convert_channels_24_1_to_2(buf, src, num_frames); pcm_convert_channels_24_1_to_2(dest, src, num_frames);
else if (src_channels == 2 && dest_channels == 1) else if (src_channels == 2 && dest_channels == 1)
pcm_convert_channels_24_2_to_1(buf, src, num_frames); pcm_convert_channels_24_2_to_1(dest, src, num_frames);
else if (dest_channels == 2) else if (dest_channels == 2)
pcm_convert_channels_24_n_to_2(buf, src_channels, src, pcm_convert_channels_24_n_to_2(dest, src_channels, src,
num_frames); num_frames);
else { else {
g_warning("conversion %u->%u channels is not supported", g_warning("conversion %u->%u channels is not supported",
@ -180,5 +171,5 @@ pcm_convert_channels_24(int8_t dest_channels,
return NULL; return NULL;
} }
return buf; return dest;
} }

8
src/pcm_channels.h
View File

@ -22,13 +22,17 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
struct pcm_buffer;
const int16_t * const int16_t *
pcm_convert_channels_16(int8_t dest_channels, pcm_convert_channels_16(struct pcm_buffer *buffer,
int8_t dest_channels,
int8_t src_channels, const int16_t *src, int8_t src_channels, const int16_t *src,
size_t src_size, size_t *dest_size_r); size_t src_size, size_t *dest_size_r);
const int32_t * const int32_t *
pcm_convert_channels_24(int8_t dest_channels, pcm_convert_channels_24(struct pcm_buffer *buffer,
int8_t dest_channels,
int8_t src_channels, const int32_t *src, int8_t src_channels, const int32_t *src,
size_t src_size, size_t *dest_size_r); size_t src_size, size_t *dest_size_r);

8
src/pcm_convert.c
View File

@ -37,6 +37,7 @@ void pcm_convert_init(struct pcm_convert_state *state)
pcm_dither_24_init(&state->dither); pcm_dither_24_init(&state->dither);
pcm_buffer_init(&state->format_buffer); pcm_buffer_init(&state->format_buffer);
pcm_buffer_init(&state->channels_buffer);
} }
void pcm_convert_deinit(struct pcm_convert_state *state) void pcm_convert_deinit(struct pcm_convert_state *state)
@ -44,6 +45,7 @@ void pcm_convert_deinit(struct pcm_convert_state *state)
pcm_resample_deinit(&state->resample); pcm_resample_deinit(&state->resample);
pcm_buffer_deinit(&state->format_buffer); pcm_buffer_deinit(&state->format_buffer);
pcm_buffer_deinit(&state->channels_buffer);
} }
static size_t static size_t
@ -66,7 +68,8 @@ pcm_convert_16(const struct audio_format *src_format,
g_error("pcm_convert_to_16() failed"); g_error("pcm_convert_to_16() failed");
if (src_format->channels != dest_format->channels) { if (src_format->channels != dest_format->channels) {
buf = pcm_convert_channels_16(dest_format->channels, buf = pcm_convert_channels_16(&state->channels_buffer,
dest_format->channels,
src_format->channels, src_format->channels,
buf, len, &len); buf, len, &len);
if (!buf) if (!buf)
@ -106,7 +109,8 @@ pcm_convert_24(const struct audio_format *src_format,
g_error("pcm_convert_to_24() failed"); g_error("pcm_convert_to_24() failed");
if (src_format->channels != dest_format->channels) { if (src_format->channels != dest_format->channels) {
buf = pcm_convert_channels_24(dest_format->channels, buf = pcm_convert_channels_24(&state->channels_buffer,
dest_format->channels,
src_format->channels, src_format->channels,
buf, len, &len); buf, len, &len);
if (!buf) if (!buf)

3
src/pcm_convert.h
View File

@ -32,6 +32,9 @@ struct pcm_convert_state {
/** the buffer for converting the sample format */ /** the buffer for converting the sample format */
struct pcm_buffer format_buffer; struct pcm_buffer format_buffer;
/** the buffer for converting the channel count */
struct pcm_buffer channels_buffer;
}; };
void pcm_convert_init(struct pcm_convert_state *state); void pcm_convert_init(struct pcm_convert_state *state);