Tuning the surround masking

We're now a bit more conservative and only take into account the bands
that are being codec. Also weighting the rate saving by the band width.