#1845 Updates polyphase tuner channel manager to avoid retuning for a…

… new channel if all channels will continue to fit using the current center frequency (#1846) Co-authored-by: Dennis Sheirer <dsheirer@github.com>
DSheirer · Feb 11, 2024 · 6532e33 · 6532e33
1 parent 7ea8cb6
commit 6532e33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 44 deletions.
diff --git a/src/main/java/io/github/dsheirer/source/tuner/TunerController.java b/src/main/java/io/github/dsheirer/source/tuner/TunerController.java
@@ -647,45 +647,6 @@ public void receive(INativeBuffer nativeBuffer)
         broadcast(nativeBuffer);
     }
 
-    /**
-     * Indicates if the current center frequency and bandwidth is correct to source the tuner channel
-     *
-     * @param tunerChannel to test
-     * @return true if the current center frequency and bandwidth is correct for the channel
-     */
-    public boolean isTunedFor(TunerChannel tunerChannel)
-    {
-        try
-        {
-            if(tunerChannel.getMinFrequency() < getMinTunedFrequency())
-            {
-                return false;
-            }
-
-            if(tunerChannel.getMaxFrequency() > getMaxTunedFrequency())
-            {
-                return false;
-            }
-
-            if(hasMiddleUnusableBandwidth())
-            {
-                long minAvoid = getFrequency() - getMiddleUnusableHalfBandwidth();
-                long maxAvoid = getFrequency() + getMiddleUnusableHalfBandwidth();
-
-                if(tunerChannel.overlaps(minAvoid, maxAvoid))
-                {
-                    return false;
-                }
-            }
-        }
-        catch(SourceException se)
-        {
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * Indicates if the current center frequency and bandwidth is correct to source the tuner channel set
      *

diff --git a/src/main/java/io/github/dsheirer/source/tuner/manager/PolyphaseChannelSourceManager.java b/src/main/java/io/github/dsheirer/source/tuner/manager/PolyphaseChannelSourceManager.java
@@ -195,15 +195,14 @@ protected long getCenterFrequency(SortedSet<TunerChannel> channels, long current
             throw new IllegalArgumentException("Channel set bandwidth is greater than tuner's available bandwidth");
         }
 
-        long bestIntegralFrequency = getIntegralFrequency(channels);
-
-        //Strategy 1: reuse the current frequency if it's a good integral and the channels fit
-        if(isIntegralSpacing(currentCenterFrequency, bestIntegralFrequency) &&
-            isValidCenterFrequency(channels, currentCenterFrequency))
+        //Strategy 1: reuse the current frequency if the channels fit
+        if(isValidCenterFrequency(channels, currentCenterFrequency))
         {
             return currentCenterFrequency;
         }
 
+        long bestIntegralFrequency = getIntegralFrequency(channels);
+
         double usableHalfBandwidth = mTunerController.getUsableHalfBandwidth();
 
         //Strategy 2: start by placing the center frequency exactly one channel width below the first channel frequency