Mercurial > libavcodec.hg
changeset 12146:36f7c2d7b3fb libavcodec
Fix side channels when XCh extension is present.
Patch by Nick Brereton $name AT n$surname DOT net
| author | benoit |
|---|---|
| date | Mon, 12 Jul 2010 09:10:53 +0000 |
| parents | 9109a7e48d6e |
| children | 6d7a12293959 |
| files | dca.c |
| diffstat | 1 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/dca.c Mon Jul 12 09:00:17 2010 +0000 +++ b/dca.c Mon Jul 12 09:10:53 2010 +0000 @@ -1394,6 +1394,20 @@ /* filter to get final output */ for (i = 0; i < (s->sample_blocks / 8); i++) { dca_filter_channels(s, i); + + /* If this was marked as a DTS-ES stream we need to subtract back- */ + /* channel from SL & SR to remove matrixed back-channel signal */ + if((s->source_pcm_res & 1) && s->xch_present) { + float* back_chan = s->samples + s->channel_order_tab[s->xch_base_channel] * 256; + float* lt_chan = s->samples + s->channel_order_tab[s->xch_base_channel - 2] * 256; + float* rt_chan = s->samples + s->channel_order_tab[s->xch_base_channel - 1] * 256; + int j; + for(j = 0; j < 256; ++j) { + lt_chan[j] -= (back_chan[j] - s->add_bias) * 0.707107f; + rt_chan[j] -= (back_chan[j] - s->add_bias) * 0.707107f; + } + } + s->dsp.float_to_int16_interleave(samples, s->samples_chanptr, 256, channels); samples += 256 * channels; }