diff --git a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/ChannelCalculator.java b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/ChannelCalculator.java index 0f387d8b..a33b2f2b 100644 --- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/ChannelCalculator.java +++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/ChannelCalculator.java @@ -521,15 +521,21 @@ public class ChannelCalculator int index = indexes.get(centerIndex); - if(index == getWrapAroundIndex()) + if(indexes.size() % 2 == 0) { - return (long)getIndexCenterFrequency(indexes.get(centerIndex), IndexBoundaryPolicy.ADJUST_NEGATIVE); + return (long)getIndexMaximumFrequency(index, IndexBoundaryPolicy.ADJUST_NEGATIVE); } else { - return (long)getIndexCenterFrequency(indexes.get(centerIndex), IndexBoundaryPolicy.ADJUST_POSITIVE); + if(index == getWrapAroundIndex()) + { + return (long)getIndexCenterFrequency(index, IndexBoundaryPolicy.ADJUST_NEGATIVE); + } + else + { + return (long)getIndexCenterFrequency(index, IndexBoundaryPolicy.ADJUST_POSITIVE); + } } - } /** diff --git a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/ChannelOutputProcessor.java b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/ChannelOutputProcessor.java index f280efbb..c75205a4 100644 --- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/ChannelOutputProcessor.java +++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/ChannelOutputProcessor.java @@ -68,14 +68,13 @@ public abstract class ChannelOutputProcessor implements IPolyphaseChannelOutputP @Override public void setFrequencyOffset(long frequencyOffset) { - long offset = frequencyOffset; - mLog.debug("Setting frequency offset to: " + offset); -// mFrequencyCorrectionMixer.setFrequency(offset); + mLog.debug("Setting frequency offset to: " + frequencyOffset); + mFrequencyCorrectionMixer.setFrequency(frequencyOffset); mFrequencyCorrectionEnabled = (frequencyOffset != 0); } /** - * Oscillator/mixer to use for frequency correction against incominb sample stream + * Oscillator/mixer to use for frequency correction against incoming sample stream */ protected IOscillator getFrequencyCorrectionMixer() {