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

decoder/mad: pass mad_pcm to mad_fixed_to_24_buffer()

Browse Source
This commit is contained in:
Max Kellermann 2019-08-03 11:40:06 +02:00
parent d00afc912c
commit 51abed9732
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/decoder/plugins/MadDecoderPlugin.cxx
View File

@ -89,13 +89,13 @@ mad_fixed_to_24_sample(mad_fixed_t sample) noexcept
} }
static void static void
mad_fixed_to_24_buffer(int32_t *dest, const struct mad_synth *synth, mad_fixed_to_24_buffer(int32_t *dest, const struct mad_pcm &src,
unsigned int start, unsigned int end, unsigned int start, unsigned int end,
unsigned int num_channels) unsigned int num_channels)
{ {
for (unsigned i = start; i < end; ++i) for (unsigned i = start; i < end; ++i)
for (unsigned c = 0; c < num_channels; ++c) for (unsigned c = 0; c < num_channels; ++c)
*dest++ = mad_fixed_to_24_sample(synth->pcm.samples[c][i]); *dest++ = mad_fixed_to_24_sample(src.samples[c][i]);
} }
static bool static bool
@ -848,7 +848,7 @@ MadDecoder::SubmitPCM(unsigned i, unsigned pcm_length) noexcept
{ {
unsigned int num_samples = pcm_length - i; unsigned int num_samples = pcm_length - i;
mad_fixed_to_24_buffer(output_buffer, &synth, mad_fixed_to_24_buffer(output_buffer, synth.pcm,
i, i + num_samples, i, i + num_samples,
MAD_NCHANNELS(&frame.header)); MAD_NCHANNELS(&frame.header));
num_samples *= MAD_NCHANNELS(&frame.header); num_samples *= MAD_NCHANNELS(&frame.header);