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

shout_ogg: moved PCM conversion to a separate function

Browse Source 
For simplification, moved the PCM conversion code to
pcm16_to_ogg_buffer().  Work with a int16_t pointer instead of a char
pointer.
This commit is contained in:
Max Kellermann 2009-02-10 21:25:45 +01:00
parent 54982f755f
commit 12756c1b55
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/output/shout_ogg.c
View File

@ -238,28 +238,29 @@ static int shout_ogg_encoder_send_metadata(struct shout_data *sd,
return 0; return 0;
} }
static void
pcm16_to_ogg_buffer(float **dest, const int16_t *src,
unsigned num_samples, unsigned num_channels)
{
for (unsigned i = 0; i < num_samples; i++)
for (unsigned j = 0; j < num_channels; j++)
dest[j][i] = *src++ / 32768.0;
}
static int shout_ogg_encoder_encode(struct shout_data *sd, static int shout_ogg_encoder_encode(struct shout_data *sd,
const char *chunk, size_t size) const char *chunk, size_t size)
{ {
struct shout_buffer *buf = &sd->buf; struct shout_buffer *buf = &sd->buf;
unsigned int i;
int j;
float **vorbbuf;
unsigned int samples; unsigned int samples;
int bytes = audio_format_sample_size(&sd->audio_format);
struct ogg_vorbis_data *od = (struct ogg_vorbis_data *)sd->encoder_data; struct ogg_vorbis_data *od = (struct ogg_vorbis_data *)sd->encoder_data;
samples = size / (bytes * sd->audio_format.channels); samples = size / audio_format_frame_size(&sd->audio_format);
vorbbuf = vorbis_analysis_buffer(&od->vd, samples);
/* this is for only 16-bit audio */ /* this is for only 16-bit audio */
for (i = 0; i < samples; i++) { pcm16_to_ogg_buffer(vorbis_analysis_buffer(&od->vd, samples),
for (j = 0; j < sd->audio_format.channels; j++) { (const int16_t *)chunk,
vorbbuf[j][i] = (*((const int16_t *) chunk)) / 32768.0; samples, sd->audio_format.channels);
chunk += bytes;
}
}
vorbis_analysis_wrote(&od->vd, samples); vorbis_analysis_wrote(&od->vd, samples);