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

read num_channels once

Browse Source 
Read frame->header.channels once, and pass only this integer to
flac_convert().

git-svn-id: https://svn.musicpd.org/mpd/trunk@7329 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Max Kellermann 2008-04-12 04:20:25 +00:00 committed by Eric Wong
parent a91f2a1f05
commit 3db2b98718
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/inputPlugins/flac_plugin.c
View File

@ -207,7 +207,7 @@ static void flacMetadata(const flac_decoder * dec,
} }
static void flac_convert(unsigned char *dest, static void flac_convert(unsigned char *dest,
const FLAC__Frame * frame, unsigned int num_channels,
unsigned int bytes_per_sample, unsigned int bytes_per_sample,
const FLAC__int32 * const buf[], const FLAC__int32 * const buf[],
unsigned int position, unsigned int end) unsigned int position, unsigned int end)
@ -217,7 +217,7 @@ static void flac_convert(unsigned char *dest,
unsigned char *uc; unsigned char *uc;
for (; position < end; ++position) { for (; position < end; ++position) {
for (c_chan = 0; c_chan < frame->header.channels; c_chan++) { for (c_chan = 0; c_chan < num_channels; c_chan++) {
u16 = buf[c_chan][position]; u16 = buf[c_chan][position];
uc = (unsigned char *)&u16; uc = (unsigned char *)&u16;
for (i = 0; i < bytes_per_sample; i++) { for (i = 0; i < bytes_per_sample; i++) {
@ -235,6 +235,7 @@ static FLAC__StreamDecoderWriteStatus flacWrite(const flac_decoder *dec,
FlacData *data = (FlacData *) vdata; FlacData *data = (FlacData *) vdata;
FLAC__uint32 samples = frame->header.blocksize; FLAC__uint32 samples = frame->header.blocksize;
unsigned int c_samp; unsigned int c_samp;
const unsigned int num_channels = frame->header.channels;
const unsigned int bytes_per_sample = (data->dc->audioFormat.bits / 8); const unsigned int bytes_per_sample = (data->dc->audioFormat.bits / 8);
const unsigned int bytes_per_channel = const unsigned int bytes_per_channel =
bytes_per_sample * frame->header.channels; bytes_per_sample * frame->header.channels;
@ -266,7 +267,7 @@ static FLAC__StreamDecoderWriteStatus flacWrite(const flac_decoder *dec,
num_samples = max_samples; num_samples = max_samples;
flac_convert(data->chunk + data->chunk_length, flac_convert(data->chunk + data->chunk_length,
frame, bytes_per_sample, buf, num_channels, bytes_per_sample, buf,
c_samp, c_samp + num_samples); c_samp, c_samp + num_samples);
data->chunk_length = num_samples; data->chunk_length = num_samples;