search for: 98fc430

This is equivalent and just makes the code shorter. --- src/flac/decode.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/flac/decode.c b/src/flac/decode.c index fa82c04..98fc430 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -333,32 +333,26 @@ FLAC__bool DecoderSession_process(DecoderSession *d) return false; /* set channel mapping */ - if(!d->channel_map_none) { - /* currently FLAC order matches SMPTE/WAVEFORMATEXTENSIBLE order, so no reordering is n...

...1 surround input WAV files, and writes the corresponding masks when decoding to WAV without a channel mask from the metadata block. --- src/flac/decode.c | 5 +++++ src/flac/encode.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/flac/decode.c b/src/flac/decode.c index 98fc430..2d1bdd6 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -354,6 +354,11 @@ FLAC__bool DecoderSession_process(DecoderSession *d) else if(d->channels == 6) { d->channel_mask = 0x060f; } + else if(d->channels == 7) { + d->channel_ma...

Now that we've selected a channel mapping for 7 and 8 channel flac, the command-line encoder tools needs updating to accept wav files with compatible channel maps. -r -------------- next part --------------

...ont center, LFE, back center, side left, side right</li> + <li>8 channels: front left, front right, front center, LFE, back left, back right, side left, side right</li> </ul> </li> <li> diff --git a/src/flac/decode.c b/src/flac/decode.c index 98fc430..77acb7c 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -354,6 +354,12 @@ FLAC__bool DecoderSession_process(DecoderSession *d) else if(d->channels == 6) { d->channel_mask = 0x060f; } + else if(d->channels == 7) { + d->channel_ma...