Mercurial > mplayer.hg
comparison libmpcodecs/ae_pcm.c @ 29826:4eae69f3f4f4
Add support for 8 channel audio.
Where 8 channel support is non-trivial (e.g. ao_dsound), at least ensure we
fail gracefully.
author | tack |
---|---|
date | Tue, 10 Nov 2009 00:45:19 +0000 |
parents | 0f1b5b68af32 |
children | bbb6ebec87a0 |
comparison
equal
deleted
inserted
replaced
29825:9cf56cc1bbb2 | 29826:4eae69f3f4f4 |
---|---|
37 } | 37 } |
38 | 38 |
39 static int encode_pcm(audio_encoder_t *encoder, uint8_t *dest, void *src, int nsamples, int max_size) | 39 static int encode_pcm(audio_encoder_t *encoder, uint8_t *dest, void *src, int nsamples, int max_size) |
40 { | 40 { |
41 max_size = FFMIN(nsamples, max_size); | 41 max_size = FFMIN(nsamples, max_size); |
42 if (encoder->params.channels == 6 || encoder->params.channels == 5) { | 42 if (encoder->params.channels == 5 || encoder->params.channels == 6 || |
43 encoder->params.channels == 8) { | |
43 max_size -= max_size % (encoder->params.channels * 2); | 44 max_size -= max_size % (encoder->params.channels * 2); |
44 reorder_channel_copy_nch(src, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, | 45 reorder_channel_copy_nch(src, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, |
45 dest, AF_CHANNEL_LAYOUT_WAVEEX_DEFAULT, | 46 dest, AF_CHANNEL_LAYOUT_WAVEEX_DEFAULT, |
46 encoder->params.channels, | 47 encoder->params.channels, |
47 max_size / 2, 2); | 48 max_size / 2, 2); |