Cherry Pick: #1405 polyphase channelizer thread leak.

Updates release to 0.5.2
#1449 Updates version to 0.5.1 final (#1451 )
2026-11-10 07:37:25 -05:00 · 2023-03-05 06:34:29 -05:00 · 2023-03-05 06:32:56 -05:00 · 2023-02-19 07:17:10 -05:00 · 2023-02-19 07:10:44 -05:00 · 2023-02-18 08:36:55 -05:00
223 changed files with 8334 additions and 2848 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
  <component name="FrameworkDetectionExcludesConfiguration">
    <file type="web" url="file://$PROJECT_DIR$" />
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="liberica-18.0.1-fx" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="liberica-19.0.1.fx" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
 </project>
--- a/README.md
+++ b/README.md
@@ -3,91 +3,22 @@
 # sdrtrunk
 A cross-platform java application for decoding, monitoring, recording and streaming trunked mobile and related radio protocols using Software Defined Radios (SDR).

-* [Getting Started](https://github.com/DSheirer/sdrtrunk/wiki/GettingStarted_V0.3.0)
-* [User's Manual Version 0.3.0 and 0.4.0](https://github.com/DSheirer/sdrtrunk/wiki/UserManual_V0.3.0)
-* [Playlist Editor User Manual Version 0.5.0](https://github.com/DSheirer/sdrtrunk/wiki/Playlist-Editor)
+* [Getting Started](https://github.com/DSheirer/sdrtrunk/wiki/Getting-Started)
+* [User's Manual](https://github.com/DSheirer/sdrtrunk/wiki/User-Manual)
 * [Download](https://github.com/DSheirer/sdrtrunk/releases)
-* [Support Group](https://groups.google.com/forum/#!forum/sdrtrunk)
-* [Discord Support Channel](https://discord.gg/HJQaKYE)
+* [Support](https://github.com/DSheirer/sdrtrunk/wiki/Support)

-![sdrtrunk Application Overview - Version 0.3.0](https://github.com/DSheirer/sdrtrunk/wiki/v0.3/images/ApplicationOverview_V0.3.0.png)
-**Figure 1:** sdrtrunk **Version 0.3.0** Application Screenshot
+![sdrtrunk Application](https://github.com/DSheirer/sdrtrunk/wiki/images/sdrtrunk.png)
+**Figure 1:** sdrtrunk Application Screenshot

-# End User Instructions:
-
-If you simply want to download and run the program, please follow these instructions.
-
-## Download the latest sdrtrunk release for your operating system
- 
+## Download the Latest Release
 All release versions of sdrtrunk are available from the [releases](https://github.com/DSheirer/sdrtrunk/releases) tab.

 * **(alpha)** These versions are under development feature previews and likely to contain bugs and unexpected behavior.
 * **(beta)** These versions are currently being tested for bugs and functionality prior to final release.
 * **(final)** These versions have been tested and are the current release version.

-## Unzip the release
-
-Use 7-zip or any zip utility to unzip the release file
-
-## Start the application
-
-Once unzipped, open a command prompt to where you unzipped the release.  Change to the **/bin** directory and use the launch script to start the application:
-* **Windows** sdr-trunk.bat
-* **Linux/OSX** ./sdr-trunk
-
-## Optional - P25/DMR Audio
-If you're using sdrtrunk with a P25 or DMR radio system, you'll need to compile and include the [JMBE](https://github.com/DSheirer/sdrtrunk/wiki/JMBE) digital audio library.
-
-In Version 0.5.0 and higher, the SDRTrunk application has support for building the JMBE library.  On the menu, choose **View >> User Preferences** and then click the **Decoder >> JMBE Audio Library** tab.
-
-For versions prior to Version 0.5.0, the [JMBE](https://github.com/DSheirer/sdrtrunk/wiki/JMBE) wiki page contains instructions for downloading the JMBE audio library source code and compiling the JMBE library.  Once you have compiled the library, launch the sdrtrunk application.  From the menu bar, choose **View >> Preferences**.  In the **JMBE Audio Codec** section, update the path to where your compiled JMBE library is located.  Any channels that are started after you set the path will be able to produce P25 audio.
-
 ## Minimum System Requirements
 * **Operating System:** Windows (~~32 or~~ 64-bit), Linux (~~32 or~~ 64-bit) or Mac/Linux (64-bit, 10.14 or higher)
 * **CPU:** 4-core
 * **RAM:** 8GB or more (preferred).  Depending on usage, 4GB may be sufficient.
-
-# Developer Instructions:
-
-If you're interested in modifying and/or compiling the source code, please follow these instructions to use gradle to compile the code. 
-
-## Build the project
-sdrtrunk uses the gradle build system. This requires **OpenJDK 17** or higher installed on your local computer.  
-
-### OpenJDK
-There are many vendors producing OpenJDK distributions.  A few that I use are:
-* [Azul Zulu OpenJDK](https://www.azul.com/downloads/?package=jdk)
-* [Bellsoft Liberica OpenJDK](https://bell-sw.com/pages/downloads/#/java-17-lts%20/%20current)
-* [SDKMAN](https://sdkman.io/) - Linux Only
-
-Use the gradle wrapper to build the source code:
-
-### Linux
-```
-./gradlew clean build
-```
-### Windows
-```
-gradlew.bat clean build
-```
-
-The **/build/distributions** folder will contain the zip file of the compiled program.  Unzip it and launch the program from the scripts in the **/bin** directory.
-
-## Run the Application (from Gradle)
-
-### Linux
-```
-./gradlew clean run
-```
-### Windows
-```
-gradlew.bat clean run
-```
-
-
-## Development
-All dependencies/versions are controlled from build.gradle.
-To change the new release version tag of artifact - change property:
-```
-version = '0.5.0'
-```
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ repositories {
    maven { url "https://jitpack.io" }
 }

-version = '0.5.0-beta5'
+version = '0.5.2'
 sourceCompatibility = '17'

 sourceSets {
@@ -43,10 +43,10 @@ test {
 dependencies {

    // JUnit Tests
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.assertj:assertj-core:3.8.0'
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
-    testImplementation 'org.mockito:mockito-core:3.+'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.9.0')
+    testImplementation 'org.mockito:mockito-core:4.8.0'

    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'

@@ -56,33 +56,33 @@ dependencies {
    implementation 'com.github.nwaldispuehl:java-lame:v3.98.4'

    //mavenCentral/jcenter imports
-    implementation 'ch.qos.logback:logback-classic:1.2.3'
-    implementation 'ch.qos.logback:logback-core:1.2.3'
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.2'
-    implementation 'com.fazecast:jSerialComm:2.5.0'
+    implementation 'ch.qos.logback:logback-classic:1.4.5'
+    implementation 'ch.qos.logback:logback-core:1.4.5'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.14.0'
+    implementation 'com.fazecast:jSerialComm:2.9.3'
    implementation 'com.github.jiconfont:jiconfont-font_awesome:4.7.0.1'
    implementation 'com.github.jiconfont:jiconfont-javafx:1.0.0'
    implementation 'com.github.jiconfont:jiconfont-swing:1.0.1'
    implementation 'com.github.wendykierp:JTransforms:3.1'
-    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.google.guava:guava:27.0.1-jre'
+    implementation 'com.google.code.gson:gson:2.10'
+    implementation 'com.google.guava:guava:31.1-jre'
    implementation 'com.jidesoft:jide-oss:3.6.18'
-    implementation 'com.miglayout:miglayout-swing:5.2'
+    implementation 'com.miglayout:miglayout-swing:11.0'
    implementation 'com.mpatric:mp3agic:0.9.1'
-    implementation 'commons-io:commons-io:2.7'
+    implementation 'commons-io:commons-io:2.11.0'
    implementation 'eu.hansolo:charts:1.0.5'
-    implementation 'io.github.dsheirer:radio-reference-api:15.1.8'
+    implementation 'io.github.dsheirer:radio-reference-api:15.1.9'
    implementation 'javax.usb:usb-api:1.0.2'
-    implementation 'net.coderazzi:tablefilter-swing:5.4.0'
-    implementation 'org.apache.commons:commons-compress:1.20'
-    implementation 'org.apache.commons:commons-lang3:3.8.1'
+    implementation 'net.coderazzi:tablefilter-swing:5.5.4'
+    implementation 'org.apache.commons:commons-compress:1.21'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
    implementation 'org.apache.commons:commons-math3:3.6.1'
    implementation 'org.apache.commons:commons-csv:1.9.0'
-    implementation 'org.apache.mina:mina-core:2.1.3'
-    implementation 'org.apache.mina:mina-http:2.1.3'
-    implementation 'org.controlsfx:controlsfx:11.1.0'
-    implementation 'org.rauschig:jarchivelib:1.0.0'
-    implementation 'org.slf4j:slf4j-api:1.7.25'
+    implementation 'org.apache.mina:mina-core:2.2.1'
+    implementation 'org.apache.mina:mina-http:2.2.1'
+    implementation 'org.controlsfx:controlsfx:11.1.2'
+    implementation 'org.rauschig:jarchivelib:1.2.0'
+    implementation 'org.slf4j:slf4j-api:2.0.5'
    implementation 'org.usb4java:libusb4java:1.3.0'
    implementation 'org.usb4java:usb4java:1.3.0'
    implementation 'org.usb4java:usb4java-javax:1.3.0'
@@ -139,11 +139,11 @@ String targetWindowsX86_64 = 'windows-x86_64-v' + version
 * author's development environment, but can be changed to your environment if you want to use this build pattern.
 */
 String jdk_base = '/home/denny/java_jdks/'
-String jdk_linux_aarch64 = jdk_base + 'linux-arm64/jdk-18.0.1-full'
-String jdk_linux_x86_64 = jdk_base + 'linux-x64/jdk-18.0.1-full'
-String jdk_osx_x86_64 = jdk_base + 'osx-x64/jdk-18.0.1-full.jdk'
-String jdk_osx_aarch64 = jdk_base + 'osx-arm64/jdk-18.0.1-full.jdk'
-String jdk_windows_x86_64 = jdk_base + 'windows-x64/jdk-18.0.1-full'
+String jdk_linux_aarch64 = jdk_base + 'linux-arm64/jdk-19.0.1-full'
+String jdk_linux_x86_64 = jdk_base + 'linux-x64/jdk-19.0.1-full'
+String jdk_osx_x86_64 = jdk_base + 'osx-x64/jdk-19.0.1-full.jdk'
+String jdk_osx_aarch64 = jdk_base + 'osx-arm64/jdk-19.0.1-full.jdk'
+String jdk_windows_x86_64 = jdk_base + 'windows-x64/jdk-19.0.1-full'

 boolean hasTargetJdks = file(jdk_linux_x86_64).exists() || file(jdk_linux_aarch64).exists() ||
        file(jdk_osx_x86_64).exists() || file(jdk_osx_aarch64).exists() || file(jdk_windows_x86_64).exists()
@@ -172,19 +172,19 @@ runtime {
        println("Building all runtime images")
        println("The [ > jre: ] build phase downloads several target JDKs and this may take a while ... please wait")
        targetPlatform(targetLinuxAarch64) {
-            jdkHome = jdkDownload("https://download.bell-sw.com/java/18.0.1+12/bellsoft-jdk18.0.1+12-linux-aarch64-full.tar.gz")
+            jdkHome = jdkDownload("https://download.bell-sw.com/java/19.0.1+11/bellsoft-jdk19.0.1+11-linux-aarch64-full.tar.gz")
        }
        targetPlatform(targetLinuxX86_64) {
-            jdkHome = jdkDownload("https://download.bell-sw.com/java/18.0.1+12/bellsoft-jdk18.0.1+12-linux-amd64-full.tar.gz")
+            jdkHome = jdkDownload("https://download.bell-sw.com/java/19.0.1+11/bellsoft-jdk19.0.1+11-linux-amd64-full.tar.gz")
        }
        targetPlatform(targetOsxAarch64) {
-            jdkHome = jdkDownload("https://download.bell-sw.com/java/18.0.1+12/bellsoft-jdk18.0.1+12-macos-aarch64-full.tar.gz")
+            jdkHome = jdkDownload("https://download.bell-sw.com/java/19.0.1+11/bellsoft-jdk19.0.1+11-macos-aarch64-full.tar.gz")
        }
        targetPlatform(targetOsxX86_64) {
-            jdkHome = jdkDownload("https://download.bell-sw.com/java/18.0.1+12/bellsoft-jdk18.0.1+12-macos-amd64-full.tar.gz")
+            jdkHome = jdkDownload("https://download.bell-sw.com/java/19.0.1+11/bellsoft-jdk19.0.1+11-macos-amd64-full.tar.gz")
        }
        targetPlatform(targetWindowsX86_64) {
-            jdkHome = jdkDownload("https://download.bell-sw.com/java/18.0.1+12/bellsoft-jdk18.0.1+12-windows-amd64-full.zip")
+            jdkHome = jdkDownload("https://download.bell-sw.com/java/19.0.1+11/bellsoft-jdk19.0.1+11-windows-amd64-full.zip")
        }
    }
    //Build using pre-downloaded JDKs
@@ -212,7 +212,9 @@ runtime {
    }

    //Additional modules to include with auto-detected modules.
-    modules = ['jdk.crypto.ec'] //jdk.crypto.ec needed for HTTPS connections (broadcastify calls & map tile server)
+    //jdk.crypto.ec needed for HTTPS connections (broadcastify calls & map tile server)
+    //jdk.accessibility is used with assistive technologies like screen readers
+    modules = ['jdk.crypto.ec','jdk.accessibility']

    //Use auto-detected modules and 'add' any specified modules.
    additive = true
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -19,6 +19,7 @@

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/306
+++ b/306
@@ -1,94 +1,132 @@
-#!/usr/bin/env sh
+#!/bin/sh

 #
-# Copyright 2015 the original author or authors.
+# ******************************************************************************
+# Copyright (C) 2014-2022 Dennis Sheirer
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-#      https://www.apache.org/licenses/LICENSE-2.0
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>
+# *****************************************************************************
 #

 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################

 # Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null

-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum

 warn () {
    echo "$*"
-}
+} >&2

 die () {
    echo
    echo "$*"
    echo
    exit 1
-}
+} >&2

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
    else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,7 +135,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
+    JAVACMD=java
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@@ -105,79 +143,105 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'

 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@@ -25,10 +25,14 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@@ -37,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +55,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute

 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,38 +65,26 @@ echo location of your Java installation.

 goto fail

-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
@rem Setup the command line

 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

 :end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
--- a/src/main/java/io/github/dsheirer/audio/broadcast/AudioStreamingBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/AudioStreamingBroadcaster.java
@@ -18,24 +18,22 @@
 */
 package io.github.dsheirer.audio.broadcast;

+import io.github.dsheirer.audio.convert.AudioFrames;
 import io.github.dsheirer.audio.convert.ISilenceGenerator;
 import io.github.dsheirer.audio.convert.InputAudioFormat;
+import io.github.dsheirer.audio.convert.MP3FrameTools;
 import io.github.dsheirer.audio.convert.MP3Setting;
 import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.util.ThreadPool;
-import org.apache.commons.math3.util.FastMath;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 public abstract class AudioStreamingBroadcaster<T extends BroadcastConfiguration> extends AbstractAudioBroadcaster<T>
 {
@@ -48,6 +46,7 @@ public abstract class AudioStreamingBroadcaster<T extends BroadcastConfiguration
    private Queue<AudioRecording> mAudioRecordingQueue = new LinkedTransferQueue<>();
    private ISilenceGenerator mSilenceGenerator;

+    private BroadcastFormat mBroadcastFormat;
    private long mDelay;
    private long mMaximumRecordingAge;
    private AtomicBoolean mStreaming = new AtomicBoolean();
@@ -56,6 +55,8 @@ public abstract class AudioStreamingBroadcaster<T extends BroadcastConfiguration
    protected int mInlineInterval;
    protected int mInlineRemaining = -1;

+    private int mTimeOverrun = 0;
+
    /**
     * AudioBroadcaster for streaming audio recordings to a remote streaming audio server.  Audio recordings are
     * generated by an internal StreamManager that converts an inbound stream of AudioPackets into a recording of the
@@ -80,10 +81,11 @@ public abstract class AudioStreamingBroadcaster<T extends BroadcastConfiguration
    public AudioStreamingBroadcaster(T broadcastConfiguration, InputAudioFormat inputAudioFormat, MP3Setting mp3Setting)
    {
        super(broadcastConfiguration);
+        mBroadcastFormat = broadcastConfiguration.getBroadcastFormat();
        mDelay = getBroadcastConfiguration().getDelay();
        mMaximumRecordingAge = getBroadcastConfiguration().getMaximumRecordingAge();
        mSilenceGenerator = BroadcastFactory.getSilenceGenerator(broadcastConfiguration.getBroadcastFormat(),
-                inputAudioFormat, mp3Setting);
+        inputAudioFormat, mp3Setting);
    }

    public void dispose()
@@ -249,7 +251,6 @@ public abstract class AudioStreamingBroadcaster<T extends BroadcastConfiguration
    public boolean canConnect()
    {
        BroadcastState state = getBroadcastState();
-
        return state != BroadcastState.CONNECTED && !state.isErrorState();
    }

@@ -270,10 +271,8 @@ public abstract class AudioStreamingBroadcaster<T extends BroadcastConfiguration
    public class RecordingQueueProcessor implements Runnable
    {
        private AtomicBoolean mProcessing = new AtomicBoolean();
-        private ByteArrayInputStream mInputStream;
+        private AudioFrames mInputFrames;
        private IdentifierCollection mInputIdentifierCollection;
-        private long mFinalSilencePadding = 0;
-        private int mBytesToStreamPerInterval = 0;

        @Override
        public void run()
@@ -282,48 +281,35 @@ public abstract class AudioStreamingBroadcaster<T extends BroadcastConfiguration
            {
                try
                {
-                    if(mInputStream == null || mInputStream.available() <= 0)
+                    int timeSent = 0;
+
+                    if(mInputFrames == null || !mInputFrames.hasNextFrame())
                    {
                        nextRecording();
                    }

-                    if(mInputStream != null)
+                    if(mInputFrames != null && mInputFrames.hasNextFrame())
                    {
-                        int length = FastMath.min(mBytesToStreamPerInterval, mInputStream.available());
-
-                        byte[] audio = new byte[length];
-
-                        try
+                        while(mInputFrames.hasNextFrame() && timeSent < PROCESSOR_RUN_INTERVAL_MS)
                        {
-                            int read = mInputStream.read(audio);
-                            broadcastAudio(audio, mInputIdentifierCollection);
-                        }
-                        catch(IOException ioe)
-                        {
-                            mLog.error("Error reading from in-memory audio recording input stream", ioe);
-                        }
-
-                        //If this is the final frame fragment then append silence padding to fill the final interval segment
-                        if(length < mBytesToStreamPerInterval && mFinalSilencePadding > 0)
-                        {
-                            List<byte[]> finalSilence = mSilenceGenerator.generate(mFinalSilencePadding);
-
-                            for(byte[] silence: finalSilence)
-                            {
-                                broadcastAudio(silence, null);
-                            }
-
-                            mFinalSilencePadding = 0;
+                            mInputFrames.nextFrame();
+                            broadcastAudio(mInputFrames.getCurrentFrame(), mInputIdentifierCollection);
+                            timeSent += mInputFrames.getCurrentFrameDuration();
                        }
                    }
-                    else
+
+                    if((mInputFrames == null || !mInputFrames.hasNextFrame()) && timeSent < PROCESSOR_RUN_INTERVAL_MS)
                    {
-                        List<byte[]> silenceFrames = mSilenceGenerator.generate(PROCESSOR_RUN_INTERVAL_MS);
-                        for(byte[] silence: silenceFrames)
+                        AudioFrames silenceFrames = mSilenceGenerator.generate(PROCESSOR_RUN_INTERVAL_MS - mTimeOverrun - timeSent);
+                        while(silenceFrames.hasNextFrame())
                        {
-                            broadcastAudio(silence, null);
+                            silenceFrames.nextFrame();
+                            broadcastAudio(silenceFrames.getCurrentFrame(), null);
+                            timeSent += silenceFrames.getCurrentFrameDuration();
                        }
                    }
+
+                    mTimeOverrun += timeSent - PROCESSOR_RUN_INTERVAL_MS;
                }
                catch(Throwable t)
                {
@@ -341,7 +327,7 @@ public abstract class AudioStreamingBroadcaster<T extends BroadcastConfiguration
        {
            boolean metadataUpdateRequired = false;

-            if(mInputStream != null)
+            if(mInputFrames != null)
            {
                mStreamedAudioCount++;
                broadcast(new BroadcastEvent(AudioStreamingBroadcaster.this,
@@ -349,7 +335,7 @@ public abstract class AudioStreamingBroadcaster<T extends BroadcastConfiguration
                metadataUpdateRequired = true;
            }

-            mInputStream = null;
+            mInputFrames = null;
            mInputIdentifierCollection = null;

            //Peek at the next recording but don't remove it from the queue yet, so we can inspect the start time for
@@ -380,20 +366,15 @@ public abstract class AudioStreamingBroadcaster<T extends BroadcastConfiguration

                        if(audio.length > 0)
                        {
-                            //Calculate how many bytes we'll send with each processor run interval
-                            double intervals = (double)nextRecording.getRecordingLength() / (double)PROCESSOR_RUN_INTERVAL_MS;
-                            mBytesToStreamPerInterval = (int)((double)audio.length / intervals);
-
-                            mInputStream = new ByteArrayInputStream(audio);
-                            mInputIdentifierCollection = nextRecording.getIdentifierCollection();
-
-                            mFinalSilencePadding = PROCESSOR_RUN_INTERVAL_MS -
-                                (nextRecording.getRecordingLength() % PROCESSOR_RUN_INTERVAL_MS);
-
-                            while(mFinalSilencePadding >= PROCESSOR_RUN_INTERVAL_MS)
+                            switch(mBroadcastFormat)
                            {
-                                mFinalSilencePadding -= PROCESSOR_RUN_INTERVAL_MS;
+                                case MP3:
+                                    mInputFrames = MP3FrameTools.split(audio);
+                                    break;
+                                default:
+                                    throw new IllegalArgumentException("Unsupported broadcast format [" + mBroadcastFormat + "]");
                            }
+                            mInputIdentifierCollection = nextRecording.getIdentifierCollection();

                            if(connected())
                            {
@@ -409,7 +390,7 @@ public abstract class AudioStreamingBroadcaster<T extends BroadcastConfiguration
                    mLog.error("Stream [" + getBroadcastConfiguration().getName() + "] error reading temporary audio " +
                        "stream recording [" + nextRecording.getPath().toString() + "] - skipping recording - ", ioe);

-                    mInputStream = null;
+                    mInputFrames = null;
                    mInputIdentifierCollection = null;
                    metadataUpdateRequired = false;
                }
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java
@@ -26,13 +26,6 @@ import io.github.dsheirer.properties.SystemProperties;
 import io.github.dsheirer.sample.Broadcaster;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.util.ThreadPool;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.swing.*;
-import javax.swing.table.AbstractTableModel;
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
@@ -48,6 +41,12 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.swing.table.AbstractTableModel;

 public class BroadcastModel extends AbstractTableModel implements Listener<AudioRecording>
 {
@@ -58,7 +57,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio

    private static final String UNIQUE_NAME_REGEX = "(.*)\\((\\d*)\\)";

-    public static final int COLUMN_SERVER_ICON = 0;
+    public static final int COLUMN_BROADCAST_SERVER_TYPE = 0;
    public static final int COLUMN_STREAM_NAME = 1;
    public static final int COLUMN_BROADCASTER_STATUS = 2;
    public static final int COLUMN_BROADCASTER_QUEUE_SIZE = 3;
@@ -67,7 +66,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
    public static final int COLUMN_BROADCASTER_ERROR_COUNT = 6;

    public static final String[] COLUMN_NAMES = new String[]
-        {"Streaming", "Name", "Status", "Queued", "Streamed/Uploaded", "Aged Off", "Upload Error"};
+        {"Stream Type", "Name", "Status", "Queued", "Streamed/Uploaded", "Aged Off", "Upload Error"};

    private ObservableList<ConfiguredBroadcast> mConfiguredBroadcasts =
        FXCollections.observableArrayList(ConfiguredBroadcast.extractor());
@@ -575,15 +574,8 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
                {
                    switch(columnIndex)
                    {
-                        case COLUMN_SERVER_ICON:
-                            String iconPath = configuredBroadcast.getBroadcastConfiguration()
-                                .getBroadcastServerType().getIconPath();
-
-                            if(iconPath != null && mIconModel != null)
-                            {
-                                return mIconModel.getScaledIcon(iconPath, 14);
-                            }
-                            break;
+                        case COLUMN_BROADCAST_SERVER_TYPE:
+                            return configuredBroadcast.getBroadcastServerType();
                        case COLUMN_STREAM_NAME:
                            return configuredBroadcast.getBroadcastConfiguration().getName();
                        case COLUMN_BROADCASTER_STATUS:
@@ -653,8 +645,8 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
            case COLUMN_BROADCASTER_STREAMED_COUNT:
            case COLUMN_BROADCASTER_ERROR_COUNT:
                return Integer.class;
-            case COLUMN_SERVER_ICON:
-                return ImageIcon.class;
+            case COLUMN_BROADCAST_SERVER_TYPE:
+                return BroadcastServerType.class;
            case COLUMN_STREAM_NAME:
            default:
                return String.class;
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastServerType.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastServerType.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2016 Dennis Sheirer
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- ******************************************************************************/
+ * ****************************************************************************
+ */
 package io.github.dsheirer.audio.broadcast;

 public enum BroadcastServerType
@@ -23,17 +23,17 @@ public enum BroadcastServerType
    /**
     * Broadcastify feeds (ie streaming) service
     */
-    BROADCASTIFY("Broadcastify Feed", "/images/broadcastify.png"), //Icecast Server 2.3.2
+    BROADCASTIFY("Broadcastify Feed", "images/broadcastify.png"), //Icecast Server 2.3.2

    /**
     * Broadcastify calls - completed audio recording push service
     */
-    BROADCASTIFY_CALL("Broadcastify Call", "/images/broadcastify.png"),
+    BROADCASTIFY_CALL("Broadcastify Call", "images/broadcastify.png"),

-    ICECAST_HTTP("Icecast 2 (v2.4+)", "/images/icecast.png"),
-    ICECAST_TCP("Icecast (v2.3)", "/images/icecast.png"),
-    SHOUTCAST_V1("Shoutcast v1.x", "/images/shoutcast.png"),
-    SHOUTCAST_V2("Shoutcast v2.x", "/images/shoutcast.png"),
+    ICECAST_HTTP("Icecast 2 (v2.4+)", "images/icecast.png"),
+    ICECAST_TCP("Icecast (v2.3)", "images/icecast.png"),
+    SHOUTCAST_V1("Shoutcast v1.x", "images/shoutcast.png"),
+    SHOUTCAST_V2("Shoutcast v2.x", "images/shoutcast.png"),
    UNKNOWN("Unknown", null);

    private String mLabel;
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastState.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastState.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2016 Dennis Sheirer
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- ******************************************************************************/
+ * ****************************************************************************
+ */
 package io.github.dsheirer.audio.broadcast;

 public enum BroadcastState
@@ -103,10 +103,10 @@ public enum BroadcastState
    private String mLabel;
    private boolean mErrorState;

-    private BroadcastState(String label, boolean connected)
+    BroadcastState(String label, boolean errorState)
    {
        mLabel = label;
-        mErrorState = connected;
+        mErrorState = errorState;
    }

    public String toString()
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastStatusPanel.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastStatusPanel.java
@@ -1,7 +1,6 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 Dennis Sheirer
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,23 +14,29 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * *****************************************************************************
+ * ****************************************************************************
 */
 package io.github.dsheirer.audio.broadcast;

+import io.github.dsheirer.icon.Icon;
+import io.github.dsheirer.icon.IconModel;
 import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.preference.swing.JTableColumnWidthMonitor;
+import java.awt.Color;
+import java.awt.Component;
 import net.miginfocom.swing.MigLayout;

+import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.SwingConstants;
 import javax.swing.table.DefaultTableCellRenderer;
-import java.awt.Color;
-import java.awt.Component;

+/**
+ * Table of broadcast streams and statuses.
+ */
 public class BroadcastStatusPanel extends JPanel
 {
    private JTable mTable;
@@ -41,6 +46,12 @@ public class BroadcastStatusPanel extends JPanel
    private UserPreferences mUserPreferences;
    private String mPreferenceKey;

+    /**
+     * Constructs an instance
+     * @param broadcastModel to access the streams
+     * @param userPreferences for configuring the panel
+     * @param preferenceKey to store column preferences for this panel.
+     */
    public BroadcastStatusPanel(BroadcastModel broadcastModel, UserPreferences userPreferences, String preferenceKey)
    {
        mBroadcastModel = broadcastModel;
@@ -65,6 +76,7 @@ public class BroadcastStatusPanel extends JPanel
        renderer.setHorizontalAlignment(SwingConstants.CENTER);

        mTable.getColumnModel().getColumn(BroadcastModel.COLUMN_BROADCASTER_STATUS).setCellRenderer(new StatusCellRenderer());
+        mTable.getColumnModel().getColumn(BroadcastModel.COLUMN_BROADCAST_SERVER_TYPE).setCellRenderer(new ServerTypeRenderer());
        mColumnWidthMonitor = new JTableColumnWidthMonitor(mUserPreferences, mTable, mPreferenceKey);

        mScrollPane = new JScrollPane(mTable);
@@ -72,6 +84,37 @@ public class BroadcastStatusPanel extends JPanel
        add(mScrollPane);
    }

+    public class ServerTypeRenderer extends DefaultTableCellRenderer
+    {
+        public ServerTypeRenderer()
+        {
+            setOpaque(true);
+            setHorizontalAlignment(SwingConstants.CENTER);
+        }
+
+        @Override
+        public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column)
+        {
+            JLabel component = (JLabel)super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+
+            if(value instanceof BroadcastServerType broadcastServerType)
+            {
+                component.setText(broadcastServerType.toString());
+                Icon icon = new Icon("empty", broadcastServerType.getIconPath());
+                ImageIcon imageIcon = icon.getIcon();
+                ImageIcon scaledIcon = IconModel.getScaledIcon(imageIcon, 13);
+                component.setIcon(scaledIcon);
+            }
+            else
+            {
+                component.setText(null);
+                component.setIcon(null);
+            }
+
+            return component;
+        }
+    }
+
    /**
     * Custom cell renderer for the broadcast state column.
     */
--- a/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java
@@ -20,13 +20,20 @@ package io.github.dsheirer.audio.broadcast.icecast;

 import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.BroadcastState;
-import io.github.dsheirer.audio.broadcast.icecast.IcecastMetadata;
 import io.github.dsheirer.audio.convert.InputAudioFormat;
 import io.github.dsheirer.audio.convert.MP3AudioConverter;
 import io.github.dsheirer.audio.convert.MP3Setting;
 import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.properties.SystemProperties;
 import io.github.dsheirer.util.ThreadPool;
+import java.net.ConnectException;
+import java.net.InetSocketAddress;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.apache.mina.core.RuntimeIoException;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.future.ConnectFuture;
@@ -42,13 +49,6 @@ import org.apache.mina.transport.socket.nio.NioSocketConnector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import java.net.ConnectException;
-import java.net.InetSocketAddress;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
 {
    private static final Logger mLog = LoggerFactory.getLogger(IcecastHTTPAudioBroadcaster.class);
@@ -143,8 +143,9 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                mSocketConnector = new NioSocketConnector();
                mSocketConnector.setConnectTimeoutCheckInterval(10000);

-//                mSocketConnector.getFilterChain().addLast("logger",
-//                    new LoggingFilter(IcecastHTTPAudioBroadcaster.class));
+//                LoggingFilter loggingFilter = new LoggingFilter(IcecastHTTPAudioBroadcaster.class);
+//                loggingFilter.setMessageReceivedLogLevel(LogLevel.DEBUG);
+//                mSocketConnector.getFilterChain().addLast("logger", loggingFilter);

                mSocketConnector.getFilterChain().addLast("codec", new HttpClientCodec());
                mSocketConnector.setHandler(new IcecastHTTPIOHandler());
@@ -315,10 +316,49 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
                 * intercept the out of bounds exception and then inspect the message hex dump to see if it's an
                 * OK response and then play like everything is well and good.
                 */
-                if(cause instanceof ArrayIndexOutOfBoundsException &&
-                    ((ProtocolDecoderException)throwable).getHexdump().startsWith(HTTP_1_0_OK_HEX_DUMP))
+                if(cause instanceof ArrayIndexOutOfBoundsException)
                {
-                    setBroadcastState(BroadcastState.CONNECTED);
+                    String hexDump = ((ProtocolDecoderException)throwable).getHexdump();
+
+                    if(hexDump.startsWith(HTTP_1_0_OK_HEX_DUMP))
+                    {
+                        setBroadcastState(BroadcastState.CONNECTED);
+                    }
+                    else
+                    {
+                        HttpDumpMessage message = new HttpDumpMessage(hexDump);
+
+                        if(message.hasHttpResponseCode())
+                        {
+                            switch(message.getHttpResponseCode())
+                            {
+                                case 403: //Forbidden
+                                    if(message.toString().contains("Mountpoint in use"))
+                                    {
+                                        mLog.error("Stream [" + getStreamName() + "] - unable to connect - mountpoint in use");
+                                        setBroadcastState(BroadcastState.MOUNT_POINT_IN_USE);
+                                        disconnect();
+                                    }
+                                    else
+                                    {
+                                        mLog.error("String [" + getStreamName() + "] - HTTP protocol decoder error - message:\n\n" + message);
+                                        setBroadcastState(BroadcastState.DISCONNECTED);
+                                        disconnect();
+                                    }
+                                    break;
+                                default:
+                                    mLog.error("String [" + getStreamName() + "] - HTTP protocol decoder error - message:\n\n" + message);
+                                    setBroadcastState(BroadcastState.DISCONNECTED);
+                                    disconnect();
+                            }
+                        }
+                        else
+                        {
+                            mLog.error("HTTP protocol decoder error - message:\n\n" + message);
+                            setBroadcastState(BroadcastState.DISCONNECTED);
+                            disconnect();
+                        }
+                    }
                }
                else
                {
@@ -374,4 +414,97 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
            }
        }
    }
+
+    /**
+     * Class for parsing HTTP response messages from Icecast 2.4.2+
+     */
+    public class HttpDumpMessage
+    {
+        private String mHexDump;
+        private String mMessage;
+        private int mHttpResponseCode = -1;
+
+        public HttpDumpMessage(String hexDump)
+        {
+            mHexDump = hexDump;
+
+            String[] split = mHexDump.split(" ");
+            byte[] bytes = new byte[split.length];
+
+            int pointer = 0;
+            for(String a : split)
+            {
+                try
+                {
+                    int value = Integer.parseInt(a, 16);
+                    bytes[pointer++] = (byte) (value & 0xFF);
+                }
+                catch(Exception e)
+                {
+                    pointer++;
+                }
+            }
+
+            mMessage = new String(bytes);
+
+            Pattern pattern = Pattern.compile("HTTP/1.0 (\\d{3})");
+            Matcher m = pattern.matcher(mMessage);
+
+            if(m.find())
+            {
+                try
+                {
+                    mHttpResponseCode = Integer.parseInt(m.group(1));
+                }
+                catch(Exception e)
+                {
+                    mLog.error("Unable to parse HTTP response code that was matched from message: " + m.group(1));
+                }
+            }
+        }
+
+        /**
+         * Indicates if an HTTP response code was parsed from the message
+         * @return true if it was parsed.
+         */
+        public boolean hasHttpResponseCode()
+        {
+            return mHttpResponseCode != -1;
+        }
+
+        /**
+         * Response code parsed from the hexdump message
+         * @return value.
+         */
+        public int getHttpResponseCode()
+        {
+            return mHttpResponseCode;
+        }
+
+        @Override
+        public String toString()
+        {
+            return mMessage;
+        }
+    }
+
+    public static void main(String[] args)
+    {
+        String text = "HTTP/1.0 403 Forbidden";
+
+        Pattern pattern = Pattern.compile("HTTP/1.0 (\\d{3})");
+
+        Matcher m = pattern.matcher(text);
+
+        if(m.find())
+        {
+            mLog.info("Matching Group Count: " + m.groupCount());
+            mLog.info("Match 0: " + m.group(0));
+            mLog.info("Match 1: " + m.group(1));
+        }
+        else
+        {
+            mLog.info("No Match");
+        }
+    }
 }
--- a/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java
@@ -21,13 +21,19 @@ package io.github.dsheirer.audio.broadcast.icecast;
 import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.audio.broadcast.BroadcastState;
 import io.github.dsheirer.audio.broadcast.icecast.codec.IcecastCodecFactory;
-import io.github.dsheirer.audio.broadcast.icecast.IcecastMetadata;
 import io.github.dsheirer.audio.convert.InputAudioFormat;
 import io.github.dsheirer.audio.convert.MP3AudioConverter;
 import io.github.dsheirer.audio.convert.MP3Setting;
 import io.github.dsheirer.identifier.IdentifierCollection;
 import io.github.dsheirer.properties.SystemProperties;
 import io.github.dsheirer.util.ThreadPool;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.SocketException;
+import java.nio.channels.UnresolvedAddressException;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.mina.core.RuntimeIoException;
 import org.apache.mina.core.future.ConnectFuture;
 import org.apache.mina.core.service.IoHandlerAdapter;
@@ -37,14 +43,6 @@ import org.apache.mina.transport.socket.nio.NioSocketConnector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.SocketException;
-import java.nio.channels.UnresolvedAddressException;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
 {
    private final static Logger mLog = LoggerFactory.getLogger(IcecastTCPAudioBroadcaster.class);
@@ -215,7 +213,13 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
        }
        else
        {
-            setBroadcastState(BroadcastState.DISCONNECTED);
+            //Only set broadcast state to disconnected if it's not already in an error state, to prevent a restart.  We
+            //want to preserve the error state that got us here, so the user can see it.
+            if(!getBroadcastState().isErrorState())
+            {
+                setBroadcastState(BroadcastState.DISCONNECTED);
+            }
+
            mLastConnectionAttempt = System.currentTimeMillis();
        }
    }
--- a/src/main/java/io/github/dsheirer/audio/convert/AudioFrames.java
+++ b/src/main/java/io/github/dsheirer/audio/convert/AudioFrames.java
@@ -0,0 +1,133 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+package io.github.dsheirer.audio.convert;
+
+import java.util.List;
+import org.apache.commons.math3.util.FastMath;
+
+public abstract class AudioFrames
+{
+    protected final int audioDuration;
+    protected final List<byte[]> audioFrames;
+    protected int mCurrentFrame = -1;
+
+    /**
+     * Create new AudioFrame
+     * @param audioDuration total duration in milliseconds
+     * @param audioFrames series of audio frames, split on frame boundaries
+     */
+    public AudioFrames(int audioDuration, List<byte[]> audioFrames)
+    {
+        this.audioDuration = audioDuration;
+        this.audioFrames = audioFrames;
+    }
+
+    /**
+     * Get total duration of frames
+     * @return total duration in milliseconds
+     */
+    public int getDuration()
+    {
+        return audioDuration;
+    }
+
+    /**
+     * Get all frames
+     * @return list of byte arrays, with each element representing a single frame of audio
+     */
+    public List<byte[]> getFrames()
+    {
+        return audioFrames;
+    }
+
+    /**
+     * Get current frame
+     * @return byte array with the current frame of audio
+     */
+    public byte[] getCurrentFrame()
+    {
+        return audioFrames.get(mCurrentFrame);
+    }
+
+    /**
+     * Get current frame duration
+     * @return frame duration in milliseconds
+     */
+    public abstract int getCurrentFrameDuration();
+
+    /**
+     * Indicates if there is a frame before the current one
+     * @return true if the frame exists, otherwise false
+     */
+    public boolean hasPrevFrame()
+    {
+        int prevFrame = mCurrentFrame - 1;
+        return prevFrame >= 0 && prevFrame < audioFrames.size();
+    }
+
+    /**
+     * Indicates if there is a frame after the current one
+     * @return true if the frame exists, otherwise false
+     */
+    public boolean hasNextFrame()
+    {
+        int nextFrame = mCurrentFrame + 1;
+        return nextFrame >= 0 && nextFrame < audioFrames.size();
+    }
+
+    /**
+     * Seek to the previous frame
+     */
+    public void prevFrame()
+    {
+        mCurrentFrame -= 1;
+    }
+
+    /**
+     * Seek to the next frame
+     */
+    public void nextFrame()
+    {
+        mCurrentFrame += 1;
+    }
+
+    /**
+     * Restart from beginning
+     * Must call nextFrame() to get first frame
+     */
+    public void restart()
+    {
+        mCurrentFrame = -1;
+    }
+
+    /**
+     * Seek by the specified time
+     * @param duration_ms time in milliseconds, positive or negative
+     */
+    public void seek(int duration_ms)
+    {
+        int step = duration_ms < 0 ? -1 : 1;
+        int actual_ms = 0;
+        while(FastMath.abs(actual_ms) < FastMath.abs(duration_ms))
+        {
+            mCurrentFrame += step;
+            actual_ms += getCurrentFrameDuration();
+        }
+    }
+}
--- a/src/main/java/io/github/dsheirer/audio/convert/ISilenceGenerator.java
+++ b/src/main/java/io/github/dsheirer/audio/convert/ISilenceGenerator.java
@@ -22,5 +22,5 @@ import java.util.List;

 public interface ISilenceGenerator
 {
-    List<byte[]> generate(long duration);
+    AudioFrames generate(long duration);
 }
--- a/src/main/java/io/github/dsheirer/audio/convert/InputAudioFormat.java
+++ b/src/main/java/io/github/dsheirer/audio/convert/InputAudioFormat.java
@@ -20,6 +20,7 @@
 package io.github.dsheirer.audio.convert;

 import io.github.dsheirer.audio.AudioFormats;
+import java.util.EnumSet;

 import javax.sound.sampled.AudioFormat;

@@ -29,8 +30,8 @@ import javax.sound.sampled.AudioFormat;
 public enum InputAudioFormat
 {
    SR_8000(AudioFormats.PCM_SIGNED_8000_HZ_16_BIT_MONO, "16-Bit 8000 Hz (no resample)"),
-    SR_16000(AudioFormats.PCM_SIGNED_16000_HZ_16_BIT_MONO, "16-Bit 16000 Hz"),
-    SR_22050(AudioFormats.PCM_SIGNED_22050_HZ_16_BIT_MONO, "16-Bit 22050 Hz (default)"),
+    SR_16000(AudioFormats.PCM_SIGNED_16000_HZ_16_BIT_MONO, "16-Bit 16000 Hz (default)"),
+    SR_22050(AudioFormats.PCM_SIGNED_22050_HZ_16_BIT_MONO, "16-Bit 22050 Hz"),
    SR_44100(AudioFormats.PCM_SIGNED_44100_HZ_16_BIT_MONO, "16-Bit 44100 Hz"),

    SR_32_8000(AudioFormats.PCM_SIGNED_8000_HZ_32_BIT_MONO, "32-Bit 8000 Hz (no resample)"),
@@ -41,6 +42,17 @@ public enum InputAudioFormat
    private AudioFormat mAudioFormat;
    private String mLabel;

+    /**
+     * Set that includes sample rates of 8 or 16 kHz
+     */
+    public static final EnumSet<InputAudioFormat> SAMPLE_RATES_8_16 = EnumSet.of(SR_8000, SR_32_8000, SR_16000, SR_32_16000);
+
+    /**
+     * Set that includes sample rates of 8, 16, or 22 kHz
+     */
+    public static final EnumSet<InputAudioFormat> SAMPLE_RATES_8_16_22 = EnumSet.of(SR_8000, SR_32_8000, SR_16000,
+            SR_32_16000, SR_22050, SR_32_22050);
+
    /**
     * Constructs an instance
     * @param audioFormat for the specified sample rate
@@ -56,7 +68,7 @@ public enum InputAudioFormat
     */
    public static InputAudioFormat getDefault()
    {
-        return SR_22050;
+        return SR_16000;
    }

    /**
--- a/src/main/java/io/github/dsheirer/audio/convert/MP3AudioConverter.java
+++ b/src/main/java/io/github/dsheirer/audio/convert/MP3AudioConverter.java
@@ -60,8 +60,17 @@ public class MP3AudioConverter implements IAudioConverter
        mEncoder = LameFactory.getLameEncoder(inputAudioFormat, setting);
        mNormalizeAudio = normalizeAudio;

+        //Ensure input audio sample rate is supported for the MP3 setting and update as necessary - should never happen.
+        if((mInputAudioFormat.getSampleRate() - mEncoder.getEffectiveSampleRate()) > 1.0)
+        {
+            mInputAudioFormat = InputAudioFormat.getDefault();
+            mLog.warn("MP3 setting [" + setting + "] does not support requested input audio sample rate [" +
+                    inputAudioFormat + "] - using default sample rate [" + mInputAudioFormat + "]");
+            mEncoder = LameFactory.getLameEncoder(inputAudioFormat, setting);
+        }
+
        //Resampling is only required if desired input sample rate is not system default of 8kHz
-        if(inputAudioFormat != InputAudioFormat.SR_8000 && inputAudioFormat != InputAudioFormat.SR_32_8000)
+        if(mInputAudioFormat != InputAudioFormat.SR_8000 && mInputAudioFormat != InputAudioFormat.SR_32_8000)
        {
            mResampler = LameFactory.getResampler(inputAudioFormat);
        }
--- a/src/main/java/io/github/dsheirer/audio/convert/MP3AudioFrames.java
+++ b/src/main/java/io/github/dsheirer/audio/convert/MP3AudioFrames.java
@@ -0,0 +1,46 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.audio.convert;
+
+import java.util.List;
+
+public class MP3AudioFrames extends AudioFrames
+{
+
+    /**
+     * Create new MP3AudioFrame
+     * @param audioDuration total duration in milliseconds
+     * @param audioFrames series of audio frames, split on frame boundaries
+     */
+    public MP3AudioFrames(int audioDuration, List<byte[]> audioFrames)
+    {
+        super(audioDuration, audioFrames);
+    }
+
+    /**
+     * Get current frame duration
+     * @return frame duration in milliseconds
+     */
+    public int getCurrentFrameDuration()
+    {
+        return MP3Header.getFrameDuration(getCurrentFrame(), 0);
+    }
+
+}
--- a/src/main/java/io/github/dsheirer/audio/convert/MP3FrameInspector.java
+++ b/src/main/java/io/github/dsheirer/audio/convert/MP3FrameInspector.java
@@ -55,6 +55,7 @@ public class MP3FrameInspector
        }
    }

+    /* TODO: Rework for MP3SilenceGenerator returning IAudioFrames
    public static void main(String[] args)
    {
        mLog.info("Starting ...");
@@ -66,4 +67,5 @@ public class MP3FrameInspector

        mLog.info("Finished");
    }
+    */
 }
--- a/src/main/java/io/github/dsheirer/audio/convert/MP3FrameTools.java
+++ b/src/main/java/io/github/dsheirer/audio/convert/MP3FrameTools.java
@@ -0,0 +1,59 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+package io.github.dsheirer.audio.convert;
+
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.math3.util.FastMath;
+
+public class MP3FrameTools {
+
+    private MP3FrameTools() {}
+
+    /**
+     * Split MP3 audio at frame boundaries
+     * @param input byte array of audio
+     * @return list of byte arrays containing audio frames
+     */
+    public static MP3AudioFrames split(byte[] input)
+    {
+        List<byte[]> mp3Frames = new ArrayList<>();
+        int audioDuration = 0;
+
+        int offset = 0;
+        while(offset < input.length)
+        {
+            if(MP3Header.hasSync(input, offset))
+            {
+                int framelen = MP3Header.getFrameLength(input, offset);
+                mp3Frames.add(Arrays.copyOfRange(input, offset, offset + FastMath.min(framelen, input.length - offset)));
+                audioDuration += MP3Header.getFrameDuration(input, offset);
+                offset += framelen;
+            }
+            else
+            {
+                offset += 1;
+            }
+        }
+
+        return new MP3AudioFrames(audioDuration, mp3Frames);
+    }
+
+}
--- a/src/main/java/io/github/dsheirer/audio/convert/MP3Header.java
+++ b/src/main/java/io/github/dsheirer/audio/convert/MP3Header.java
@@ -19,6 +19,10 @@

 package io.github.dsheirer.audio.convert;

+import io.github.dsheirer.audio.convert.MPEGLayer;
+import io.github.dsheirer.audio.convert.MPEGVersion;
+import org.apache.commons.math3.util.FastMath;
+
 /**
 * Utility class for inspecting/parsing MP3 frames
 */
@@ -88,6 +92,71 @@ public class MP3Header
        return ChannelMode.fromValue((frame[offset + 3] & 0xC0) >> 6);
    }

+    /**
+     * Indicates if the frame has padding
+     * @param frame
+     * @param offset
+     * @return boolean
+     */
+    public static boolean isPadded(byte[] frame, int offset)
+    {
+        return (frame[offset + 2] & 0x02) == 0x02;
+    }
+
+    /**
+     * Get the number of bytes in the frame
+     * @param frame
+     * @param offset
+     * @return frame length in bytes
+     */
+    public static int getFrameLength(byte[] frame, int offset)
+    {
+        return (getFrameSamples(frame, offset) / 8) * (getBitRate(frame, offset) * 1000) / getSampleRate(frame, offset) + (isPadded(frame, offset) ? 1 : 0);
+    }
+
+    /**
+     * Get the number of samples in the frame
+     * @param frame
+     * @param offset
+     * @return length of frame in samples
+     */
+    public static int getFrameSamples(byte[] frame, int offset)
+    {
+        switch(getMPEGVersion(frame, offset))
+        {
+            case V_1:
+                switch(getMPEGLayer(frame, offset))
+                {
+                    case LAYER1: return 384;
+                    case LAYER2: return 1152;
+                    case LAYER3: return 1152;
+                    default:
+                }
+            case V_2:
+            case V_2_5:
+                switch(getMPEGLayer(frame, offset))
+                {
+                    case LAYER1: return 384;
+                    case LAYER2: return 1152;
+                    case LAYER3: return 576;
+                    default:
+                }
+            default:
+        }
+        return 0;
+    }
+
+    /**
+     * Get the frame duration in milliseconds
+     * @param frame
+     * @param offset
+     * @return duration in milliseconds
+     */
+    public static int getFrameDuration(byte[] frame, int offset)
+    {
+        return (int)FastMath.round((double)getFrameSamples(frame, offset) / (double)getSampleRate(frame, offset) * 1000);
+    }
+
    /**
     * Inspects the frame bytes and provides details about the header.
     */
--- a/src/main/java/io/github/dsheirer/audio/convert/MP3Setting.java
+++ b/src/main/java/io/github/dsheirer/audio/convert/MP3Setting.java
@@ -19,6 +19,8 @@

 package io.github.dsheirer.audio.convert;

+import java.util.Arrays;
+import java.util.List;
 import net.sourceforge.lame.mp3.Lame;

 /**
@@ -79,6 +81,30 @@ public enum MP3Setting
        return mSetting;
    }

+    /**
+     * Input audio formats that are supported by the MP3Setting value.
+     * @return list of supported input audio sample rates.
+     */
+    public List<InputAudioFormat> getSupportedSampleRates()
+    {
+        switch(this)
+        {
+            case CBR_16:
+            {
+                return InputAudioFormat.SAMPLE_RATES_8_16.stream().toList();
+            }
+            case CBR_32:
+            case VBR_7:
+            {
+                return InputAudioFormat.SAMPLE_RATES_8_16_22.stream().toList();
+            }
+            default:
+            {
+                return Arrays.stream(InputAudioFormat.values()).toList();
+            }
+        }
+    }
+
    @Override
    public String toString()
    {
--- a/src/main/java/io/github/dsheirer/audio/convert/MP3SilenceGenerator.java
+++ b/src/main/java/io/github/dsheirer/audio/convert/MP3SilenceGenerator.java
@@ -19,19 +19,20 @@
 package io.github.dsheirer.audio.convert;

 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.commons.math3.util.FastMath;

 public class MP3SilenceGenerator implements ISilenceGenerator
 {
    private final static Logger mLog = LoggerFactory.getLogger(MP3SilenceGenerator.class);
-    public static final int MP3_BIT_RATE = 16;
-    public static final boolean CONSTANT_BIT_RATE = false;

    private MP3AudioConverter mMP3AudioConverter;
    private InputAudioFormat mInputAudioFormat;
-    private byte[] mPreviousPartialFrameData;
+    private byte[] mSilenceFrame;
+    private int mSilenceFrameDuration;

    /**
     * Generates MP3 audio silence frames
@@ -40,19 +41,17 @@ public class MP3SilenceGenerator implements ISilenceGenerator
    {
        mInputAudioFormat = inputAudioFormat;
        mMP3AudioConverter = new MP3AudioConverter(inputAudioFormat, setting, false);
+        generate_frame();
    }

    /**
-     * Generates silence frames
-     * @param duration_ms in milliseconds
+     * Generates a single silence frame
     * @return
     */
-    public List<byte[]> generate(long duration_ms)
+    private void generate_frame()
    {
-        double duration_secs = (double)duration_ms / 1000.0;
-
        //We generate silence at 8000 kHz, because it gets resampled by the silence generator to the target rate
-        int length = (int)(duration_secs * InputAudioFormat.SR_8000.getSampleRate());
+        int length = (int)(InputAudioFormat.SR_8000.getSampleRate());

        List<float[]> silenceBuffers = new ArrayList<>();

@@ -64,7 +63,40 @@ public class MP3SilenceGenerator implements ISilenceGenerator
            added += chunk;
        }

-        return mMP3AudioConverter.convert(silenceBuffers);
+        List<byte[]> mp3Audio =  mMP3AudioConverter.convert(silenceBuffers);
+        byte[] silence = new byte[0];
+        for(byte[] mp3Chunk: mp3Audio)
+        {
+            silence = merge(silence, mp3Chunk);
+        }
+
+        MP3AudioFrames mp3Frames = MP3FrameTools.split(silence);
+        if(mp3Frames.hasNextFrame())
+        {
+            mp3Frames.nextFrame();
+            mSilenceFrame = mp3Frames.getCurrentFrame();
+            mSilenceFrameDuration = mp3Frames.getCurrentFrameDuration();
+        }
+
+    }
+
+    /**
+     * Generates silence frames
+     * @param duration_ms in milliseconds
+     * @return
+     */
+    public MP3AudioFrames generate(long duration_ms)
+    {
+        List<byte[]> silenceFrames = new ArrayList<>();
+        int silenceDuration = 0;
+
+        while(silenceDuration < duration_ms)
+        {
+            silenceFrames.add(mSilenceFrame);
+            silenceDuration += mSilenceFrameDuration;
+        }
+
+        return new MP3AudioFrames(silenceDuration, silenceFrames);
    }

    private static byte[] merge(byte[] a, byte[] b)
@@ -89,6 +121,7 @@ public class MP3SilenceGenerator implements ISilenceGenerator
        return c;
    }

+    /* TODO: Rework for MP3SilenceGenerator returning IAudioFrames
    public static void main(String[] args)
    {
        mLog.debug("Starting ...");
@@ -113,4 +146,5 @@ public class MP3SilenceGenerator implements ISilenceGenerator

        mLog.debug("Finished");
    }
+    */
 }
--- a/src/main/java/io/github/dsheirer/bits/BinaryMessage.java
+++ b/src/main/java/io/github/dsheirer/bits/BinaryMessage.java
@@ -1,35 +1,38 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
- *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
- *  *
- *  * This program is free software: you can redistribute it and/or modify
- *  * it under the terms of the GNU General Public License as published by
- *  * the Free Software Foundation, either version 3 of the License, or
- *  * (at your option) any later version.
- *  *
- *  * This program is distributed in the hope that it will be useful,
- *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  * GNU General Public License for more details.
- *  *
- *  * You should have received a copy of the GNU General Public License
- *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *  * *****************************************************************************
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
 *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
 *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
 */
 package io.github.dsheirer.bits;

 import io.github.dsheirer.edac.CRC;
+import java.io.UnsupportedEncodingException;
+import java.util.BitSet;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.math3.util.FastMath;
-
-import java.util.BitSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 public class BinaryMessage extends BitSet
 {
    private static final long serialVersionUID = 1L;
+    private static final Logger LOGGER = LoggerFactory.getLogger(BinaryMessage.class);
+    private static final int[] CHARACTER_7_BIT = new int[]{0, 1, 2, 3, 4, 5, 6};
+    private static final int[] CHARACTER_8_BIT = new int[]{0, 1, 2, 3, 4, 5, 6, 7};
+    private static final String UTF_8 = "UTF-8";

    /**
     * Logical (ie constructed) size of this bitset, despite the actual size of
@@ -1038,6 +1041,51 @@ public class BinaryMessage extends BitSet
        return buffer;
    }

+    /**
+     * Loads the hexadecimal text into a binary message
+     * @param hex text to load from
+     * @return loaded binary message
+     */
+    public static BinaryMessage loadHex(String hex)
+    {
+        if(!hex.matches("[0-9A-F]*"))
+        {
+            throw new IllegalArgumentException("Message must contain only 0-9 and A-F hexadecimal characters");
+        }
+
+        int length = hex.length() / 2;
+
+        if(length * 2 < hex.length())
+        {
+            length++;
+        }
+
+        BinaryMessage buffer = new BinaryMessage(length * 8);
+
+        int bufferOffset = 0;
+        for(int x = 0; x < hex.length(); x += 2)
+        {
+            int endIndex = x + 2;
+            if(endIndex > hex.length())
+            {
+                endIndex--;
+            }
+
+            String rawHex = hex.substring(x, endIndex);
+
+            if(rawHex.length() == 1)
+            {
+                rawHex = rawHex + "0";
+            }
+
+            int value = Integer.parseInt(rawHex, 16);
+            buffer.setByte(bufferOffset, (byte)(value & 0xFF));
+            bufferOffset += 8;
+        }
+
+        return buffer;
+    }
+
    /**
     * Left rotates the bits between start and end indices, number of places.
     */
@@ -1133,19 +1181,101 @@ public class BinaryMessage extends BitSet
        this.xor(mask);
    }

-    public static void main(String[] args)
+    /**
+     * Parse ISO-7 bit characters from the message starting at the offset.
+     * @param offset where to start parsing.
+     * @param characterCount number of characters to parse
+     * @return parsed message.
+     */
+    public String parseISO7(int offset, int characterCount)
    {
-        BinaryMessage message = new BinaryMessage(10);
-        message.set(1);
-        message.set(4);
-        message.set(5);
-        message.set(8);
-        message.set(9);
+        byte[] bytes = new byte[characterCount];

-        System.out.println("Hex: " + message.toHexString() + " Size:" + message.size());
-        for(int x = 0; x < 10; x++)
+        for(int x = 0; x < characterCount; x++)
        {
-            System.out.println(x + ": " + message.getHex(x, x + 10));
+            bytes[x] = getByte(CHARACTER_7_BIT, x * 7 + offset);
        }
+
+        return new String(bytes);
+    }
+
+    /**
+     * Parse ISO-8 bit characters from the message starting at the offset.
+     * @param offset where to start parsing.
+     * @param characterCount number of characters to parse
+     * @return parsed message.
+     */
+    public String parseISO8(int offset, int characterCount)
+    {
+        byte[] bytes = new byte[characterCount];
+
+        for(int x = 0; x < characterCount; x++)
+        {
+            bytes[x] = getByte(CHARACTER_8_BIT, x * 8 + offset);
+        }
+
+        return new String(bytes);
+    }
+
+    /**
+     * Parse UTF-8 characters from the message starting at the offset.
+     * @param offset where to start parsing.
+     * @param characterCount number of characters to parse
+     * @return parsed message.
+     * @throws UnsupportedEncodingException if UTF-8 encoding is not supported.
+     */
+    public String parseUTF8(int offset, int characterCount) throws UnsupportedEncodingException
+    {
+        byte[] bytes = new byte[characterCount];
+
+        for(int x = 0; x < characterCount; x++)
+        {
+            bytes[x] = getByte(CHARACTER_8_BIT, x * 8 + offset);
+        }
+
+        return new String(bytes, UTF_8);
+    }
+
+    /**
+     * Parse 16-bit unicode characters from the message starting at the offset.
+     * @param offset where to start parsing.
+     * @param characterCount number of characters to parse
+     * @return parsed message.
+     */
+    public String parseUnicode(int offset, int characterCount)
+    {
+        int length = characterCount * 2;
+        byte[] bytes = new byte[length];
+
+        for(int x = 0; x < length; x++)
+        {
+            bytes[x] = getByte(CHARACTER_8_BIT, x * 8 + offset);
+        }
+
+        return new String(bytes);
+    }
+
+    /**
+     * Parse 4-bit Binary Coded Decimal (BCD) characters from the message starting at the offset.
+     * @param offset where to start parsing.
+     * @param characterCount number of characters to parse
+     * @return parsed message.
+     */
+    public String parseBCD4(int offset, int characterCount)
+    {
+        StringBuilder sb = new StringBuilder();
+
+        int count = 0;
+
+        while(count < characterCount)
+        {
+            int nibble = getNibble(offset);
+            //This will parse digits 0-9 and anything higher will parse as hexadecimal A-F
+            sb.append(Integer.toHexString(nibble).toUpperCase());
+            offset += 4;
+            count++;
+        }
+
+        return sb.toString();
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/AbstractNativeBuffer.java
+++ b/src/main/java/io/github/dsheirer/buffer/AbstractNativeBuffer.java
@@ -0,0 +1,70 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.buffer;
+
+/**
+ * Base native buffer class.
+ */
+public abstract class AbstractNativeBuffer implements INativeBuffer
+{
+    private long mTimestamp;
+    private float mSamplesPerMillisecond;
+
+    /**
+     * Constructs an instance
+     * @param timestamp for the start of this buffer
+     * @param samplesPerMillisecond to calculate the time offset of sub-buffers extracted from this native buffer.
+     */
+    public AbstractNativeBuffer(long timestamp, float samplesPerMillisecond)
+    {
+        mTimestamp = timestamp;
+        mSamplesPerMillisecond = samplesPerMillisecond;
+    }
+
+    /**
+     * Timestamp for the start of this buffer
+     * @return timestamp in milliseconds
+     */
+    @Override
+    public long getTimestamp()
+    {
+        return mTimestamp;
+    }
+
+    /**
+     * Quantity of samples representing one millisecond of sample data, used for calculating fragment timestamp offsets.
+     * @return samples per millisecond count.
+     */
+    public float getSamplesPerMillisecond()
+    {
+        return mSamplesPerMillisecond;
+    }
+
+    /**
+     * Calculates the timestamp for a samples buffer fragment based on where it is extracted from relative to the
+     * native buffer starting timestamp.
+     * @param samplesPointer for the start of the fragment.  Note: this value will be divided by 2 to account for I/Q sample pairs.
+     * @return timestamp adjusted to the fragment or sub-buffer start sample.
+     */
+    protected long getFragmentTimestamp(int samplesPointer)
+    {
+        return getTimestamp() + (long)(samplesPointer / 2 / getSamplesPerMillisecond());
+    }
+}
--- a/src/main/java/io/github/dsheirer/buffer/AbstractNativeBufferFactory.java
+++ b/src/main/java/io/github/dsheirer/buffer/AbstractNativeBufferFactory.java
@@ -0,0 +1,44 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.buffer;
+
+/**
+ * Base class for native buffer factories.
+ */
+public abstract class AbstractNativeBufferFactory implements INativeBufferFactory
+{
+    private float mSamplesPerMillisecond = 0.0f;
+
+    @Override
+    public void setSamplesPerMillisecond(float samplesPerMillisecond)
+    {
+        mSamplesPerMillisecond = samplesPerMillisecond;
+    }
+
+    /**
+     * Quantity of I/Q sample pairs per milli-second at the current sample rate to use in calculating an accurate
+     * timestamp for sub-buffer that are generated from the native buffer.
+     * @return samples per millisecond.
+     */
+    public float getSamplesPerMillisecond()
+    {
+        return mSamplesPerMillisecond;
+    }
+}
--- a/src/main/java/io/github/dsheirer/buffer/ByteNativeBuffer.java
+++ b/src/main/java/io/github/dsheirer/buffer/ByteNativeBuffer.java
@@ -27,7 +27,7 @@ import java.util.Iterator;
 * Native buffer sample array wrapper class that provides access to a stream of either interleaved or
 * non-interleaved complex sample buffers converted from the raw byte sample array.
 */
-public class ByteNativeBuffer implements INativeBuffer
+public class ByteNativeBuffer extends AbstractNativeBuffer
 {
    private static final int FRAGMENT_SIZE = 2048;
    private final static float[] LOOKUP_VALUES;
@@ -46,16 +46,17 @@ public class ByteNativeBuffer implements INativeBuffer
    }

    private byte[] mSamples;
-    private long mTimestamp;

    /**
     * Constructs an instance
     * @param samples to process
     * @param timestamp of the samples
     * @param averageDc measured from sample stream
+     * @param samplesPerMillisecond to calculate derivative timestamps for sub-buffers.
     */
-    public ByteNativeBuffer(byte[] samples, long timestamp, float averageDc)
+    public ByteNativeBuffer(byte[] samples, long timestamp, float averageDc, float samplesPerMillisecond)
    {
+        super(timestamp, samplesPerMillisecond);
        //Ensure we're an even multiple of the fragment size.  Typically, this will be 64k or 128k
        if(samples.length % FRAGMENT_SIZE != 0)
        {
@@ -63,7 +64,6 @@ public class ByteNativeBuffer implements INativeBuffer
        }

        mSamples = samples;
-        mTimestamp = timestamp;
        mAverageDc = averageDc;
    }

@@ -73,12 +73,6 @@ public class ByteNativeBuffer implements INativeBuffer
        return mSamples.length / 2;
    }

-    @Override
-    public long getTimestamp()
-    {
-        return mTimestamp;
-    }
-
    @Override
    public Iterator<ComplexSamples> iterator()
    {
@@ -104,6 +98,8 @@ public class ByteNativeBuffer implements INativeBuffer
        @Override
        public ComplexSamples next()
        {
+            long timestamp = getFragmentTimestamp(mSamplesPointer);
+
            float[] i = new float[FRAGMENT_SIZE];
            float[] q = new float[FRAGMENT_SIZE];
            int samplesOffset = mSamplesPointer;
@@ -115,8 +111,7 @@ public class ByteNativeBuffer implements INativeBuffer
            }

            mSamplesPointer = samplesOffset;
-
-            return new ComplexSamples(i, q);
+            return new ComplexSamples(i, q, timestamp);
        }
    }

@@ -136,6 +131,8 @@ public class ByteNativeBuffer implements INativeBuffer
        @Override
        public InterleavedComplexSamples next()
        {
+            long timestamp = getFragmentTimestamp(mSamplesPointer);
+
            float[] converted = new float[FRAGMENT_SIZE * 2];

            int samplesPointer = mSamplesPointer;
@@ -147,7 +144,7 @@ public class ByteNativeBuffer implements INativeBuffer

            mSamplesPointer = samplesPointer;

-            return new InterleavedComplexSamples(converted, mTimestamp);
+            return new InterleavedComplexSamples(converted, timestamp);
        }
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/ByteNativeBufferFactory.java
+++ b/src/main/java/io/github/dsheirer/buffer/ByteNativeBufferFactory.java
@@ -24,7 +24,7 @@ import java.nio.ByteBuffer;
 /**
 * Implements a factory for creating ByteNativeBuffer instances
 */
-public class ByteNativeBufferFactory implements INativeBufferFactory
+public class ByteNativeBufferFactory extends AbstractNativeBufferFactory
 {
    private DcCorrectionManager mDcCorrectionManager = new DcCorrectionManager();

@@ -39,7 +39,7 @@ public class ByteNativeBufferFactory implements INativeBufferFactory
            calculateDc(copy);
        }

-        return new ByteNativeBuffer(copy, timestamp, mDcCorrectionManager.getAverageDc());
+        return new ByteNativeBuffer(copy, timestamp, mDcCorrectionManager.getAverageDc(), getSamplesPerMillisecond());
    }

    /**
--- a/src/main/java/io/github/dsheirer/buffer/FloatNativeBuffer.java
+++ b/src/main/java/io/github/dsheirer/buffer/FloatNativeBuffer.java
@@ -22,35 +22,24 @@ package io.github.dsheirer.buffer;
 import io.github.dsheirer.sample.SampleUtils;
 import io.github.dsheirer.sample.complex.ComplexSamples;
 import io.github.dsheirer.sample.complex.InterleavedComplexSamples;
-
 import java.util.Iterator;

 /**
 * Simple native buffer implementation that simply wraps a single, existing, non-native sample buffer.
 */
-public class FloatNativeBuffer implements INativeBuffer
+public class FloatNativeBuffer extends AbstractNativeBuffer
 {
    private float[] mInterleavedComplexSamples;
-    private long mTimestamp;

    /**
     * Constructs an instance
-     * @param complexSamples to wrap
+     * @param complexSamples interleaved to wrap
     * @param timestamp for the buffer
     */
-    public FloatNativeBuffer(float[] complexSamples, long timestamp)
+    public FloatNativeBuffer(float[] complexSamples, long timestamp, float samplesPerMillisecond)
    {
+        super(timestamp, samplesPerMillisecond);
        mInterleavedComplexSamples = complexSamples;
-        mTimestamp = timestamp;
-    }
-
-    /**
-     * Constructs an instance
-     * @param complexSamples to wrap
-     */
-    public FloatNativeBuffer(float[] complexSamples)
-    {
-        this(complexSamples, System.currentTimeMillis());
    }

    /**
@@ -58,9 +47,9 @@ public class FloatNativeBuffer implements INativeBuffer
     * @param samples to wrap
     * @param timestamp for the buffer
     */
-    public FloatNativeBuffer(ComplexSamples samples, long timestamp)
+    public FloatNativeBuffer(ComplexSamples samples)
    {
-        this(SampleUtils.interleave(samples), timestamp);
+        this(SampleUtils.interleave(samples), samples.timestamp(), 0.0f);
    }

    /**
@@ -69,7 +58,7 @@ public class FloatNativeBuffer implements INativeBuffer
     */
    public FloatNativeBuffer(InterleavedComplexSamples samples)
    {
-        this(samples.samples(), samples.timestamp());
+        this(samples.samples(), samples.timestamp(), 0.0f);
    }

    @Override
@@ -90,12 +79,6 @@ public class FloatNativeBuffer implements INativeBuffer
        return mInterleavedComplexSamples.length / 2;
    }

-    @Override
-    public long getTimestamp()
-    {
-        return mTimestamp;
-    }
-
    private class ComplexSamplesIterator implements  Iterator<ComplexSamples>
    {
        private boolean mEmpty;
@@ -115,7 +98,7 @@ public class FloatNativeBuffer implements INativeBuffer
            }

            mEmpty = true;
-            return SampleUtils.deinterleave(mInterleavedComplexSamples);
+            return SampleUtils.deinterleave(mInterleavedComplexSamples, getTimestamp());
        }
    }

@@ -139,7 +122,7 @@ public class FloatNativeBuffer implements INativeBuffer
            }

            mEmpty = true;
-            return new InterleavedComplexSamples(mInterleavedComplexSamples, mTimestamp);
+            return new InterleavedComplexSamples(mInterleavedComplexSamples, getTimestamp());
        }
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/INativeBufferFactory.java
+++ b/src/main/java/io/github/dsheirer/buffer/INativeBufferFactory.java
@@ -33,7 +33,15 @@ public interface INativeBufferFactory
     *
     * @param samples byte array copied from native memory
     * @param timestamp of the samples
+     * @param samplesPerMillisecond to calculate timestamp offset for child buffers.
     * @return instance
     */
    INativeBuffer getBuffer(ByteBuffer samples, long timestamp);
+
+    /**
+     * Sets the samples per millisecond rate based on the current sample rate.
+     *
+     * @param samplesPerMillisecond to calculate timestamp offset for child buffers.
+     */
+    void setSamplesPerMillisecond(float samplesPerMillisecond);
 }
--- a/src/main/java/io/github/dsheirer/buffer/SignedByteNativeBuffer.java
+++ b/src/main/java/io/github/dsheirer/buffer/SignedByteNativeBuffer.java
@@ -21,14 +21,13 @@ package io.github.dsheirer.buffer;

 import io.github.dsheirer.sample.complex.ComplexSamples;
 import io.github.dsheirer.sample.complex.InterleavedComplexSamples;
-
 import java.util.Iterator;

 /**
 * Native buffer sample array wrapper class that provides access to a stream of either interleaved or
 * non-interleaved complex sample buffers converted from the raw byte sample array.
 */
-public class SignedByteNativeBuffer implements INativeBuffer
+public class SignedByteNativeBuffer extends AbstractNativeBuffer
 {
    private static final int FRAGMENT_SIZE = 2048;
    private final static float[] LOOKUP_VALUES;
@@ -47,7 +46,6 @@ public class SignedByteNativeBuffer implements INativeBuffer
    }

    private byte[] mSamples;
-    private long mTimestamp;
    private float mIAverageDc;
    private float mQAverageDc;

@@ -57,9 +55,12 @@ public class SignedByteNativeBuffer implements INativeBuffer
     * @param timestamp of the samples
     * @param iAverageDc of the sample stream
     * @param qAverageDc of the sample stream
+     * @param samplesPerMillisecond to calculate sub-buffer timestamps
     */
-    public SignedByteNativeBuffer(byte[] samples, long timestamp, float iAverageDc, float qAverageDc)
+    public SignedByteNativeBuffer(byte[] samples, long timestamp, float iAverageDc, float qAverageDc, float samplesPerMillisecond)
    {
+        super(timestamp, samplesPerMillisecond);
+
        //Ensure we're an even multiple of the fragment size.  Typically, this will be 64k or 128k
        if(samples.length % FRAGMENT_SIZE != 0)
        {
@@ -67,17 +68,10 @@ public class SignedByteNativeBuffer implements INativeBuffer
        }

        mSamples = samples;
-        mTimestamp = timestamp;
        mIAverageDc = iAverageDc;
        mQAverageDc = qAverageDc;
    }

-    @Override
-    public long getTimestamp()
-    {
-        return mTimestamp;
-    }
-
    @Override
    public int sampleCount()
    {
@@ -112,6 +106,8 @@ public class SignedByteNativeBuffer implements INativeBuffer
        @Override
        public ComplexSamples next()
        {
+            long timestamp = getFragmentTimestamp(mSamplesPointer);
+
            float[] i = new float[FRAGMENT_SIZE];
            float[] q = new float[FRAGMENT_SIZE];
            int samplesOffset = mSamplesPointer;
@@ -123,7 +119,7 @@ public class SignedByteNativeBuffer implements INativeBuffer
            }

            mSamplesPointer = samplesOffset;
-            return new ComplexSamples(i, q);
+            return new ComplexSamples(i, q, timestamp);
        }
    }

@@ -143,6 +139,8 @@ public class SignedByteNativeBuffer implements INativeBuffer
        @Override
        public InterleavedComplexSamples next()
        {
+            long timestamp = getFragmentTimestamp(mSamplesPointer);
+
            float[] converted = new float[FRAGMENT_SIZE * 2];

            int samplesOffset = mSamplesPointer;
@@ -155,7 +153,7 @@ public class SignedByteNativeBuffer implements INativeBuffer

            mSamplesPointer = samplesOffset;

-            return new InterleavedComplexSamples(converted, mTimestamp);
+            return new InterleavedComplexSamples(converted, timestamp);
        }
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/SignedByteNativeBufferFactory.java
+++ b/src/main/java/io/github/dsheirer/buffer/SignedByteNativeBufferFactory.java
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
 /**
 * Implements a factory for creating SignedByteNativeBuffer instances
 */
-public class SignedByteNativeBufferFactory implements INativeBufferFactory
+public class SignedByteNativeBufferFactory extends AbstractNativeBufferFactory
 {
    /**
     * DC removal calculations will run once a minute
@@ -78,7 +78,7 @@ public class SignedByteNativeBufferFactory implements INativeBufferFactory
            calculateDc(copy);
        }

-        return new SignedByteNativeBuffer(copy, timestamp, mIAverageDc, mQAverageDc);
+        return new SignedByteNativeBuffer(copy, timestamp, mIAverageDc, mQAverageDc, getSamplesPerMillisecond());
    }

    /**
--- a/src/main/java/io/github/dsheirer/buffer/airspy/AirspyBufferIterator.java
+++ b/src/main/java/io/github/dsheirer/buffer/airspy/AirspyBufferIterator.java
@@ -20,7 +20,6 @@
 package io.github.dsheirer.buffer.airspy;

 import io.github.dsheirer.dsp.filter.hilbert.HilbertTransform;
-
 import java.util.Iterator;

 /**
@@ -42,8 +41,9 @@ public abstract class AirspyBufferIterator<T> implements Iterator<T>
    protected float[] mQBuffer = new float[FRAGMENT_SIZE + Q_OVERLAP];
    protected short[] mSamples;
    protected int mSamplesPointer = 0;
-    protected long mTimestamp;
    protected float mAverageDc;
+    private long mTimestamp;
+    private float mSamplesPerMillisecond;

    /**
     * Constructs an instance
@@ -52,8 +52,10 @@ public abstract class AirspyBufferIterator<T> implements Iterator<T>
     * @param residualQ samples from previous buffer
     * @param averageDc as measured
     * @param timestamp of the buffer
+     * @param samplesPerMillisecond to calculate sub-buffer fragment timestamps
     */
-    public AirspyBufferIterator(short[] samples, short[] residualI, short[] residualQ, float averageDc, long timestamp)
+    public AirspyBufferIterator(short[] samples, short[] residualI, short[] residualQ, float averageDc, long timestamp,
+                                float samplesPerMillisecond)
    {
        if(residualI.length != I_OVERLAP || residualQ.length != Q_OVERLAP)
        {
@@ -73,6 +75,7 @@ public abstract class AirspyBufferIterator<T> implements Iterator<T>
        mAverageDc = averageDc;
        mSamples = samples;
        mTimestamp = timestamp;
+        mSamplesPerMillisecond = samplesPerMillisecond;

        //Transfer and scale the residual I & Q samples from the previous buffer
        for(int i = 0; i < residualI.length; i++)
@@ -86,6 +89,17 @@ public abstract class AirspyBufferIterator<T> implements Iterator<T>
        }
    }

+    /**
+     * Calculates the timestamp for a samples buffer fragment based on where it is extracted from relative to the
+     * native buffer starting timestamp.
+     * @param samplesPointer for the start of the fragment.  Note: this value will be divided by 2 to account for I/Q sample pairs.
+     * @return timestamp adjusted to the fragment or sub-buffer start sample.
+     */
+    protected long getFragmentTimestamp(int samplesPointer)
+    {
+        return mTimestamp + (long)(samplesPointer / 2 / mSamplesPerMillisecond);
+    }
+
    @Override
    public boolean hasNext()
    {
--- a/src/main/java/io/github/dsheirer/buffer/airspy/AirspyBufferIteratorScalar.java
+++ b/src/main/java/io/github/dsheirer/buffer/airspy/AirspyBufferIteratorScalar.java
@@ -20,7 +20,6 @@
 package io.github.dsheirer.buffer.airspy;

 import io.github.dsheirer.sample.complex.ComplexSamples;
-
 import java.util.Arrays;

 /**
@@ -36,10 +35,11 @@ public class AirspyBufferIteratorScalar extends AirspyBufferIterator<ComplexSamp
     * @param residualQ samples from last buffer
     * @param averageDc measured
     * @param timestamp of the buffer
+     * @param samplesPerMillisecond to calculate sub-buffer fragment timestamps
     */
-    public AirspyBufferIteratorScalar(short[] samples, short[] residualI, short[] residualQ, float averageDc, long timestamp)
+    public AirspyBufferIteratorScalar(short[] samples, short[] residualI, short[] residualQ, float averageDc, long timestamp, float samplesPerMillisecond)
    {
-        super(samples, residualI, residualQ, averageDc, timestamp);
+        super(samples, residualI, residualQ, averageDc, timestamp, samplesPerMillisecond);
    }

    @Override
@@ -50,6 +50,8 @@ public class AirspyBufferIteratorScalar extends AirspyBufferIterator<ComplexSamp
            throw new IllegalStateException("End of buffer exceeded");
        }

+        long timestamp = getFragmentTimestamp(mSamplesPointer);
+
        int offset = mSamplesPointer;

        for(int x = 0; x < FRAGMENT_SIZE; x++)
@@ -91,6 +93,6 @@ public class AirspyBufferIteratorScalar extends AirspyBufferIterator<ComplexSamp
        System.arraycopy(mIBuffer, FRAGMENT_SIZE, mIBuffer, 0, I_OVERLAP);
        System.arraycopy(mQBuffer, FRAGMENT_SIZE, mQBuffer, 0, Q_OVERLAP);

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/airspy/AirspyBufferIteratorVector128Bits.java
+++ b/src/main/java/io/github/dsheirer/buffer/airspy/AirspyBufferIteratorVector128Bits.java
@@ -20,12 +20,11 @@
 package io.github.dsheirer.buffer.airspy;

 import io.github.dsheirer.sample.complex.ComplexSamples;
+import java.util.Arrays;
 import jdk.incubator.vector.FloatVector;
 import jdk.incubator.vector.VectorOperators;
 import jdk.incubator.vector.VectorSpecies;

-import java.util.Arrays;
-
 /**
 * Vector SIMD implementation for non-packed Airspy native buffers
 */
@@ -41,10 +40,12 @@ public class AirspyBufferIteratorVector128Bits extends AirspyBufferIterator<Comp
     * @param residualQ samples from last buffer
     * @param averageDc measured
     * @param timestamp of the buffer
+     * @param samplesPerMillisecond to calculate sub-buffer fragment timestamps
     */
-    public AirspyBufferIteratorVector128Bits(short[] samples, short[] residualI, short[] residualQ, float averageDc, long timestamp)
+    public AirspyBufferIteratorVector128Bits(short[] samples, short[] residualI, short[] residualQ, float averageDc,
+                                             long timestamp, float samplesPerMillisecond)
    {
-        super(samples, residualI, residualQ, averageDc, timestamp);
+        super(samples, residualI, residualQ, averageDc, timestamp, samplesPerMillisecond);
    }

    @Override
@@ -55,6 +56,7 @@ public class AirspyBufferIteratorVector128Bits extends AirspyBufferIterator<Comp
            throw new IllegalStateException("End of buffer exceeded");
        }

+        long timestamp = getFragmentTimestamp(mSamplesPointer);
        int offset = mSamplesPointer;
        int fragmentPointer = 0;
        float[] scaledSamples = new float[VECTOR_SPECIES.length()];
@@ -121,6 +123,6 @@ public class AirspyBufferIteratorVector128Bits extends AirspyBufferIterator<Comp
        System.arraycopy(mIBuffer, FRAGMENT_SIZE, mIBuffer, 0, I_OVERLAP);
        System.arraycopy(mQBuffer, FRAGMENT_SIZE, mQBuffer, 0, Q_OVERLAP);

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/airspy/AirspyBufferIteratorVector256Bits.java
+++ b/src/main/java/io/github/dsheirer/buffer/airspy/AirspyBufferIteratorVector256Bits.java
@@ -20,12 +20,11 @@
 package io.github.dsheirer.buffer.airspy;

 import io.github.dsheirer.sample.complex.ComplexSamples;
+import java.util.Arrays;
 import jdk.incubator.vector.FloatVector;
 import jdk.incubator.vector.VectorOperators;
 import jdk.incubator.vector.VectorSpecies;

-import java.util.Arrays;
-
 /**
 * Vector SIMD implementation for non-packed Airspy native buffers
 */
@@ -41,10 +40,12 @@ public class AirspyBufferIteratorVector256Bits extends AirspyBufferIterator<Comp
     * @param residualQ samples from last buffer
     * @param averageDc measured
     * @param timestamp of the buffer
+     * @param samplesPerMillisecond to calculate sub-buffer fragment timestamps
     */
-    public AirspyBufferIteratorVector256Bits(short[] samples, short[] residualI, short[] residualQ, float averageDc, long timestamp)
+    public AirspyBufferIteratorVector256Bits(short[] samples, short[] residualI, short[] residualQ, float averageDc,
+                                             long timestamp, float samplesPerMillisecond)
    {
-        super(samples, residualI, residualQ, averageDc, timestamp);
+        super(samples, residualI, residualQ, averageDc, timestamp, samplesPerMillisecond);
    }

    @Override
@@ -55,6 +56,7 @@ public class AirspyBufferIteratorVector256Bits extends AirspyBufferIterator<Comp
            throw new IllegalStateException("End of buffer exceeded");
        }

+        long timestamp = getFragmentTimestamp(mSamplesPointer);
        int offset = mSamplesPointer;
        int fragmentPointer = 0;
        float[] scaledSamples = new float[VECTOR_SPECIES.length()];
@@ -115,6 +117,6 @@ public class AirspyBufferIteratorVector256Bits extends AirspyBufferIterator<Comp
        System.arraycopy(mIBuffer, FRAGMENT_SIZE, mIBuffer, 0, I_OVERLAP);
        System.arraycopy(mQBuffer, FRAGMENT_SIZE, mQBuffer, 0, Q_OVERLAP);

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/airspy/AirspyBufferIteratorVector512Bits.java
+++ b/src/main/java/io/github/dsheirer/buffer/airspy/AirspyBufferIteratorVector512Bits.java
@@ -20,12 +20,11 @@
 package io.github.dsheirer.buffer.airspy;

 import io.github.dsheirer.sample.complex.ComplexSamples;
+import java.util.Arrays;
 import jdk.incubator.vector.FloatVector;
 import jdk.incubator.vector.VectorOperators;
 import jdk.incubator.vector.VectorSpecies;

-import java.util.Arrays;
-
 /**
 * Vector SIMD implementation for non-packed Airspy native buffers
 */
@@ -42,10 +41,12 @@ public class AirspyBufferIteratorVector512Bits extends AirspyBufferIterator<Comp
     * @param residualQ samples from last buffer
     * @param averageDc measured
     * @param timestamp of the buffer
+     * @param samplesPerMillisecond to calculate sub-buffer fragment timestamps
     */
-    public AirspyBufferIteratorVector512Bits(short[] samples, short[] residualI, short[] residualQ, float averageDc, long timestamp)
+    public AirspyBufferIteratorVector512Bits(short[] samples, short[] residualI, short[] residualQ, float averageDc,
+                                             long timestamp, float samplesPerMillisecond)
    {
-        super(samples, residualI, residualQ, averageDc, timestamp);
+        super(samples, residualI, residualQ, averageDc, timestamp, samplesPerMillisecond);
        //Arrange the last 8 taps of the filter into the higher indices of an array to align for SIMD
        mFilterPart2 = new float[16];
        System.arraycopy(COEFFICIENTS, 16, mFilterPart2, 8, 8);
@@ -59,6 +60,8 @@ public class AirspyBufferIteratorVector512Bits extends AirspyBufferIterator<Comp
            throw new IllegalStateException("End of buffer exceeded");
        }

+        long timestamp = getFragmentTimestamp(mSamplesPointer);
+
        int offset = mSamplesPointer;
        int fragmentPointer = 0;
        float[] scaledSamples = new float[VECTOR_SPECIES.length()];
@@ -117,6 +120,6 @@ public class AirspyBufferIteratorVector512Bits extends AirspyBufferIterator<Comp
        System.arraycopy(mIBuffer, FRAGMENT_SIZE, mIBuffer, 0, I_OVERLAP);
        System.arraycopy(mQBuffer, FRAGMENT_SIZE, mQBuffer, 0, Q_OVERLAP);

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/airspy/AirspyBufferIteratorVector64Bits.java
+++ b/src/main/java/io/github/dsheirer/buffer/airspy/AirspyBufferIteratorVector64Bits.java
@@ -20,12 +20,11 @@
 package io.github.dsheirer.buffer.airspy;

 import io.github.dsheirer.sample.complex.ComplexSamples;
+import java.util.Arrays;
 import jdk.incubator.vector.FloatVector;
 import jdk.incubator.vector.VectorOperators;
 import jdk.incubator.vector.VectorSpecies;

-import java.util.Arrays;
-
 /**
 * Vector SIMD implementation for non-packed Airspy native buffers
 */
@@ -41,10 +40,12 @@ public class AirspyBufferIteratorVector64Bits extends AirspyBufferIterator<Compl
     * @param residualQ samples from last buffer
     * @param averageDc measured
     * @param timestamp of the buffer
+     * @param samplesPerMillisecond to calculate sub-buffer fragment timestamps
     */
-    public AirspyBufferIteratorVector64Bits(short[] samples, short[] residualI, short[] residualQ, float averageDc, long timestamp)
+    public AirspyBufferIteratorVector64Bits(short[] samples, short[] residualI, short[] residualQ, float averageDc,
+                                            long timestamp, float samplesPerMillisecond)
    {
-        super(samples, residualI, residualQ, averageDc, timestamp);
+        super(samples, residualI, residualQ, averageDc, timestamp, samplesPerMillisecond);
    }

    @Override
@@ -55,6 +56,8 @@ public class AirspyBufferIteratorVector64Bits extends AirspyBufferIterator<Compl
            throw new IllegalStateException("End of buffer exceeded");
        }

+        long timestamp = getFragmentTimestamp(mSamplesPointer);
+
        int offset = mSamplesPointer;
        int fragmentPointer = 0;
        float[] scaledSamples = new float[VECTOR_SPECIES.length()];
@@ -133,6 +136,6 @@ public class AirspyBufferIteratorVector64Bits extends AirspyBufferIterator<Compl
        System.arraycopy(mIBuffer, FRAGMENT_SIZE, mIBuffer, 0, I_OVERLAP);
        System.arraycopy(mQBuffer, FRAGMENT_SIZE, mQBuffer, 0, Q_OVERLAP);

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/airspy/AirspyInterleavedBufferIteratorScalar.java
+++ b/src/main/java/io/github/dsheirer/buffer/airspy/AirspyInterleavedBufferIteratorScalar.java
@@ -34,11 +34,12 @@ public class AirspyInterleavedBufferIteratorScalar extends AirspyBufferIterator<
     * @param residualQ samples from last buffer
     * @param averageDc measured
     * @param timestamp of the buffer
+     * @param samplesPerMillisecond to calculate sub-buffer fragment timestamps
     */
    public AirspyInterleavedBufferIteratorScalar(short[] samples, short[] residualI, short[] residualQ, float averageDc,
-                                                 long timestamp)
+                                                 long timestamp, float samplesPerMillisecond)
    {
-        super(samples, residualI, residualQ, averageDc, timestamp);
+        super(samples, residualI, residualQ, averageDc, timestamp, samplesPerMillisecond);
    }

    @Override
@@ -49,6 +50,7 @@ public class AirspyInterleavedBufferIteratorScalar extends AirspyBufferIterator<
            throw new IllegalStateException("End of buffer exceeded");
        }

+        long timestamp = getFragmentTimestamp(mSamplesPointer);
        int offset = mSamplesPointer;

        for(int x = 0; x < FRAGMENT_SIZE; x++)
@@ -89,6 +91,6 @@ public class AirspyInterleavedBufferIteratorScalar extends AirspyBufferIterator<
        System.arraycopy(mIBuffer, FRAGMENT_SIZE, mIBuffer, 0, I_OVERLAP);
        System.arraycopy(mQBuffer, FRAGMENT_SIZE, mQBuffer, 0, Q_OVERLAP);

-        return new InterleavedComplexSamples(samples, mTimestamp);
+        return new InterleavedComplexSamples(samples, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/airspy/AirspyInterleavedBufferIteratorVector128Bits.java
+++ b/src/main/java/io/github/dsheirer/buffer/airspy/AirspyInterleavedBufferIteratorVector128Bits.java
@@ -39,11 +39,12 @@ public class AirspyInterleavedBufferIteratorVector128Bits extends AirspyBufferIt
     * @param residualQ samples from last buffer
     * @param averageDc measured
     * @param timestamp of the buffer
+     * @param samplesPerMillisecond to calculate sub-buffer fragment timestamps
     */
    public AirspyInterleavedBufferIteratorVector128Bits(short[] samples, short[] residualI, short[] residualQ, float averageDc,
-                                                        long timestamp)
+                                                        long timestamp, float samplesPerMillisecond)
    {
-        super(samples, residualI, residualQ, averageDc, timestamp);
+        super(samples, residualI, residualQ, averageDc, timestamp, samplesPerMillisecond);
    }

    @Override
@@ -54,6 +55,7 @@ public class AirspyInterleavedBufferIteratorVector128Bits extends AirspyBufferIt
            throw new IllegalStateException("End of buffer exceeded");
        }

+        long timestamp = getFragmentTimestamp(mSamplesPointer);
        int offset = mSamplesPointer;
        int fragmentPointer = 0;
        float[] scaledSamples = new float[VECTOR_SPECIES.length()];
@@ -118,6 +120,6 @@ public class AirspyInterleavedBufferIteratorVector128Bits extends AirspyBufferIt
        System.arraycopy(mIBuffer, FRAGMENT_SIZE, mIBuffer, 0, I_OVERLAP);
        System.arraycopy(mQBuffer, FRAGMENT_SIZE, mQBuffer, 0, Q_OVERLAP);

-        return new InterleavedComplexSamples(samples, mTimestamp);
+        return new InterleavedComplexSamples(samples, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/airspy/AirspyInterleavedBufferIteratorVector256Bits.java
+++ b/src/main/java/io/github/dsheirer/buffer/airspy/AirspyInterleavedBufferIteratorVector256Bits.java
@@ -39,11 +39,12 @@ public class AirspyInterleavedBufferIteratorVector256Bits extends AirspyBufferIt
     * @param residualQ samples from last buffer
     * @param averageDc measured
     * @param timestamp of the buffer
+     * @param samplesPerMillisecond to calculate sub-buffer fragment timestamps
     */
    public AirspyInterleavedBufferIteratorVector256Bits(short[] samples, short[] residualI, short[] residualQ, float averageDc,
-                                                        long timestamp)
+                                                        long timestamp, float samplesPerMillisecond)
    {
-        super(samples, residualI, residualQ, averageDc, timestamp);
+        super(samples, residualI, residualQ, averageDc, timestamp, samplesPerMillisecond);
    }

    @Override
@@ -54,6 +55,7 @@ public class AirspyInterleavedBufferIteratorVector256Bits extends AirspyBufferIt
            throw new IllegalStateException("End of buffer exceeded");
        }

+        long timestamp = getFragmentTimestamp(mSamplesPointer);
        int offset = mSamplesPointer;
        int fragmentPointer = 0;
        float[] scaledSamples = new float[VECTOR_SPECIES.length()];
@@ -112,6 +114,6 @@ public class AirspyInterleavedBufferIteratorVector256Bits extends AirspyBufferIt
        System.arraycopy(mIBuffer, FRAGMENT_SIZE, mIBuffer, 0, I_OVERLAP);
        System.arraycopy(mQBuffer, FRAGMENT_SIZE, mQBuffer, 0, Q_OVERLAP);

-        return new InterleavedComplexSamples(samples, mTimestamp);
+        return new InterleavedComplexSamples(samples, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/airspy/AirspyInterleavedBufferIteratorVector512Bits.java
+++ b/src/main/java/io/github/dsheirer/buffer/airspy/AirspyInterleavedBufferIteratorVector512Bits.java
@@ -40,11 +40,12 @@ public class AirspyInterleavedBufferIteratorVector512Bits extends AirspyBufferIt
     * @param residualQ samples from last buffer
     * @param averageDc measured
     * @param timestamp of the buffer
+     * @param samplesPerMillisecond to calculate sub-buffer fragment timestamps
     */
    public AirspyInterleavedBufferIteratorVector512Bits(short[] samples, short[] residualI, short[] residualQ, float averageDc,
-                                                        long timestamp)
+                                                        long timestamp, float samplesPerMillisecond)
    {
-        super(samples, residualI, residualQ, averageDc, timestamp);
+        super(samples, residualI, residualQ, averageDc, timestamp, samplesPerMillisecond);

        //Arrange the last 8 taps of the filter into the higher indices of an array to align for SIMD
        mFilterPart2 = new float[16];
@@ -59,6 +60,7 @@ public class AirspyInterleavedBufferIteratorVector512Bits extends AirspyBufferIt
            throw new IllegalStateException("End of buffer exceeded");
        }

+        long timestamp = getFragmentTimestamp(mSamplesPointer);
        int offset = mSamplesPointer;
        int fragmentPointer = 0;
        float[] scaledSamples = new float[VECTOR_SPECIES.length()];
@@ -115,6 +117,6 @@ public class AirspyInterleavedBufferIteratorVector512Bits extends AirspyBufferIt
        System.arraycopy(mIBuffer, FRAGMENT_SIZE, mIBuffer, 0, I_OVERLAP);
        System.arraycopy(mQBuffer, FRAGMENT_SIZE, mQBuffer, 0, Q_OVERLAP);

-        return new InterleavedComplexSamples(samples, mTimestamp);
+        return new InterleavedComplexSamples(samples, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/airspy/AirspyInterleavedBufferIteratorVector64Bits.java
+++ b/src/main/java/io/github/dsheirer/buffer/airspy/AirspyInterleavedBufferIteratorVector64Bits.java
@@ -39,11 +39,12 @@ public class AirspyInterleavedBufferIteratorVector64Bits extends AirspyBufferIte
     * @param residualQ samples from last buffer
     * @param averageDc measured
     * @param timestamp of the buffer
+     * @param samplesPerMillisecond to calculate sub-buffer fragment timestamps
     */
    public AirspyInterleavedBufferIteratorVector64Bits(short[] samples, short[] residualI, short[] residualQ, float averageDc,
-                                                       long timestamp)
+                                                       long timestamp, float samplesPerMillisecond)
    {
-        super(samples, residualI, residualQ, averageDc, timestamp);
+        super(samples, residualI, residualQ, averageDc, timestamp, samplesPerMillisecond);
    }

    @Override
@@ -54,6 +55,7 @@ public class AirspyInterleavedBufferIteratorVector64Bits extends AirspyBufferIte
            throw new IllegalStateException("End of buffer exceeded");
        }

+        long timestamp = getFragmentTimestamp(mSamplesPointer);
        int offset = mSamplesPointer;
        int fragmentPointer = 0;
        float[] scaledSamples = new float[VECTOR_SPECIES.length()];
@@ -130,6 +132,6 @@ public class AirspyInterleavedBufferIteratorVector64Bits extends AirspyBufferIte
        System.arraycopy(mIBuffer, FRAGMENT_SIZE, mIBuffer, 0, I_OVERLAP);
        System.arraycopy(mQBuffer, FRAGMENT_SIZE, mQBuffer, 0, Q_OVERLAP);

-        return new InterleavedComplexSamples(samples, mTimestamp);
+        return new InterleavedComplexSamples(samples, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/airspy/AirspyNativeBuffer.java
+++ b/src/main/java/io/github/dsheirer/buffer/airspy/AirspyNativeBuffer.java
@@ -19,23 +19,21 @@

 package io.github.dsheirer.buffer.airspy;

-import io.github.dsheirer.buffer.INativeBuffer;
+import io.github.dsheirer.buffer.AbstractNativeBuffer;
 import io.github.dsheirer.sample.complex.ComplexSamples;
 import io.github.dsheirer.sample.complex.InterleavedComplexSamples;
 import io.github.dsheirer.vector.calibrate.Implementation;
-
 import java.util.Iterator;

 /**
 * Native buffer scalar implementation for Airspy non-packed samples.
 */
-public class AirspyNativeBuffer implements INativeBuffer
+public class AirspyNativeBuffer extends AbstractNativeBuffer
 {
    private short[] mSamples;
    private short[] mResidualI;
    private short[] mResidualQ;
    private float mAverageDc;
-    private long mTimestamp;
    private Implementation mInterleavedImplementation;
    private Implementation mNonInterleavedImplementation;

@@ -48,11 +46,14 @@ public class AirspyNativeBuffer implements INativeBuffer
     * @param timestamp of the buffer
     * @param interleavedImplementation optimal, scalar vs vector SIMD
     * @param nonInterleavedImplementation optimal, scalar vs vector SIMD
+     * @param samplesPerMillisecond used to calculate sub-buffer fragment timestamp offsets from the start of this buffer.
     */
    public AirspyNativeBuffer(short[] samples, short[] residualI, short[] residualQ, float averageDc,
                              long timestamp, Implementation interleavedImplementation,
-                              Implementation nonInterleavedImplementation)
+                              Implementation nonInterleavedImplementation, float samplesPerMillisecond)
    {
+        super(timestamp, samplesPerMillisecond);
+
        //Ensure we're an even multiple of the fragment size.  Typically, this will be 64k or 128k
        if(samples.length % AirspyBufferIterator.FRAGMENT_SIZE != 0)
        {
@@ -64,7 +65,6 @@ public class AirspyNativeBuffer implements INativeBuffer
        mResidualI = residualI;
        mResidualQ = residualQ;
        mAverageDc = averageDc;
-        mTimestamp = timestamp;
        mInterleavedImplementation = interleavedImplementation;
        mNonInterleavedImplementation = nonInterleavedImplementation;
    }
@@ -75,22 +75,16 @@ public class AirspyNativeBuffer implements INativeBuffer
        return mSamples.length / 2;
    }

-    @Override
-    public long getTimestamp()
-    {
-        return mTimestamp;
-    }
-
    @Override
    public Iterator<ComplexSamples> iterator()
    {
        return switch(mInterleavedImplementation)
        {
-            case VECTOR_SIMD_512 -> new AirspyBufferIteratorVector512Bits(mSamples, mResidualI, mResidualQ, mAverageDc, mTimestamp);
-            case VECTOR_SIMD_256-> new AirspyBufferIteratorVector256Bits(mSamples, mResidualI, mResidualQ, mAverageDc, mTimestamp);
-            case VECTOR_SIMD_128-> new AirspyBufferIteratorVector128Bits(mSamples, mResidualI, mResidualQ, mAverageDc, mTimestamp);
-            case VECTOR_SIMD_64 ->new AirspyBufferIteratorVector64Bits(mSamples, mResidualI, mResidualQ, mAverageDc, mTimestamp);
-            default -> new AirspyBufferIteratorScalar(mSamples, mResidualI, mResidualQ, mAverageDc, mTimestamp);
+            case VECTOR_SIMD_512 -> new AirspyBufferIteratorVector512Bits(mSamples, mResidualI, mResidualQ, mAverageDc, getTimestamp(), getSamplesPerMillisecond());
+            case VECTOR_SIMD_256-> new AirspyBufferIteratorVector256Bits(mSamples, mResidualI, mResidualQ, mAverageDc, getTimestamp(), getSamplesPerMillisecond());
+            case VECTOR_SIMD_128-> new AirspyBufferIteratorVector128Bits(mSamples, mResidualI, mResidualQ, mAverageDc, getTimestamp(), getSamplesPerMillisecond());
+            case VECTOR_SIMD_64 ->new AirspyBufferIteratorVector64Bits(mSamples, mResidualI, mResidualQ, mAverageDc, getTimestamp(), getSamplesPerMillisecond());
+            default -> new AirspyBufferIteratorScalar(mSamples, mResidualI, mResidualQ, mAverageDc, getTimestamp(), getSamplesPerMillisecond());
        };
    }

@@ -99,11 +93,11 @@ public class AirspyNativeBuffer implements INativeBuffer
    {
        return switch(mInterleavedImplementation)
        {
-            case VECTOR_SIMD_512 -> new AirspyInterleavedBufferIteratorVector512Bits(mSamples, mResidualI, mResidualQ, mAverageDc, mTimestamp);
-            case VECTOR_SIMD_256-> new AirspyInterleavedBufferIteratorVector256Bits(mSamples, mResidualI, mResidualQ, mAverageDc, mTimestamp);
-            case VECTOR_SIMD_128-> new AirspyInterleavedBufferIteratorVector128Bits(mSamples, mResidualI, mResidualQ, mAverageDc, mTimestamp);
-            case VECTOR_SIMD_64 ->new AirspyInterleavedBufferIteratorVector64Bits(mSamples, mResidualI, mResidualQ, mAverageDc, mTimestamp);
-            default -> new AirspyInterleavedBufferIteratorScalar(mSamples, mResidualI, mResidualQ, mAverageDc, mTimestamp);
+            case VECTOR_SIMD_512 -> new AirspyInterleavedBufferIteratorVector512Bits(mSamples, mResidualI, mResidualQ, mAverageDc, getTimestamp(), getSamplesPerMillisecond());
+            case VECTOR_SIMD_256-> new AirspyInterleavedBufferIteratorVector256Bits(mSamples, mResidualI, mResidualQ, mAverageDc, getTimestamp(), getSamplesPerMillisecond());
+            case VECTOR_SIMD_128-> new AirspyInterleavedBufferIteratorVector128Bits(mSamples, mResidualI, mResidualQ, mAverageDc, getTimestamp(), getSamplesPerMillisecond());
+            case VECTOR_SIMD_64 ->new AirspyInterleavedBufferIteratorVector64Bits(mSamples, mResidualI, mResidualQ, mAverageDc, getTimestamp(), getSamplesPerMillisecond());
+            default -> new AirspyInterleavedBufferIteratorScalar(mSamples, mResidualI, mResidualQ, mAverageDc, getTimestamp(), getSamplesPerMillisecond());
        };
    }
 }
--- a/src/main/java/io/github/dsheirer/buffer/airspy/AirspyNativeBufferFactory.java
+++ b/src/main/java/io/github/dsheirer/buffer/airspy/AirspyNativeBufferFactory.java
@@ -19,19 +19,18 @@

 package io.github.dsheirer.buffer.airspy;

+import io.github.dsheirer.buffer.AbstractNativeBufferFactory;
 import io.github.dsheirer.buffer.INativeBuffer;
-import io.github.dsheirer.buffer.INativeBufferFactory;
 import io.github.dsheirer.vector.calibrate.CalibrationManager;
 import io.github.dsheirer.vector.calibrate.CalibrationType;
 import io.github.dsheirer.vector.calibrate.Implementation;
-
 import java.nio.ByteBuffer;
 import java.util.Arrays;

 /**
 * Implements a factory for creating SignedByteNativeBuffer instances
 */
-public class AirspyNativeBufferFactory implements INativeBufferFactory
+public class AirspyNativeBufferFactory extends AbstractNativeBufferFactory
 {
    private boolean mSamplePacking = false;
    private short[] mResidualI = new short[AirspyBufferIterator.I_OVERLAP];
@@ -106,7 +105,7 @@ public class AirspyNativeBufferFactory implements INativeBufferFactory
        INativeBuffer nativeBuffer = new AirspyNativeBuffer(samples,
                Arrays.copyOf(mResidualI, mResidualI.length),
                Arrays.copyOf(mResidualQ, mResidualQ.length), mConverter.getAverageDc(), timestamp,
-                mInterleavedIteratorImplementation, mNonInterleavedIteratorImplementation);
+                mInterleavedIteratorImplementation, mNonInterleavedIteratorImplementation, getSamplesPerMillisecond());

        extractResidual(samples);

--- a/src/main/java/io/github/dsheirer/channel/metadata/NowPlayingPanel.java
+++ b/src/main/java/io/github/dsheirer/channel/metadata/NowPlayingPanel.java
@@ -1,7 +1,6 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2019 Dennis Sheirer
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * *****************************************************************************
+ * ****************************************************************************
 */
 package io.github.dsheirer.channel.metadata;

@@ -28,10 +27,11 @@ import io.github.dsheirer.module.decode.event.DecodeEventPanel;
 import io.github.dsheirer.module.decode.event.MessageActivityPanel;
 import io.github.dsheirer.playlist.PlaylistManager;
 import io.github.dsheirer.preference.UserPreferences;
+import io.github.dsheirer.settings.SettingsManager;
+import java.awt.Color;
 import net.miginfocom.swing.MigLayout;

 import javax.swing.JPanel;
-import java.awt.Color;

 public class NowPlayingPanel extends JPanel
 {
@@ -45,13 +45,14 @@ public class NowPlayingPanel extends JPanel
     * GUI panel that combines the currently decoding channels metadata table and viewers for channel details,
     * messages, events, and spectral view.
     */
-    public NowPlayingPanel(PlaylistManager playlistManager, IconModel iconModel, UserPreferences userPreferences)
+    public NowPlayingPanel(PlaylistManager playlistManager, IconModel iconModel, UserPreferences userPreferences,
+                           SettingsManager settingsManager)
    {
        mChannelDetailPanel = new ChannelDetailPanel(playlistManager.getChannelProcessingManager());
        mDecodeEventPanel = new DecodeEventPanel(iconModel, userPreferences, playlistManager.getAliasModel());
        mMessageActivityPanel = new MessageActivityPanel(userPreferences);
        mChannelMetadataPanel = new ChannelMetadataPanel(playlistManager, iconModel, userPreferences);
-        mChannelPowerPanel = new ChannelPowerPanel(playlistManager);
+        mChannelPowerPanel = new ChannelPowerPanel(playlistManager, settingsManager);

        init();
    }
@@ -68,6 +69,10 @@ public class NowPlayingPanel extends JPanel
        tabbedPane.setFont(this.getFont());
        tabbedPane.setForeground(Color.BLACK);

+        //Register state change listener to toggle visibility state for channel tab to turn-on/off FFT processing
+        tabbedPane.addChangeListener(e -> mChannelPowerPanel.setPanelVisible(tabbedPane.getSelectedIndex() == tabbedPane
+                .indexOfComponent(mChannelPowerPanel)));
+
        JideSplitPane splitPane = new JideSplitPane(JideSplitPane.VERTICAL_SPLIT);
        splitPane.setShowGripper(true);
        splitPane.add(mChannelMetadataPanel);
--- a/src/main/java/io/github/dsheirer/controller/ControllerPanel.java
+++ b/src/main/java/io/github/dsheirer/controller/ControllerPanel.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -32,6 +32,8 @@ import io.github.dsheirer.preference.UserPreferences;
 import io.github.dsheirer.settings.SettingsManager;
 import io.github.dsheirer.source.tuner.manager.TunerManager;
 import io.github.dsheirer.source.tuner.ui.TunerViewPanel;
+import java.awt.Color;
+import java.awt.Dimension;
 import jiconfont.icons.font_awesome.FontAwesome;
 import jiconfont.swing.IconFontSwing;
 import net.miginfocom.swing.MigLayout;
@@ -41,8 +43,6 @@ import org.slf4j.LoggerFactory;
 import javax.swing.Icon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import java.awt.Color;
-import java.awt.Dimension;

 public class ControllerPanel extends JPanel
 {
@@ -63,7 +63,7 @@ public class ControllerPanel extends JPanel
    {
        mAudioPanel = new AudioPanel(iconModel, userPreferences, settingsManager, audioPlaybackManager,
            playlistManager.getAliasModel());
-        mNowPlayingPanel = new NowPlayingPanel(playlistManager, iconModel, userPreferences);
+        mNowPlayingPanel = new NowPlayingPanel(playlistManager, iconModel, userPreferences, settingsManager);
        mMapPanel = new MapPanel(mapService, playlistManager.getAliasModel(), iconModel, settingsManager);
        mTunerManagerPanel = new TunerViewPanel(tunerManager, userPreferences);

--- a/src/main/java/io/github/dsheirer/controller/channel/ChannelSelectionManager.java
+++ b/src/main/java/io/github/dsheirer/controller/channel/ChannelSelectionManager.java
@@ -1,7 +1,6 @@
 /*
- * ******************************************************************************
- * sdrtrunk
- * Copyright (C) 2014-2018 Dennis Sheirer
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * *****************************************************************************
+ * ****************************************************************************
 */
 package io.github.dsheirer.controller.channel;

@@ -33,7 +32,7 @@ public class ChannelSelectionManager implements Listener<ChannelEvent>
    public ChannelSelectionManager(ChannelModel channelModel)
    {
        mChannelEventListener = channelModel;
-        channelModel.addListener(this::receive);
+        channelModel.addListener(ChannelSelectionManager.this);
    }

    @Override
--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/AbstractComplexPolyphaseChannelizer.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/AbstractComplexPolyphaseChannelizer.java
@@ -23,11 +23,10 @@ import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.complex.InterleavedComplexSamples;
 import io.github.dsheirer.source.ISourceEventListener;
 import io.github.dsheirer.source.SourceEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 public abstract class AbstractComplexPolyphaseChannelizer implements Listener<InterleavedComplexSamples>, ISourceEventListener
 {
@@ -38,6 +37,7 @@ public abstract class AbstractComplexPolyphaseChannelizer implements Listener<In
    private int mChannelCount;
    private int mSubChannelCount;
    private double mChannelSampleRate;
+    protected long mCurrentSamplesTimestamp;

    /**
     * Complex sample polyphase channelizer
@@ -106,7 +106,7 @@ public abstract class AbstractComplexPolyphaseChannelizer implements Listener<In
    {
        for(PolyphaseChannelSource channel : mChannels)
        {
-            channel.receiveChannelResults(channelResultsList);
+            channel.receiveChannelResults(channelResultsList, mCurrentSamplesTimestamp);
        }
    }

--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/ChannelCalculator.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/ChannelCalculator.java
@@ -1,31 +1,34 @@
-/*******************************************************************************
- * *********************************************************************************************************************
- * sdr-trunk
- * Copyright (C) 2014-2017 Dennis Sheirer
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
- * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by  the Free Software Foundation, either version 3 of the License, or  (at your option) any
- * later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
 *
- * This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied
- * warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
 *
- * You should have received a copy of the GNU General Public License  along with this program.
- * If not, see <http://www.gnu.org/licenses/>
- * *********************************************************************************************************************
- ******************************************************************************/
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
 package io.github.dsheirer.dsp.filter.channelizer;

 import io.github.dsheirer.source.tuner.channel.TunerChannel;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.commons.math3.util.FastMath;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import java.util.ArrayList;
-import java.util.List;
-
 public class ChannelCalculator
 {
+    private static final DecimalFormat FREQUENCY_FORMAT = new DecimalFormat("0.00000");
    private final static Logger mLog = LoggerFactory.getLogger(ChannelCalculator.class);

    /**
@@ -546,13 +549,13 @@ public class ChannelCalculator
    public String toString()
    {
        StringBuilder sb = new StringBuilder();
-        sb.append("Channel Calculator Settings");
-        sb.append(" Channels:").append(getChannelCount());
-        sb.append(" Sample Rate:").append(getSampleRate());
-        sb.append(" Channel Bandwidth:").append(getChannelBandwidth());
-        sb.append(" Channel Rate:").append(getChannelSampleRate());
-        sb.append(" Min:").append(getMinimumFrequency());
-        sb.append(" Max:").append(getMaximumFrequency());
+        sb.append("Channel Calculator | Tuner SR:").append(FREQUENCY_FORMAT.format(getSampleRate() / 1E6D));
+        sb.append(" CF:").append(FREQUENCY_FORMAT.format(getCenterFrequency() / 1E6D));
+        sb.append(" MIN:").append(FREQUENCY_FORMAT.format(getMinimumFrequency() / 1E6D));
+        sb.append(" MAX:").append(FREQUENCY_FORMAT.format(getMaximumFrequency() / 1E6D));
+        sb.append(" | Channel COUNT:").append(getChannelCount());
+        sb.append(" BW:").append(FREQUENCY_FORMAT.format(getChannelBandwidth() / 1E6D));
+        sb.append(" SR:").append(FREQUENCY_FORMAT.format(getChannelSampleRate() / 1E6D));
        return sb.toString();
    }
 }
--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/ComplexPolyphaseChannelizerM2.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/ComplexPolyphaseChannelizerM2.java
@@ -22,15 +22,14 @@ import io.github.dsheirer.dsp.filter.FilterFactory;
 import io.github.dsheirer.dsp.filter.design.FilterDesignException;
 import io.github.dsheirer.sample.complex.InterleavedComplexSamples;
 import io.github.dsheirer.util.Dispatcher;
-import org.apache.commons.math3.util.FastMath;
-import org.jtransforms.fft.FloatFFT_1D;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import org.apache.commons.math3.util.FastMath;
+import org.jtransforms.fft.FloatFFT_1D;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 * Non-Maximally Decimated Polyphase Filter Bank (NMDPFB) channelizer that divides the input baseband complex sample
@@ -193,7 +192,8 @@ public class ComplexPolyphaseChannelizerM2 extends AbstractComplexPolyphaseChann
    @Override
    public void receive(InterleavedComplexSamples complexSamples)
    {
-//TODO: how do we pass the timestamp onto the sample assemblers?
+        mCurrentSamplesTimestamp = complexSamples.timestamp();
+
        float[] samples = complexSamples.samples();

        int samplesPointer = 0;
--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelManager.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelManager.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -22,10 +22,6 @@ import io.github.dsheirer.buffer.INativeBuffer;
 import io.github.dsheirer.buffer.INativeBufferProvider;
 import io.github.dsheirer.buffer.NativeBufferPoisonPill;
 import io.github.dsheirer.controller.channel.event.ChannelStopProcessingRequest;
-import io.github.dsheirer.dsp.filter.FilterFactory;
-import io.github.dsheirer.dsp.filter.channelizer.output.IPolyphaseChannelOutputProcessor;
-import io.github.dsheirer.dsp.filter.channelizer.output.OneChannelOutputProcessor;
-import io.github.dsheirer.dsp.filter.channelizer.output.TwoChannelOutputProcessor;
 import io.github.dsheirer.dsp.filter.design.FilterDesignException;
 import io.github.dsheirer.eventbus.MyEventBus;
 import io.github.dsheirer.sample.Broadcaster;
@@ -39,16 +35,16 @@ import io.github.dsheirer.source.tuner.TunerController;
 import io.github.dsheirer.source.tuner.channel.TunerChannel;
 import io.github.dsheirer.source.tuner.channel.TunerChannelSource;
 import io.github.dsheirer.util.Dispatcher;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Queue;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.locks.ReentrantLock;
 import org.apache.commons.math3.util.FastMath;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,16 +67,17 @@ import org.slf4j.LoggerFactory;
 */
 public class PolyphaseChannelManager implements ISourceEventProcessor
 {
+    private static final DecimalFormat FREQUENCY_FORMAT = new DecimalFormat("0.00000");
    private final static Logger mLog = LoggerFactory.getLogger(PolyphaseChannelManager.class);
    private static final double MINIMUM_CHANNEL_BANDWIDTH = 25000.0;
    private static final double CHANNEL_OVERSAMPLING = 2.0;
    private static final int POLYPHASE_CHANNELIZER_TAPS_PER_CHANNEL = 9;
-    private static final int POLYPHASE_SYNTHESIZER_TAPS_PER_CHANNEL = 9;

    private Broadcaster<SourceEvent> mSourceEventBroadcaster = new Broadcaster<>();
    private INativeBufferProvider mNativeBufferProvider;
    private List<PolyphaseChannelSource> mChannelSources = new CopyOnWriteArrayList<>();
    private ChannelCalculator mChannelCalculator;
+    private SynthesisFilterManager mFilterManager = new SynthesisFilterManager();
    private ComplexPolyphaseChannelizerM2 mPolyphaseChannelizer;
    private ChannelSourceEventListener mChannelSourceEventListener = new ChannelSourceEventListener();
    private NativeBufferReceiver mNativeBufferReceiver = new NativeBufferReceiver();
@@ -129,6 +126,34 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
        this(tunerController, tunerController.getFrequency(), tunerController.getSampleRate());
    }

+    /**
+     * Provides a description of the state of this manager.
+     */
+    public String getStateDescription()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Polyphase Channel Manager Providing [").append(mChannelSources.size()).append("] Channels");
+        sb.append("\n\t").append(mChannelCalculator);
+        for(PolyphaseChannelSource pcs: mChannelSources)
+        {
+            List<Integer> indexes = pcs.getOutputProcessorIndexes();
+            double sampleRate = pcs.getSampleRate();
+            long indexCenterFrequency = pcs.getIndexCenterFrequency();
+            long appliedFrequencyOffset = pcs.getFrequencyOffset();
+            long requestedCenterFrequency = pcs.getFrequency();
+
+            sb.append("\n\tPolyphase | Tuner SR:").append(FREQUENCY_FORMAT.format(pcs.getTunerSampleRate() / 1E6d));
+            sb.append(" CF:").append(FREQUENCY_FORMAT.format(pcs.getTunerCenterFrequency() / 1E6d));
+            sb.append(" BW: ").append(FREQUENCY_FORMAT.format(sampleRate / 1E6d));
+            sb.append(" | Channel CF: ").append(FREQUENCY_FORMAT.format(indexCenterFrequency / 1E6d));
+            sb.append(" REQUESTED CF: ").append(FREQUENCY_FORMAT.format(requestedCenterFrequency / 1E6d));
+            sb.append(" MIXER:").append(FREQUENCY_FORMAT.format(appliedFrequencyOffset / 1E6d));
+            sb.append(" | Polyphase Indices: ").append(indexes);
+        }
+
+        return sb.toString();
+    }
+
    public void stopAllChannels()
    {
        mRunning = false;
@@ -181,63 +206,22 @@ public class PolyphaseChannelManager implements ISourceEventProcessor

        if(mRunning)
        {
-            List<Integer> polyphaseIndexes = mChannelCalculator.getChannelIndexes(tunerChannel);
-
-            IPolyphaseChannelOutputProcessor outputProcessor = getOutputProcessor(polyphaseIndexes);
-
-            if(outputProcessor != null)
+            try
            {
-                long centerFrequency = mChannelCalculator.getCenterFrequencyForIndexes(polyphaseIndexes);
+                channelSource = new PolyphaseChannelSource(tunerChannel, mChannelCalculator, mFilterManager,
+                        mChannelSourceEventListener);

-                try
-                {
-                    channelSource = new PolyphaseChannelSource(tunerChannel, outputProcessor, mChannelSourceEventListener,
-                            mChannelCalculator.getChannelSampleRate(), centerFrequency);
-
-                    mChannelSources.add(channelSource);
-                }
-                catch(FilterDesignException fde)
-                {
-                    mLog.debug("Couldn't design final output low pass filter for polyphase channel source");
-                }
+                mChannelSources.add(channelSource);
+            }
+            catch(IllegalArgumentException iae)
+            {
+                mLog.debug("Couldn't design final output low pass filter for polyphase channel source");
            }
        }

        return channelSource;
    }

-    /**
-     * Creates a processor to process the channelizer channel indexes into a composite output stream providing
-     * channelized complex sample buffers to a registered source listener.
-     * @param indexes to target by the output processor
-     * @return output processor compatible with the number of indexes to monitor
-     */
-    private IPolyphaseChannelOutputProcessor getOutputProcessor(List<Integer> indexes)
-    {
-        switch(indexes.size())
-        {
-            case 1:
-                return new OneChannelOutputProcessor(mChannelCalculator.getChannelSampleRate(), indexes,
-                    mChannelCalculator.getChannelCount());
-            case 2:
-                try
-                {
-                    float[] filter = getOutputProcessorFilter(2);
-                    return new TwoChannelOutputProcessor(mChannelCalculator.getChannelSampleRate(), indexes, filter,
-                        mChannelCalculator.getChannelCount());
-                }
-                catch(FilterDesignException fde)
-                {
-                    mLog.error("Error designing 2 channel synthesis filter for output processor");
-                }
-            default:
-                //TODO: create output processor for greater than 2 input channels
-                mLog.error("Request to create an output processor for unexpected channel index size:" + indexes.size());
-                mLog.info(mChannelCalculator.toString());
-                return null;
-        }
-    }
-
    /**
     * Starts/adds the channel source to receive channelized sample buffers, registering with the tuner to receive
     * sample buffers when this is the first channel.
@@ -249,7 +233,6 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
        synchronized(mBufferDispatcher)
        {
            //Note: the polyphase channel source has already been added to the mChannelSources in getChannel() method
-
            checkChannelizerConfiguration();

            mPolyphaseChannelizer.addChannel(channelSource);
@@ -311,10 +294,6 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
        switch(sourceEvent.getEvent())
        {
            case NOTIFICATION_FREQUENCY_CHANGE:
-                //Update channel calculator immediately so that channels can be allocated
-                mChannelCalculator.setCenterFrequency(sourceEvent.getValue().longValue());
-
-                //Defer channelizer configuration changes to be handled on the buffer processor thread
                mNativeBufferReceiver.receive(sourceEvent);
                break;
            case NOTIFICATION_SAMPLE_RATE_CHANGE:
@@ -330,7 +309,7 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
                //no-op
                break;
            default:
-                mLog.info("Unrecognized source event: " + sourceEvent.toString());
+                mLog.info("Unrecognized source event: " + sourceEvent);
                break;
        }
    }
@@ -381,79 +360,21 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
     * Updates each of the output processors for any changes in the tuner's center frequency or sample rate, which
     * would cause the output processors to change the polyphase channelizer results channel(s) that the processor is
     * consuming
-     *
-     * @param sourceEvent (optional-can be null) to broadcast to each output processor following the update
     */
-    private void updateOutputProcessors(SourceEvent sourceEvent)
+    private void updateOutputProcessors()
    {
        for(PolyphaseChannelSource channelSource: mChannelSources)
        {
-            updateOutputProcessor(channelSource);
-
-            //Send the non-null source event to each channel source
-            if(sourceEvent != null)
+            try
            {
-                try
-                {
-                    channelSource.process(sourceEvent);
-                }
-                catch(SourceException se)
-                {
-                    mLog.error("Error while notifying polyphase channel source of a source event", se);
-                }
+                channelSource.updateOutputProcessor(mChannelCalculator, mFilterManager);
            }
-        }
-    }
-
-    /**
-     * Updates the polyphase channel source's output processor due to a change in the center frequency or sample
-     * rate for the source providing sample buffers to the polyphase channelizer, or whenever the DDC channel's
-     * center tuned frequency changes.
-     *
-     * @param channelSource that requires an update to its output processor
-     */
-    private void updateOutputProcessor(PolyphaseChannelSource channelSource)
-    {
-        try
-        {
-            //If a change in sample rate or center frequency makes this channel no longer viable, then the channel
-            //calculator will throw an IllegalArgException ... handled below
-            List<Integer> indexes = mChannelCalculator.getChannelIndexes(channelSource.getTunerChannel());
-
-            long centerFrequency = mChannelCalculator.getCenterFrequencyForIndexes(indexes);
-
-            //If the indexes size is the same then update the current processor, otherwise create a new one
-            IPolyphaseChannelOutputProcessor outputProcessor = channelSource.getPolyphaseChannelOutputProcessor();
-
-            if(outputProcessor != null && outputProcessor.getInputChannelCount() == indexes.size())
+            catch(IllegalArgumentException iae)
            {
-                channelSource.getPolyphaseChannelOutputProcessor().setPolyphaseChannelIndices(indexes);
-                channelSource.setFrequency(centerFrequency);
-
-                if(indexes.size() > 1)
-                {
-                    try
-                    {
-                        float[] filter = getOutputProcessorFilter(indexes.size());
-                        channelSource.getPolyphaseChannelOutputProcessor().setSynthesisFilter(filter);
-                    }
-                    catch(FilterDesignException fde)
-                    {
-                        mLog.error("Error creating an updated synthesis filter for the channel output processor");
-                    }
-                }
+                mLog.error("Error updating polyphase channel source output processor following tuner frequency or " +
+                        "sample rate change");
+                stopChannelSource(channelSource);
            }
-            else
-            {
-                channelSource.setPolyphaseChannelOutputProcessor(getOutputProcessor(indexes), centerFrequency);
-            }
-        }
-        catch(IllegalArgumentException iae)
-        {
-            mLog.error("Error updating polyphase channel source - can't determine output channel indexes for " +
-                "updated tuner center frequency and sample rate.  Stopping channel source", iae);
-
-            stopChannelSource(channelSource);
        }
    }

@@ -497,29 +418,6 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
        mSourceEventBroadcaster.removeListener(listener);
    }

-    /**
-     * Generates (or reuses) an output processor filter for the specified number of channels.  Each
-     * filter is created only once and stored in a map for reuse.  This map is cleared anytime that the
-     * input sample rate changes, so that the filters can be recreated with the new channel sample rate.
-     * @param channels count
-     * @return filter
-     * @throws FilterDesignException if the filter cannot be designed to specification (-6 dB band edge)
-     */
-    private float[] getOutputProcessorFilter(int channels) throws FilterDesignException
-    {
-        float[] taps = mOutputProcessorFilters.get(channels);
-
-        if(taps == null)
-        {
-            taps = FilterFactory.getSincM2Synthesizer(mChannelCalculator.getChannelSampleRate(),
-                mChannelCalculator.getChannelBandwidth(), channels, POLYPHASE_SYNTHESIZER_TAPS_PER_CHANNEL);
-
-            mOutputProcessorFilters.put(channels, taps);
-        }
-
-        return taps;
-    }
-
    /**
     * Internal class for handling requests for start/stop sample stream from polyphase channel sources
     */
@@ -560,9 +458,6 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
                        source.dispose();
                    }
                    break;
-                case NOTIFICATION_FREQUENCY_CORRECTION_CHANGE:
-                    //ignore
-                    break;
                case NOTIFICATION_MEASURED_FREQUENCY_ERROR_SYNC_LOCKED:
                    //Rebroadcast so that the tuner source can process this event
                    mSourceEventBroadcaster.broadcast(sourceEvent);
@@ -578,58 +473,80 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
    /**
     * Processes the incoming buffer stream from the provider and transfers the buffers to the polyphase channelizer.
     *
-     * This monitor incorporates a queue for receiving source events that affect configuration of the channelizer so
-     * that they can be processed on the buffer processor calling thread, avoiding unnecessary locks on the channelizer
-     * and/or the channel sources and output processors.
+     * This monitor incorporates a source event handler that queues a center frequency update so that it can be
+     * handled on the buffer processing thread, avoiding having to lock on the output processor thread.  Since we
+     * anticipate that these two threads will contend for access to this update required flag, we use an update lock
+     * to protect access to the flag.
     */
    public class NativeBufferReceiver implements Listener<INativeBuffer>
    {
-        private Queue<SourceEvent> mQueuedSourceEvents = new ConcurrentLinkedQueue<>();
+        private boolean mOutputProcessorUpdateRequired = false;
+        private ReentrantLock mUpdateFlagLock = new ReentrantLock();

        /**
-         * Queues the source event for deferred execution on the buffer processing thread.
+         * Processes tuner center frequency change source events to flag when output processors need updating.
         * @param event that affects configuration of the channelizer (frequency or sample rate change events)
         */
        public void receive(SourceEvent event)
        {
-            mQueuedSourceEvents.offer(event);
+            long frequency = event.getValue().longValue();
+
+            if(mChannelCalculator.getCenterFrequency() != frequency)
+            {
+                mUpdateFlagLock.lock();
+
+                try
+                {
+                    //Update the channel calculator frequency so that it's ready when the output processor update occurs
+                    mChannelCalculator.setCenterFrequency(frequency);
+                    mOutputProcessorUpdateRequired = true;
+                }
+                finally
+                {
+                    mUpdateFlagLock.unlock();
+                }
+            }
        }

+        /**
+         * Process native buffer streams and update polyphase output channels when the parent tuner center
+         * frequency changes.
+         * @param nativeBuffer of sample to process.
+         */
        @Override
        public void receive(INativeBuffer nativeBuffer)
        {
+            mUpdateFlagLock.lock();
+
            try
            {
-                //Process any queued source events before processing the buffers
-                SourceEvent queuedSourceEvent = mQueuedSourceEvents.poll();
-
-                while(queuedSourceEvent != null)
+                if(mOutputProcessorUpdateRequired)
                {
-                    switch(queuedSourceEvent.getEvent())
-                    {
-                        case NOTIFICATION_FREQUENCY_CHANGE:
-                            //Don't send the tuner's frequency change event down to the channels - it would cause chaos
-                            updateOutputProcessors(null);
-                            break;
-                    }
-
-                    queuedSourceEvent = mQueuedSourceEvents.poll();
+                    updateOutputProcessors();
+                    mOutputProcessorUpdateRequired = false;
                }
+            }
+            finally
+            {
+                mUpdateFlagLock.unlock();
+            }

-                if(mPolyphaseChannelizer != null)
+            if(mPolyphaseChannelizer != null)
+            {
+                Iterator<InterleavedComplexSamples> iterator = nativeBuffer.iteratorInterleaved();
+
+                while(iterator.hasNext())
                {
-                    Iterator<InterleavedComplexSamples> iterator = nativeBuffer.iteratorInterleaved();
-
-                    while(iterator.hasNext())
+                    try
                    {
                        mPolyphaseChannelizer.receive(iterator.next());
                    }
+                    catch(Throwable throwable)
+                    {
+                        mLog.error("Error", throwable);
+                    }
                }
            }
-            catch(Throwable throwable)
-            {
-                mLog.error("Error", throwable);
-            }
        }
    }
 }
--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelSource.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelSource.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,8 @@
 package io.github.dsheirer.dsp.filter.channelizer;

 import io.github.dsheirer.dsp.filter.channelizer.output.IPolyphaseChannelOutputProcessor;
+import io.github.dsheirer.dsp.filter.channelizer.output.OneChannelOutputProcessor;
+import io.github.dsheirer.dsp.filter.channelizer.output.TwoChannelOutputProcessor;
 import io.github.dsheirer.dsp.filter.design.FilterDesignException;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.complex.ComplexSamples;
@@ -26,8 +28,12 @@ import io.github.dsheirer.source.SourceEvent;
 import io.github.dsheirer.source.tuner.channel.StreamProcessorWithHeartbeat;
 import io.github.dsheirer.source.tuner.channel.TunerChannel;
 import io.github.dsheirer.source.tuner.channel.TunerChannelSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;

 /**
 * Polyphase Channelizer's Tuner Channel Source implementation.  Wraps a ChannelOutputProcessor instance and
@@ -36,34 +42,69 @@ import java.util.List;
 */
 public class PolyphaseChannelSource extends TunerChannelSource implements Listener<ComplexSamples>
 {
+    private Logger mLog = LoggerFactory.getLogger(PolyphaseChannelSource.class);
    private IPolyphaseChannelOutputProcessor mPolyphaseChannelOutputProcessor;
-    private IPolyphaseChannelOutputProcessor mReplacementPolyphaseChannelOutputProcessor;
    private StreamProcessorWithHeartbeat<ComplexSamples> mStreamHeartbeatProcessor;
-    private long mReplacementFrequency;
    private double mChannelSampleRate;
    private long mIndexCenterFrequency;
-    private long mChannelFrequencyCorrection;
+    private ReentrantLock mOutputProcessorLock = new ReentrantLock();
+
+    private List<Integer> mOutputProcessorIndexes = new ArrayList<>();
+    private double mTunerSampleRate;
+    private double mTunerCenterFrequency;
+

    /**
     * Constructs an instance
     *
     * @param tunerChannel describing the desired channel frequency and bandwidth/minimum sample rate
-     * @param outputProcessor - to process polyphase channelizer channel results into a channel stream
+     * @param channelCalculator for current channel center frequency and sample rate and index calculations
+     * @param filterManager for access to new or cached synthesis filters
     * @param producerSourceEventListener to receive source event requests (e.g. start/stop sample stream)
-     * @param channelSampleRate for the downstream sample output
-     * @param centerFrequency of the incoming polyphase channel(s)
-     * @throws FilterDesignException if a channel low pass filter can't be designed to the channel specification
+     * @throws IllegalArgumentException if a channel low pass filter can't be designed to the channel specification
     */
-    public PolyphaseChannelSource(TunerChannel tunerChannel, IPolyphaseChannelOutputProcessor outputProcessor,
-                                  Listener<SourceEvent> producerSourceEventListener, double channelSampleRate,
-                                  long centerFrequency) throws FilterDesignException
+    public PolyphaseChannelSource(TunerChannel tunerChannel, ChannelCalculator channelCalculator, SynthesisFilterManager filterManager,
+                                  Listener<SourceEvent> producerSourceEventListener) throws IllegalArgumentException
    {
        super(producerSourceEventListener, tunerChannel);
-        mPolyphaseChannelOutputProcessor = outputProcessor;
-        mPolyphaseChannelOutputProcessor.setListener(this);
-        mChannelSampleRate = channelSampleRate;
+        mChannelSampleRate = channelCalculator.getChannelSampleRate();
        mStreamHeartbeatProcessor = new StreamProcessorWithHeartbeat<>(getHeartbeatManager(), HEARTBEAT_INTERVAL_MS);
-        setFrequency(centerFrequency);
+        updateOutputProcessor(channelCalculator, filterManager);
+    }
+
+    /**
+     * Description of the state or configuration of the output processor.
+     */
+    public String getStateDescription()
+    {
+        return mPolyphaseChannelOutputProcessor.getStateDescription();
+    }
+
+    /**
+     * Current output processor indexes.
+     * @return indexes
+     */
+    public List<Integer> getOutputProcessorIndexes()
+    {
+        return mOutputProcessorIndexes;
+    }
+
+    /**
+     * Sample rate or bandwidth of the tuner providing input to the channelizer.
+     * @return sample rate
+     */
+    public double getTunerSampleRate()
+    {
+        return mTunerSampleRate;
+    }
+
+    /**
+     * Center tuned frequency of the tuner providing input to the channelizer.
+     * @return center frequency
+     */
+    public double getTunerCenterFrequency()
+    {
+        return mTunerCenterFrequency;
    }

    @Override
@@ -109,58 +150,107 @@ public class PolyphaseChannelSource extends TunerChannelSource implements Listen
    }

    /**
-     * Channel output processor used by this channel source to convert polyphase channel results into a specific
-     * channel complex buffer output stream.
+     * Updates the output processor whenever the source tuner's center frequency changes.
+     * @param channelCalculator providing access to updated tuner center frequency, sample rate, etc.
+     * @param filterManager for designing and caching synthesis filters
     */
-    public IPolyphaseChannelOutputProcessor getPolyphaseChannelOutputProcessor()
+    public void updateOutputProcessor(ChannelCalculator channelCalculator, SynthesisFilterManager filterManager) throws IllegalArgumentException
    {
-        return mPolyphaseChannelOutputProcessor;
-    }
+        String errorMessage = null;

-    /**
-     * Sets/updates the output processor for this channel source, replacing the existing output processor.
-     *
-     * @param outputProcessor to use
-     * @param frequency center for the channels processed by the output processor
-     */
-    public void setPolyphaseChannelOutputProcessor(IPolyphaseChannelOutputProcessor outputProcessor, long frequency)
-    {
-        //If this is the first time, simply assign the output processor
-        if(mPolyphaseChannelOutputProcessor == null)
+        mOutputProcessorLock.lock();
+
+        try
        {
-            mPolyphaseChannelOutputProcessor = outputProcessor;
-            mPolyphaseChannelOutputProcessor.setListener(this);
+            //If a change in sample rate or center frequency makes this channel no longer viable, then the channel
+            //calculator will throw an IllegalArgException ... handled below
+            List<Integer> indexes = channelCalculator.getChannelIndexes(getTunerChannel());
+
+            mOutputProcessorIndexes.clear();
+            mOutputProcessorIndexes.addAll(indexes);
+            mTunerCenterFrequency = channelCalculator.getCenterFrequency();
+            mTunerSampleRate = channelCalculator.getSampleRate();
+
+            //The provided channels are necessarily aligned to the center frequency that this source is providing and an
+            //oscillator will mix the provided channels to bring the desired center frequency to baseband.
+            setFrequency(channelCalculator.getCenterFrequencyForIndexes(indexes));
+
+            if(mPolyphaseChannelOutputProcessor != null && mPolyphaseChannelOutputProcessor.getInputChannelCount() == indexes.size())
+            {
+                mPolyphaseChannelOutputProcessor.setPolyphaseChannelIndices(indexes);
+
+                if(indexes.size() > 1)
+                {
+                    try
+                    {
+                        float[] filter = filterManager.getFilter(channelCalculator.getChannelSampleRate(),
+                                channelCalculator.getChannelBandwidth(), indexes.size());
+                        mPolyphaseChannelOutputProcessor.setSynthesisFilter(filter);
+                    }
+                    catch(FilterDesignException fde)
+                    {
+                        mLog.error("Error creating an updated synthesis filter for the channel output processor");
+                        errorMessage ="Cannot update output processor - unable to design synthesis filter for [" +
+                                indexes.size() + "] channel indices";
+                    }
+                }
+
+                mPolyphaseChannelOutputProcessor.setFrequencyOffset(getFrequencyOffset());
+            }
+            else //Create a new output processor.
+            {
+                if(mPolyphaseChannelOutputProcessor != null)
+                {
+                    mPolyphaseChannelOutputProcessor.setListener(null);
+                    mPolyphaseChannelOutputProcessor.stop();
+                }
+
+                mPolyphaseChannelOutputProcessor = null;
+
+                switch(indexes.size())
+                {
+                    case 1:
+                        mPolyphaseChannelOutputProcessor = new OneChannelOutputProcessor(channelCalculator.getChannelSampleRate(),
+                                indexes, channelCalculator.getChannelCount());
+                        mPolyphaseChannelOutputProcessor.setListener(this);
+                        mPolyphaseChannelOutputProcessor.setFrequencyOffset(getFrequencyOffset());
+                        mPolyphaseChannelOutputProcessor.start();
+                        break;
+                    case 2:
+                        try
+                        {
+                            float[] filter = filterManager.getFilter(channelCalculator.getChannelSampleRate(),
+                                    channelCalculator.getChannelBandwidth(), 2);
+                            mPolyphaseChannelOutputProcessor = new TwoChannelOutputProcessor(channelCalculator.getChannelSampleRate(),
+                                    indexes, filter, channelCalculator.getChannelCount());
+                            mPolyphaseChannelOutputProcessor.setListener(this);
+                            mPolyphaseChannelOutputProcessor.setFrequencyOffset(getFrequencyOffset());
+                            mPolyphaseChannelOutputProcessor.start();
+                        }
+                        catch(FilterDesignException fde)
+                        {
+                            errorMessage = "Cannot create new output processor - unable to design synthesis filter for [" +
+                                    indexes.size() + "] channel indices";
+                            mLog.error("Error creating a synthesis filter for a new channel output processor");
+                        }
+                        break;
+                    default:
+                        mLog.error("Request to create an output processor for unexpected channel index size:" + indexes.size());
+                        mLog.info(channelCalculator.toString());
+                        errorMessage = "Unable to create new channel output processor - unexpected channel index size: " +
+                                indexes.size();
+                }
+            }
        }
-        //Otherwise, we have to swap out the processor on the sample processing thread
-        else
+        finally
        {
-            mReplacementPolyphaseChannelOutputProcessor = outputProcessor;
-            mReplacementFrequency = frequency;
+            mOutputProcessorLock.unlock();
        }
-    }

-    /**
-     * Updates the output processor to use the new output processor provided by the external
-     * polyphase channel manager.  This method should only be executed on the sample processing
-     * thread, within the processChannelResults() method.
-     */
-    private void swapOutputProcessor()
-    {
-        if(mReplacementPolyphaseChannelOutputProcessor != null)
+        //Unlikely, but if we had an error designing a synthesis filter, throw an exception
+        if(errorMessage != null)
        {
-            IPolyphaseChannelOutputProcessor existingProcessor = mPolyphaseChannelOutputProcessor;
-            existingProcessor.stop();
-            existingProcessor.setListener(null);
-
-            //Swap out the processor so that incoming samples can accumulate in the new channel output processor
-            mPolyphaseChannelOutputProcessor = mReplacementPolyphaseChannelOutputProcessor;
-            mReplacementPolyphaseChannelOutputProcessor = null;
-            mPolyphaseChannelOutputProcessor.setListener(this);
-            mPolyphaseChannelOutputProcessor.start();
-
-            //Finally, setup the frequency offset for the output processor.
-            mIndexCenterFrequency = mReplacementFrequency;
-            mPolyphaseChannelOutputProcessor.setFrequencyOffset(getFrequencyOffset());
+            throw new IllegalArgumentException(errorMessage);
        }
    }

@@ -170,15 +260,23 @@ public class PolyphaseChannelSource extends TunerChannelSource implements Listen
     * channel aggregation, and dispatch the results to the downstream sample listener/consumer.
     *
     * @param channelResultsList containing a list of polyphase channelizer output arrays.
+     * @param currentSamplesTimestamp for the samples
     */
-    public void receiveChannelResults(List<float[]> channelResultsList)
+    public void receiveChannelResults(List<float[]> channelResultsList, long currentSamplesTimestamp)
    {
-        if(mReplacementPolyphaseChannelOutputProcessor != null)
-        {
-            swapOutputProcessor();
-        }
+        mOutputProcessorLock.lock();

-        mPolyphaseChannelOutputProcessor.receiveChannelResults(channelResultsList);
+        try
+        {
+            if(mPolyphaseChannelOutputProcessor != null)
+            {
+                mPolyphaseChannelOutputProcessor.receiveChannelResults(channelResultsList, currentSamplesTimestamp);
+            }
+        }
+        finally
+        {
+            mOutputProcessorLock.unlock();
+        }
    }

    /**
@@ -212,57 +310,32 @@ public class PolyphaseChannelSource extends TunerChannelSource implements Listen
        }
    }

-    @Override
-    public long getChannelFrequencyCorrection()
-    {
-        return mChannelFrequencyCorrection;
-    }
-
    /**
-     * Adjusts the frequency correction value that is being applied to the channelized output stream by the
-     * polyphase channel output processor.
-     *
-     * @param value to apply for frequency correction in hertz
-     */
-    protected void setChannelFrequencyCorrection(long value)
-    {
-//TODO: push this frequency correction down to the output processor ...
-        mChannelFrequencyCorrection = value;
-        updateFrequencyOffset();
-        broadcastConsumerSourceEvent(SourceEvent.frequencyCorrectionChange(mChannelFrequencyCorrection));
-    }
-
-    /**
-     * Sets the center frequency for this channel.frequency for the incoming sample stream channel results and resets frequency correction to zero.
+     * Sets the center frequency for this channel.
     * @param frequency in hertz
     */
    @Override
    public void setFrequency(long frequency)
    {
        mIndexCenterFrequency = frequency;
+    }

-        //Set frequency correction to zero to trigger an update to the mixer and allow downstream monitors to
-        //recalculate the frequency error correction again
-        setChannelFrequencyCorrection(0);
+    /**
+     * Center frequency from the incoming index channel(s).
+     * @return frequency in hertz
+     */
+    public long getIndexCenterFrequency()
+    {
+        return mIndexCenterFrequency;
    }

    /**
     * Calculates the frequency offset required to mix the incoming signal to center the desired frequency
     * within the channel
     */
-    private long getFrequencyOffset()
+    public long getFrequencyOffset()
    {
-        return mIndexCenterFrequency - getTunerChannel().getFrequency() + mChannelFrequencyCorrection;
-    }
-
-    /**
-     * Updates the frequency offset being applied by the output processor.  Calculates the offset using the center
-     * frequency of the incoming polyphase channel results and the desired output channel frequency adjusted by any
-     * requested frequency correction value.
-     */
-    private void updateFrequencyOffset()
-    {
-        mPolyphaseChannelOutputProcessor.setFrequencyOffset(getFrequencyOffset());
+        return mIndexCenterFrequency - getTunerChannel().getFrequency();
    }

    @Override
--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/SynthesisFilterManager.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/SynthesisFilterManager.java
@@ -0,0 +1,58 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.dsp.filter.channelizer;
+
+import io.github.dsheirer.dsp.filter.FilterFactory;
+import io.github.dsheirer.dsp.filter.design.FilterDesignException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Creates and caches channel output processor synthesis filters.
+ */
+public class SynthesisFilterManager
+{
+    private static final int POLYPHASE_SYNTHESIZER_TAPS_PER_CHANNEL = 9;
+    private static final String SEPARATOR = "-";
+    private Map<String,float[]> mFilterMap = new HashMap<>();
+
+    /**
+     * Design or retrieve a previously cached output processor synthesis filter.
+     * @param sampleRate of the tuner
+     * @param channelBandwidth per channel
+     * @param channelCount as the number of channels being synthesized/aggregated for the output processor (1 or 2)
+     * @return filter
+     * @throws FilterDesignException if the filter cannot be designed based on the supplied parameters.
+     */
+    public float[] getFilter(double sampleRate, double channelBandwidth, int channelCount) throws FilterDesignException
+    {
+        String key = sampleRate + SEPARATOR + channelBandwidth + SEPARATOR + channelCount;
+
+        if(mFilterMap.containsKey(key))
+        {
+            return mFilterMap.get(key);
+        }
+
+        float[] taps = FilterFactory.getSincM2Synthesizer(sampleRate, channelBandwidth, channelCount,
+                POLYPHASE_SYNTHESIZER_TAPS_PER_CHANNEL);
+        mFilterMap.put(key, taps);
+        return taps;
+    }
+}
--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/TwoChannelSynthesizerM2.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/TwoChannelSynthesizerM2.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 package io.github.dsheirer.dsp.filter.channelizer;

 import io.github.dsheirer.sample.complex.ComplexSamples;
+import java.util.Arrays;
 import org.apache.commons.math3.util.FastMath;
 import org.jtransforms.fft.FloatFFT_1D;
 import org.slf4j.Logger;
@@ -65,6 +66,20 @@ public class TwoChannelSynthesizerM2
        init(filter);
    }

+    /**
+     * Description of the state/configuration of this synthesizer to support debugging.
+     * @return state description.
+     */
+    public String getStateDescription()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Two-Channel Synthesizer");
+        sb.append("\n\t\t Interleaved Filter: " + Arrays.toString(mIQInterleavedFilter));
+        sb.append("\n\t\t Serpentine Buffer Length: ").append(mSerpentineDataBuffer.length);
+        sb.append("\n\t\t Filter Vector Product Length: ").append(mFilterVectorProduct.length);
+        return sb.toString();
+    }
+
    /**
     * Initializes the synthesizer filter and data buffers for operation.
     *
@@ -73,7 +88,6 @@ public class TwoChannelSynthesizerM2
    private void init(float[] filter)
    {
        int tapsPerChannel = (int) FastMath.ceil(filter.length / 2);
-
        mIQInterleavedFilter = getInterleavedFilter(filter, tapsPerChannel);
        mSerpentineDataBuffer = new float[mIQInterleavedFilter.length];
        mFilterVectorProduct = new float[mIQInterleavedFilter.length];
@@ -156,7 +170,7 @@ public class TwoChannelSynthesizerM2
            mTopBlockFlag = !mTopBlockFlag;
        }

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, channelBuffer1.timestamp());
    }

    /**
--- 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
@@ -21,11 +21,10 @@ package io.github.dsheirer.dsp.filter.channelizer.output;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.complex.ComplexSamples;
 import io.github.dsheirer.util.Dispatcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Collections;
 import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 public abstract class ChannelOutputProcessor implements IPolyphaseChannelOutputProcessor
 {
@@ -34,6 +33,7 @@ public abstract class ChannelOutputProcessor implements IPolyphaseChannelOutputP
    private Dispatcher<List<float[]>> mChannelResultsDispatcher;
    protected Listener<ComplexSamples> mComplexSamplesListener;
    private int mInputChannelCount;
+    private long mCurrentSampleTimestamp = System.currentTimeMillis();

    /**
     * Base class for polyphase channelizer output channel processing.  Provides built-in frequency translation
@@ -50,6 +50,15 @@ public abstract class ChannelOutputProcessor implements IPolyphaseChannelOutputP
        mChannelResultsDispatcher.setListener(floats -> process(floats));
    }

+    /**
+     * Timestamp for the current series of samples.
+     * @return time in milliseconds to use with assembled complex sample buffers.
+     */
+    protected long getCurrentSampleTimestamp()
+    {
+        return mCurrentSampleTimestamp;
+    }
+
    @Override
    public void start()
    {
@@ -82,9 +91,10 @@ public abstract class ChannelOutputProcessor implements IPolyphaseChannelOutputP
    }

    @Override
-    public void receiveChannelResults(List<float[]> channelResultsList)
+    public void receiveChannelResults(List<float[]> channelResultsList, long timestamp)
    {
        mChannelResultsDispatcher.receive(channelResultsList);
+        mCurrentSampleTimestamp = timestamp;
    }

    /**
--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/IPolyphaseChannelOutputProcessor.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/IPolyphaseChannelOutputProcessor.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,11 +20,15 @@ package io.github.dsheirer.dsp.filter.channelizer.output;

 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.complex.ComplexSamples;
-
 import java.util.List;

 public interface IPolyphaseChannelOutputProcessor
 {
+    /**
+     * Description of the state/configuration of this output processor
+     */
+    String getStateDescription();
+
    /**
     * Start processing channel results
     */
@@ -37,19 +41,15 @@ public interface IPolyphaseChannelOutputProcessor
    /**
     * Receive and enqueue output results from the polyphase analysis channelizer
     * @param channelResults to enqueue
+     * @param timestamp for the first channel results buffer
     */
-    void receiveChannelResults(List<float[]> channelResults);
+    void receiveChannelResults(List<float[]> channelResults, long timestamp);

    /**
     * Listener to receive assembled complex samples buffers
     */
    void setListener(Listener<ComplexSamples> listener);

-//    /**
-//     * Process the channel output channel results queue and deliver the output to the listener
-//     */
-//    void processChannelResults();
-
    /**
     * Sets the desired frequency offset from center.  The samples will be mixed with an oscillator set to this offset
     * frequency to produce an output where the desired signal is centered in the passband.
--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/MixerAssembler.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/MixerAssembler.java
@@ -65,7 +65,8 @@ public abstract class MixerAssembler

    /**
     * Access the fully assembled buffer when hasBuffer() indicates that a buffer is ready.
+     * @param timestamp to use for the assembled complex samples buffer
     * @return true if a full buffer is assembled and ready.
     */
-    public abstract ComplexSamples getBuffer();
+    public abstract ComplexSamples getBuffer(long timestamp);
 }
--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/OneChannelMixerAssembler.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/OneChannelMixerAssembler.java
@@ -61,9 +61,9 @@ public class OneChannelMixerAssembler extends MixerAssembler
     * @return assembled buffer.
     */
    @Override
-    public ComplexSamples getBuffer()
+    public ComplexSamples getBuffer(long timestamp)
    {
-        ComplexSamples buffer = mSampleAssembler.getBufferAndReset();
+        ComplexSamples buffer = mSampleAssembler.getBufferAndReset(timestamp);

        if(getMixer().hasFrequency())
        {
--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/OneChannelOutputProcessor.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/OneChannelOutputProcessor.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,11 +19,10 @@
 package io.github.dsheirer.dsp.filter.channelizer.output;

 import io.github.dsheirer.sample.complex.ComplexSamples;
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import java.util.List;
-
 public class OneChannelOutputProcessor extends ChannelOutputProcessor
 {
    private final static Logger mLog = LoggerFactory.getLogger(OneChannelOutputProcessor.class);
@@ -46,6 +45,16 @@ public class OneChannelOutputProcessor extends ChannelOutputProcessor
        mMixerAssembler.getMixer().setSampleRate(sampleRate);
    }

+    @Override
+    public String getStateDescription()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("One Channel Output Processor");
+        sb.append("\n\tIndex (doubled) [").append(mChannelOffset).append("]");
+        sb.append("\n\tMixer Assembler: none");
+        return sb.toString();
+    }
+
    @Override
    public void setSynthesisFilter(float[] filter)
    {
@@ -80,7 +89,7 @@ public class OneChannelOutputProcessor extends ChannelOutputProcessor
     * Extract the channel from the channel results array and pass to the assembler.  The assembler will
     * apply frequency translation and gain and indicate when a buffer is fully assembled.
     *
-     * @param lists to process containing a list of a list of channel array of I/Q sample pairs (I0,Q0,I1,Q1...In,Qn)
+     * @param channelResultsList to process containing a list of a list of channel array of I/Q sample pairs (I0,Q0,I1,Q1...In,Qn)
     */
    @Override
    public void process(List<float[]> channelResultsList)
@@ -91,7 +100,7 @@ public class OneChannelOutputProcessor extends ChannelOutputProcessor

            if(mMixerAssembler.hasBuffer())
            {
-                ComplexSamples buffer = mMixerAssembler.getBuffer();
+                ComplexSamples buffer = mMixerAssembler.getBuffer(getCurrentSampleTimestamp());

                if(mComplexSamplesListener != null)
                {
--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/SampleAssembler.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/SampleAssembler.java
@@ -76,9 +76,9 @@ public class SampleAssembler
    /**
     * Extracts the full buffer from this assembler and resets the assembler to accept more samples.
     */
-    public ComplexSamples getBufferAndReset()
+    public ComplexSamples getBufferAndReset(long timestamp)
    {
-        ComplexSamples buffer = new ComplexSamples(mI, mQ);
+        ComplexSamples buffer = new ComplexSamples(mI, mQ, timestamp);
        reset();
        return buffer;
    }
--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/TwoChannelMixerAssembler.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/TwoChannelMixerAssembler.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -42,6 +42,19 @@ public class TwoChannelMixerAssembler extends MixerAssembler
        super(gain);
    }

+    /**
+     * Description of the state/configuration of this mixer assembler.
+     */
+    public String getStateDescription()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Two Channel Mixer Assembler - State Description:");
+        sb.append("\n\tTwo-Channel Synthesizer: ").append(mTwoChannelSynthesizer.getStateDescription());
+        sb.append("\n\tMixer Frequency: ").append(getMixer().getFrequency());
+        sb.append("\n\tGain: ").append(getGain().getGain());
+        return sb.toString();
+    }
+
    /**
     * Sets the filter coefficients to use for two-channel synthesis
     * @param filter
@@ -76,13 +89,14 @@ public class TwoChannelMixerAssembler extends MixerAssembler

    /**
     * Access the assembled buffer.  Frequency offset and gain are applied to the returned buffer.
+     * @param timestamp to use for the assembled buffer
     * @return assembled buffer.
     */
    @Override
-    public ComplexSamples getBuffer()
+    public ComplexSamples getBuffer(long timestamp)
    {
-        ComplexSamples channel1 = mChannel1SampleAssembler.getBufferAndReset();
-        ComplexSamples channel2 = mChannel2SampleAssembler.getBufferAndReset();
+        ComplexSamples channel1 = mChannel1SampleAssembler.getBufferAndReset(timestamp);
+        ComplexSamples channel2 = mChannel2SampleAssembler.getBufferAndReset(timestamp);

        //Synthesize two channels into one, reducing sample rate by 2 so it's same as single channel rate
        ComplexSamples buffer = mTwoChannelSynthesizer.process(channel1, channel2);
--- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/TwoChannelOutputProcessor.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/output/TwoChannelOutputProcessor.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,11 +19,10 @@
 package io.github.dsheirer.dsp.filter.channelizer.output;

 import io.github.dsheirer.sample.complex.ComplexSamples;
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import java.util.List;
-
 public class TwoChannelOutputProcessor extends ChannelOutputProcessor
 {
    private final static Logger mLog = LoggerFactory.getLogger(TwoChannelOutputProcessor.class);
@@ -50,6 +49,16 @@ public class TwoChannelOutputProcessor extends ChannelOutputProcessor
        setSynthesisFilter(filter);
    }

+    @Override
+    public String getStateDescription()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Two Channel Output Processor");
+        sb.append("\n\tIndices (doubled) 1 [").append(mChannelOffset1).append("] 2 [").append(mChannelOffset2).append("]");
+        sb.append("\n\tMixer Assembler: ").append(mMixerAssembler.getStateDescription());
+        return sb.toString();
+    }
+
    /**
     * Sets the frequency offset to apply to the incoming samples to mix the desired signal to baseband.
     *
@@ -91,7 +100,7 @@ public class TwoChannelOutputProcessor extends ChannelOutputProcessor
     * Extract the channel from the channel results array, apply frequency translation, and deliver the
     * extracted frequency-corrected channel I/Q sample set to the complex sample listener.
     *
-     * @param lists to process containing a list of a list of an array of channel I/Q sample pairs (I0,Q0,I1,Q1...In,Qn)
+     * @param channelResultsList to process containing a list of a list of an array of channel I/Q sample pairs (I0,Q0,I1,Q1...In,Qn)
     */
    @Override
    public void process(List<float[]> channelResultsList)
@@ -103,7 +112,7 @@ public class TwoChannelOutputProcessor extends ChannelOutputProcessor

            if(mMixerAssembler.hasBuffer())
            {
-                ComplexSamples buffer = mMixerAssembler.getBuffer();
+                ComplexSamples buffer = mMixerAssembler.getBuffer(getCurrentSampleTimestamp());

                if(mComplexSamplesListener != null)
                {
--- a/src/main/java/io/github/dsheirer/dsp/filter/hilbert/HilbertTransform.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/hilbert/HilbertTransform.java
@@ -80,9 +80,10 @@ public abstract class HilbertTransform
    /**
     * Converts the real sample array to complex samples as half the sample rate
     * @param samples to convert
+     * @param timestamp of the first sample
     * @return converted samples
     */
-    public abstract ComplexSamples filter(float[] samples);
+    public abstract ComplexSamples filter(float[] samples, long timestamp);

    /**
     * Converts the half-band filter coefficients for use as hilbert transform filter coefficients.  Sets all
--- a/src/main/java/io/github/dsheirer/dsp/filter/hilbert/LegacyHilbertTransform.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/hilbert/LegacyHilbertTransform.java
@@ -1,248 +0,0 @@
-/*
- * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- * ****************************************************************************
- */
-package io.github.dsheirer.dsp.filter.hilbert;
-
-import org.apache.commons.math3.util.FastMath;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-
-public class LegacyHilbertTransform
-{
-    private static final Logger mLog = LoggerFactory.getLogger(LegacyHilbertTransform.class);
-
-    private float[] mHilbertFilter;
-    private float[] mBuffer;
-    private int mBufferSize;
-    private int mBufferPointer;
-    private int[][] mIndexMap;
-    private int mMapHeight;
-    private int mCenterTapIndex;
-    private float mCenterCoefficent;
-
-    private boolean mInvertFlag = false;
-
-    /**
-     * Hilbert transform filter used for converting real-valued samples into
-     * complex valued samples using frequency translation (FS/4) and a half-band
-     * filter.
-     *
-     * This filter uses a circular sample buffer and a pre-calculated
-     * index map to correctly map the filter coefficients to the circular delay
-     * buffer contents as each new sample is added to the buffer and processed.
-     *
-     * Half-band filter coefficients used in this filter must be of length N
-     * where (N + 1) is a multiple of 4.  This filter uses a pre-defined half
-     * band filter with 47 coefficients.
-     *
-     * This transform process is described in Understanding Digital Signal
-     * Processing, Lyons, 3e, 2011, sections 13.1.2 and 13.1.3 (p 674-678) and
-     * implemented as described in Section 13.37.1 and 13.37.2 (p 802-804)
-     */
-    public LegacyHilbertTransform()
-    {
-        convertHalfBandToHilbert(HilbertTransform.HALF_BAND_FILTER_47_TAP);
-
-        mBufferSize = mHilbertFilter.length + 1;
-        mBuffer = new float[mBufferSize];
-
-        mCenterCoefficent = mHilbertFilter[mHilbertFilter.length / 2];
-
-        generateIndexMap(mHilbertFilter.length);
-    }
-
-    /**
-     * Filters the continuous real-sample stream by treating the stream as a
-     * set of interleaved values and applying two hilbert filters against each
-     * interleaved set (I & Q).  Frequency translation has already been
-     * pre-applied to the hilbert filter coefficients.
-     *
-     * Filtering of the inphase component is a simple multiply by the center
-     * coefficient (0.5) since all of the other coefficients are zero-valued.
-     *
-     * Filtering of the quadrature component uses a folded FIR structure and
-     * expects the hilbert coefficients to be symmetric with all negative valued
-     * coefficients below the center coefficient and all positive-valued coefficients
-     * above the center coefficient. So, convolution only applies the filter
-     * coefficient against the difference of the two samples.
-     *
-     * ( coefficient * value1 ) + (-coefficient * value2 ) = coefficient * ( value1 - value2 )
-     *
-     * Performs frequency translation by FS/2 on the final filtered values by
-     * applying a sequence of 1,-1 (sign change) to each I/Q output sample.
-     */
-    public float[] filter(float[] samples)
-    {
-        float accumulator;
-
-        for(int y = 0; y < samples.length; y += 2)
-        {
-            insert(samples[y]);
-            insert(samples[y + 1]);
-
-            accumulator = 0.0f;
-
-            int index = mBufferPointer / 2;
-
-            for(int x = 0; x < mHilbertFilter.length / 2; x += 2)
-            {
-                accumulator += mHilbertFilter[x] *
-                    (mBuffer[mIndexMap[index][x + 1]] -
-                        mBuffer[mIndexMap[index][x]]);
-            }
-
-            //Perform FS/2 frequency translation on the final filtered values
-            if(mInvertFlag)
-            {
-                //inphase
-                samples[y] = -(mBuffer[mIndexMap[index][mCenterTapIndex]]);
-
-                //quadrature
-                samples[y + 1] = -accumulator;
-            }
-            else
-            {
-                //inphase
-                samples[y] = mBuffer[mIndexMap[index][mCenterTapIndex]];
-
-                //quadrature
-                samples[y + 1] = accumulator;
-            }
-
-            mInvertFlag = !mInvertFlag;
-        }
-
-        return samples;
-    }
-
-    /**
-     * Inserts the sample into the circular buffer, overwriting the oldest value
-     */
-    private void insert(float sample)
-    {
-        mBuffer[mBufferPointer++] = sample;
-
-        mBufferPointer = mBufferPointer % mBufferSize;
-    }
-
-    /**
-     * Creates an index map to support efficient lookup of sample indexes from
-     * the circular buffer.
-     *
-     * The first index of the map corresponds to the current buffer pointer
-     * setting.
-     *
-     * The second index is structured in sample pairs to align with
-     * the hilbert filter coefficients.  For example, the first iteration of
-     * the filter would use filter coefficient 0 and the index map values 0 and
-     * 1 would be pointing to samples 46 and 0.
-     *
-     * The final element of each index set is the index of the center sample.
-     */
-    private void generateIndexMap(int size)
-    {
-        mMapHeight = size / 2 + 1;
-        int mapWidth = mMapHeight + 1;
-
-        mIndexMap = new int[mMapHeight][mapWidth];
-
-        //Setup the first row with buffer pointer index 0 as a starting point
-        for(int x = 0; x < mapWidth - 1; x += 2)
-        {
-            mIndexMap[0][x] = size - 1 - x;
-            mIndexMap[0][x + 1] = x;
-        }
-
-        //Place the center index at the end of the array
-        mCenterTapIndex = mapWidth - 1;
-
-        mIndexMap[0][mCenterTapIndex] = size / 2;
-
-        //For each subsequent row, increment the previous row's value by 2,
-        //wrapping as needed, to keep the values between 0 and size - 1
-        for(int x = 1; x < mMapHeight; x++)
-        {
-            for(int y = 0; y < mapWidth; y++)
-            {
-                mIndexMap[x][y] = mIndexMap[x - 1][y] + 2;
-
-                if(mIndexMap[x][y] >= size)
-                {
-                    mIndexMap[x][y] -= size + 1;
-
-                    //Special handling for center tap wrap around
-                    if(y == mCenterTapIndex && mIndexMap[x][y] < 0)
-                    {
-                        mIndexMap[x][y] = size;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Logs the index map contents
-     */
-    public void logIndexMap()
-    {
-        for(int[] indexSet : mIndexMap)
-        {
-            mLog.debug("Row:" + Arrays.toString(indexSet));
-        }
-    }
-
-    /**
-     * Converts the half-band filter coefficients for use as hilbert transform
-     * filter coefficients.  Sets all even-numbered coefficients left of center
-     * to negative and all even-numbered coefficients right of center to positive
-     * which applies a FS/4 frequency translation to the coefficients.
-     *
-     * Note: even though the coefficients above the center coefficient are being
-     * defined, they are unused during the convolution process since we're using
-     * a folded FIR structure to exploit the symmetric nature of the half-band
-     * filter coefficients.  The polarity difference between the upper and lower
-     * halves is accounted for in the filter() method.
-     *
-     * Note: we apply a 2.0 gain to the coefficients to compensate for the loss
-     * of splitting the signal via two filters.
-     */
-    private void convertHalfBandToHilbert(float[] coefficients)
-    {
-        mHilbertFilter = new float[coefficients.length];
-
-        int middle = coefficients.length / 2;
-
-        for(int x = 0; x < coefficients.length; x++)
-        {
-            if(x < middle)
-            {
-                mHilbertFilter[x] = 2.0f * -FastMath.abs(coefficients[x]);
-            }
-            else if(x > middle)
-            {
-                mHilbertFilter[x] = 2.0f * FastMath.abs(coefficients[x]);
-            }
-            else
-            {
-                mHilbertFilter[x] = 2.0f * coefficients[x];
-            }
-        }
-    }
-}
--- a/src/main/java/io/github/dsheirer/dsp/filter/hilbert/ScalarHilbertTransform.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/hilbert/ScalarHilbertTransform.java
@@ -23,7 +23,6 @@ import io.github.dsheirer.dsp.oscillator.IRealOscillator;
 import io.github.dsheirer.dsp.oscillator.OscillatorFactory;
 import io.github.dsheirer.sample.SampleUtils;
 import io.github.dsheirer.sample.complex.ComplexSamples;
-
 import java.util.Arrays;

 /**
@@ -35,9 +34,10 @@ public class ScalarHilbertTransform extends HilbertTransform
    /**
     * Filters the real samples array into complex samples at half the sample rate.
     * @param realSamples to filter
+     * @param timestamp of the first sample
     * @return complex samples at half the sample rate
     */
-    public ComplexSamples filter(float[] realSamples)
+    public ComplexSamples filter(float[] realSamples, long timestamp)
    {
        int bufferLength = realSamples.length / 2;

@@ -52,7 +52,7 @@ public class ScalarHilbertTransform extends HilbertTransform
            mQBuffer = qTemp;
        }

-        ComplexSamples deinterleaved = SampleUtils.deinterleave(realSamples);
+        ComplexSamples deinterleaved = SampleUtils.deinterleave(realSamples, timestamp);
        System.arraycopy(deinterleaved.i(), 0, mIBuffer, mIOverlap, deinterleaved.i().length);
        System.arraycopy(deinterleaved.q(), 0, mQBuffer, mQOverlap, deinterleaved.q().length);

@@ -78,7 +78,7 @@ public class ScalarHilbertTransform extends HilbertTransform
        System.arraycopy(mIBuffer, mIBuffer.length - mIOverlap, mIBuffer, 0, mIOverlap);
        System.arraycopy(mQBuffer, mQBuffer.length - mQOverlap, mQBuffer, 0, mQOverlap);

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, timestamp);
    }

    public static void main(String[] args)
@@ -104,8 +104,8 @@ public class ScalarHilbertTransform extends HilbertTransform

        if(validate)
        {
-            ComplexSamples scalar = hilbertTransform.filter(realSamples);
-            ComplexSamples vector = vector512.filter(realSamples);
+            ComplexSamples scalar = hilbertTransform.filter(realSamples, 0l);
+            ComplexSamples vector = vector512.filter(realSamples, start);

            System.out.println("SI: " + Arrays.toString(scalar.i()));
            System.out.println("VI: " + Arrays.toString(vector.i()));
@@ -119,7 +119,7 @@ public class ScalarHilbertTransform extends HilbertTransform
            {
 //            ComplexSamples filtered = hilbertTransform.filter(realSamples);
 //            ComplexSamples filtered = vectorDefault.filter(realSamples);
-                ComplexSamples filtered = vector512.filter(realSamples);
+                ComplexSamples filtered = vector512.filter(realSamples, start);
 //            ComplexSamples filtered = vector256.filter(realSamples);
 //            ComplexSamples filtered = vector128.filter(realSamples);
 //            ComplexSamples filtered = vector64.filter(realSamples);
--- a/src/main/java/io/github/dsheirer/dsp/filter/hilbert/VectorHilbertTransform128Bits.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/hilbert/VectorHilbertTransform128Bits.java
@@ -37,9 +37,10 @@ public class VectorHilbertTransform128Bits extends HilbertTransform
    /**
     * Filters the real samples array into complex samples at half the sample rate.
     * @param realSamples to filter
+     * @param timestamp of the first sample
     * @return complex samples at half the sample rate
     */
-    public ComplexSamples filter(float[] realSamples)
+    public ComplexSamples filter(float[] realSamples, long timestamp)
    {
        int bufferLength = realSamples.length / 2;

@@ -54,7 +55,7 @@ public class VectorHilbertTransform128Bits extends HilbertTransform
            mQBuffer = qTemp;
        }

-        ComplexSamples deinterleaved = SampleUtils.deinterleave(realSamples);
+        ComplexSamples deinterleaved = SampleUtils.deinterleave(realSamples, timestamp);
        VectorUtilities.checkComplexArrayLength(deinterleaved.i(), deinterleaved.q(), VECTOR_SPECIES);

        System.arraycopy(deinterleaved.i(), 0, mIBuffer, mIOverlap, deinterleaved.i().length);
@@ -91,6 +92,6 @@ public class VectorHilbertTransform128Bits extends HilbertTransform
        System.arraycopy(mIBuffer, mIBuffer.length - mIOverlap, mIBuffer, 0, mIOverlap);
        System.arraycopy(mQBuffer, mQBuffer.length - mQOverlap, mQBuffer, 0, mQOverlap);

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/dsp/filter/hilbert/VectorHilbertTransform256Bits.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/hilbert/VectorHilbertTransform256Bits.java
@@ -37,9 +37,10 @@ public class VectorHilbertTransform256Bits extends HilbertTransform
    /**
     * Filters the real samples array into complex samples at half the sample rate.
     * @param realSamples to filter
+     * @param timestamp of the first sample
     * @return complex samples at half the sample rate
     */
-    public ComplexSamples filter(float[] realSamples)
+    public ComplexSamples filter(float[] realSamples, long timestamp)
    {
        int bufferLength = realSamples.length / 2;

@@ -54,7 +55,7 @@ public class VectorHilbertTransform256Bits extends HilbertTransform
            mQBuffer = qTemp;
        }

-        ComplexSamples deinterleaved = SampleUtils.deinterleave(realSamples);
+        ComplexSamples deinterleaved = SampleUtils.deinterleave(realSamples, timestamp);
        VectorUtilities.checkComplexArrayLength(deinterleaved.i(), deinterleaved.q(), VECTOR_SPECIES);

        System.arraycopy(deinterleaved.i(), 0, mIBuffer, mIOverlap, deinterleaved.i().length);
@@ -85,6 +86,6 @@ public class VectorHilbertTransform256Bits extends HilbertTransform
        System.arraycopy(mIBuffer, mIBuffer.length - mIOverlap, mIBuffer, 0, mIOverlap);
        System.arraycopy(mQBuffer, mQBuffer.length - mQOverlap, mQBuffer, 0, mQOverlap);

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/dsp/filter/hilbert/VectorHilbertTransform512Bits.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/hilbert/VectorHilbertTransform512Bits.java
@@ -22,12 +22,11 @@ package io.github.dsheirer.dsp.filter.hilbert;
 import io.github.dsheirer.sample.SampleUtils;
 import io.github.dsheirer.sample.complex.ComplexSamples;
 import io.github.dsheirer.vector.VectorUtilities;
+import java.util.Arrays;
 import jdk.incubator.vector.FloatVector;
 import jdk.incubator.vector.VectorOperators;
 import jdk.incubator.vector.VectorSpecies;

-import java.util.Arrays;
-
 /**
 * Implements a Hilbert transform using vector SIMD operations against a pre-defined 47-tap filter.
 * As described in Understanding Digital Signal Processing, Lyons, 3e, 2011, Section 13.37.2 (p 804-805)
@@ -53,9 +52,10 @@ public class VectorHilbertTransform512Bits extends HilbertTransform
    /**
     * Filters the real samples array into complex samples at half the sample rate.
     * @param realSamples to filter
+     * @param timestamp of the first sample
     * @return complex samples at half the sample rate
     */
-    public ComplexSamples filter(float[] realSamples)
+    public ComplexSamples filter(float[] realSamples, long timestamp)
    {
        int bufferLength = realSamples.length / 2;

@@ -70,7 +70,7 @@ public class VectorHilbertTransform512Bits extends HilbertTransform
            mQBuffer = qTemp;
        }

-        ComplexSamples deinterleaved = SampleUtils.deinterleave(realSamples);
+        ComplexSamples deinterleaved = SampleUtils.deinterleave(realSamples, timestamp);
        VectorUtilities.checkComplexArrayLength(deinterleaved.i(), deinterleaved.q(), VECTOR_SPECIES);

        System.arraycopy(deinterleaved.i(), 0, mIBuffer, mIOverlap, deinterleaved.i().length);
@@ -103,6 +103,6 @@ public class VectorHilbertTransform512Bits extends HilbertTransform
        System.arraycopy(mIBuffer, mIBuffer.length - mIOverlap, mIBuffer, 0, mIOverlap);
        System.arraycopy(mQBuffer, mQBuffer.length - mQOverlap, mQBuffer, 0, mQOverlap);

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/dsp/filter/hilbert/VectorHilbertTransform64Bits.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/hilbert/VectorHilbertTransform64Bits.java
@@ -37,9 +37,10 @@ public class VectorHilbertTransform64Bits extends HilbertTransform
    /**
     * Filters the real samples array into complex samples at half the sample rate.
     * @param realSamples to filter
+     * @param timestamp of the first sample
     * @return complex samples at half the sample rate
     */
-    public ComplexSamples filter(float[] realSamples)
+    public ComplexSamples filter(float[] realSamples, long timestamp)
    {
        int bufferLength = realSamples.length / 2;

@@ -54,7 +55,7 @@ public class VectorHilbertTransform64Bits extends HilbertTransform
            mQBuffer = qTemp;
        }

-        ComplexSamples deinterleaved = SampleUtils.deinterleave(realSamples);
+        ComplexSamples deinterleaved = SampleUtils.deinterleave(realSamples, timestamp);
        VectorUtilities.checkComplexArrayLength(deinterleaved.i(), deinterleaved.q(), VECTOR_SPECIES);

        System.arraycopy(deinterleaved.i(), 0, mIBuffer, mIOverlap, deinterleaved.i().length);
@@ -103,6 +104,6 @@ public class VectorHilbertTransform64Bits extends HilbertTransform
        System.arraycopy(mIBuffer, mIBuffer.length - mIOverlap, mIBuffer, 0, mIOverlap);
        System.arraycopy(mQBuffer, mQBuffer.length - mQOverlap, mQBuffer, 0, mQOverlap);

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/dsp/filter/hilbert/VectorHilbertTransformDefaultBits.java
+++ b/src/main/java/io/github/dsheirer/dsp/filter/hilbert/VectorHilbertTransformDefaultBits.java
@@ -37,9 +37,10 @@ public class VectorHilbertTransformDefaultBits extends HilbertTransform
    /**
     * Filters the real samples array into complex samples at half the sample rate.
     * @param realSamples to filter
+     * @param timestamp of the first sample
     * @return complex samples at half the sample rate
     */
-    public ComplexSamples filter(float[] realSamples)
+    public ComplexSamples filter(float[] realSamples, long timestamp)
    {
        int bufferLength = realSamples.length / 2;

@@ -54,7 +55,7 @@ public class VectorHilbertTransformDefaultBits extends HilbertTransform
            mQBuffer = qTemp;
        }

-        ComplexSamples deinterleaved = SampleUtils.deinterleave(realSamples);
+        ComplexSamples deinterleaved = SampleUtils.deinterleave(realSamples, timestamp);
        VectorUtilities.checkComplexArrayLength(deinterleaved.i(), deinterleaved.q(), VECTOR_SPECIES);

        System.arraycopy(deinterleaved.i(), 0, mIBuffer, mIOverlap, deinterleaved.i().length);
@@ -84,6 +85,6 @@ public class VectorHilbertTransformDefaultBits extends HilbertTransform
        System.arraycopy(mIBuffer, mIBuffer.length - mIOverlap, mIBuffer, 0, mIOverlap);
        System.arraycopy(mQBuffer, mQBuffer.length - mQOverlap, mQBuffer, 0, mQOverlap);

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/dsp/gain/complex/ComplexGain.java
+++ b/src/main/java/io/github/dsheirer/dsp/gain/complex/ComplexGain.java
@@ -1,3 +1,22 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
 package io.github.dsheirer.dsp.gain.complex;

 import io.github.dsheirer.sample.complex.ComplexSamples;
@@ -22,7 +41,7 @@ public abstract class ComplexGain
     * Gain value that will be applied to complex samples
     * @return gain value
     */
-    protected float getGain()
+    public float getGain()
    {
        return mGain;
    }
@@ -46,7 +65,7 @@ public abstract class ComplexGain
     */
    public ComplexSamples apply(ComplexSamples samples)
    {
-        return apply(samples.i(), samples.q());
+        return apply(samples.i(), samples.q(), samples.timestamp());
    }

    /**
@@ -56,7 +75,8 @@ public abstract class ComplexGain
     * original sample buffer.
     * @param i samples to amplify
     * @param q samples to amplify
+     * @param timestamp of the first sample
     * @return amplified samples
     */
-    public abstract ComplexSamples apply(float[] i, float q[]);
+    public abstract ComplexSamples apply(float[] i, float q[], long timestamp);
 }
--- a/src/main/java/io/github/dsheirer/dsp/gain/complex/ComplexGainControl.java
+++ b/src/main/java/io/github/dsheirer/dsp/gain/complex/ComplexGainControl.java
@@ -18,13 +18,9 @@
 */
 package io.github.dsheirer.dsp.gain.complex;

-import io.github.dsheirer.sample.SampleUtils;
 import io.github.dsheirer.sample.complex.Complex;
 import io.github.dsheirer.sample.complex.ComplexSamples;

-import java.text.DecimalFormat;
-import java.util.Arrays;
-
 public class ComplexGainControl implements IComplexGainControl
 {
    public static final float OBJECTIVE_ENVELOPE = 1.0f;
@@ -48,9 +44,10 @@ public class ComplexGainControl implements IComplexGainControl
     * gain for the single sample in the buffer that has the largest envelope.
     * @param i samples
     * @param q samples
+     * @param timestamp of the first sample
     * @return processed/amplified buffer
     */
-    @Override public ComplexSamples process(float[] i, float[] q)
+    @Override public ComplexSamples process(float[] i, float[] q, long timestamp)
    {
        float maxEnvelope = MINIMUM_ENVELOPE;

@@ -70,45 +67,6 @@ public class ComplexGainControl implements IComplexGainControl
            qProcessed[x] = q[x] * gain;
        }

-        return new ComplexSamples(iProcessed, qProcessed);
-    }
-
-    public static void main(String[] args)
-    {
-        int sampleSize = 2048;
-        ComplexSamples samples = SampleUtils.generateComplexRandomVectorLength(sampleSize);
-        ComplexGainControl scalar = new ComplexGainControl();
-        VectorComplexGainControl vector = new VectorComplexGainControl();
-
-        boolean validate = false;
-
-        if(validate)
-        {
-            ComplexSamples scalarSamples = scalar.process(samples.i(), samples.q());
-            ComplexSamples vectorSamples = vector.process(samples.i(), samples.q());
-
-            System.out.println("SCALAR I: " + Arrays.toString(scalarSamples.i()));
-            System.out.println("VECTOR I: " + Arrays.toString(vectorSamples.i()));
-            System.out.println("SCALAR Q: " + Arrays.toString(scalarSamples.q()));
-            System.out.println("VECTOR Q: " + Arrays.toString(vectorSamples.q()));
-        }
-        else
-        {
-            double accumulator = 0.0d;
-            int iterations = 10_000_000;
-            long start = System.currentTimeMillis();
-
-            for(int x = 0; x < iterations; x++)
-            {
-//                ComplexSamples processed = scalar.process(samples.i(), samples.q());
-                ComplexSamples processed = vector.process(samples.i(), samples.q());
-                accumulator += processed.i()[3];
-            }
-
-            double elapsed = System.currentTimeMillis() - start;
-            DecimalFormat df = new DecimalFormat("0.000");
-            System.out.println("Accumulator: " + accumulator);
-            System.out.println("Test Complete.  Elapsed Time: " + df.format(elapsed / 1000.0d) + " seconds");
-        }
+        return new ComplexSamples(iProcessed, qProcessed, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/dsp/gain/complex/IComplexGainControl.java
+++ b/src/main/java/io/github/dsheirer/dsp/gain/complex/IComplexGainControl.java
@@ -1,3 +1,22 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
 package io.github.dsheirer.dsp.gain.complex;

 import io.github.dsheirer.sample.complex.ComplexSamples;
@@ -13,5 +32,5 @@ public interface IComplexGainControl
     * @param q samples
     * @return amplified gain samples
     */
-    ComplexSamples process(float[] i, float[] q);
+    ComplexSamples process(float[] i, float[] q, long timestamp);
 }
--- a/src/main/java/io/github/dsheirer/dsp/gain/complex/ScalarComplexGain.java
+++ b/src/main/java/io/github/dsheirer/dsp/gain/complex/ScalarComplexGain.java
@@ -1,3 +1,22 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
 package io.github.dsheirer.dsp.gain.complex;

 import io.github.dsheirer.sample.complex.ComplexSamples;
@@ -22,7 +41,7 @@ public class ScalarComplexGain extends ComplexGain
     * @param q samples to amplify
     * @return amplified samples
     */
-    @Override public ComplexSamples apply(float[] i, float[] q)
+    @Override public ComplexSamples apply(float[] i, float[] q, long timestamp)
    {
        for(int x = 0; x < i.length; x++)
        {
@@ -30,6 +49,6 @@ public class ScalarComplexGain extends ComplexGain
            q[x] *= mGain;
        }

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/dsp/gain/complex/VectorComplexGain.java
+++ b/src/main/java/io/github/dsheirer/dsp/gain/complex/VectorComplexGain.java
@@ -1,3 +1,22 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
 package io.github.dsheirer.dsp.gain.complex;

 import io.github.dsheirer.sample.complex.ComplexSamples;
@@ -27,7 +46,7 @@ public class VectorComplexGain extends ComplexGain
     * @param q samples to amplify
     * @return amplified samples.
     */
-    @Override public ComplexSamples apply(float[] i, float[] q)
+    @Override public ComplexSamples apply(float[] i, float[] q, long timestamp)
    {
        VectorUtilities.checkComplexArrayLength(i, q, VECTOR_SPECIES);

@@ -37,6 +56,6 @@ public class VectorComplexGain extends ComplexGain
            FloatVector.fromArray(VECTOR_SPECIES, q, x).mul(mGain).intoArray(q, x);
        }

-        return new ComplexSamples(i, q);
+        return new ComplexSamples(i, q, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/dsp/gain/complex/VectorComplexGainControl.java
+++ b/src/main/java/io/github/dsheirer/dsp/gain/complex/VectorComplexGainControl.java
@@ -1,3 +1,22 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
 package io.github.dsheirer.dsp.gain.complex;

 import io.github.dsheirer.sample.complex.ComplexSamples;
@@ -18,7 +37,7 @@ public class VectorComplexGainControl implements IComplexGainControl
    private static final float MINIMUM_ENVELOPE = 0.0001f;
    private static final float ENVELOPE_ESTIMATE = 0.4f;

-    @Override public ComplexSamples process(float[] i, float[] q)
+    @Override public ComplexSamples process(float[] i, float[] q, long timestamp)
    {
        VectorUtilities.checkComplexArrayLength(i, q, VECTOR_SPECIES);

@@ -47,6 +66,6 @@ public class VectorComplexGainControl implements IComplexGainControl
            FloatVector.fromArray(VECTOR_SPECIES, q, bufferPointer).mul(gain).intoArray(qProcessed, bufferPointer);
        }

-        return new ComplexSamples(iProcessed, qProcessed);
+        return new ComplexSamples(iProcessed, qProcessed, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/dsp/mixer/ComplexMixer.java
+++ b/src/main/java/io/github/dsheirer/dsp/mixer/ComplexMixer.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -72,6 +72,15 @@ public abstract class ComplexMixer
        return mOscillator.hasFrequency();
    }

+    /**
+     * Current frequency of this oscillator
+     * @return frequency in hertz
+     */
+    public double getFrequency()
+    {
+        return mOscillator.getFrequency();
+    }
+
    /**
     * Sets the sample rate of the underlying oscillator
     * @param sampleRate in Hertz
@@ -84,11 +93,12 @@ public abstract class ComplexMixer
    /**
     * Generates complex samples from the underlying oscillator
     * @param sampleCount to generate
+     * @param timestamp of the first sample
     * @return complex samples
     */
-    protected ComplexSamples generate(int sampleCount)
+    protected ComplexSamples generate(int sampleCount, long timestamp)
    {
-        return mOscillator.generateComplexSamples(sampleCount);
+        return mOscillator.generateComplexSamples(sampleCount, timestamp);
    }

    /**
@@ -98,7 +108,7 @@ public abstract class ComplexMixer
     */
    public ComplexSamples mix(ComplexSamples samples)
    {
-        return mix(samples.i(), samples.q());
+        return mix(samples.i(), samples.q(), samples.timestamp());
    }

    /**
@@ -117,7 +127,5 @@ public abstract class ComplexMixer
     * @param q complex samples to mix
     * @return mixed samples
     */
-    public abstract ComplexSamples mix(float[] i, float[] q);
-
-
+    public abstract ComplexSamples mix(float[] i, float[] q, long timestamp);
 }
--- a/src/main/java/io/github/dsheirer/dsp/mixer/ScalarComplexMixer.java
+++ b/src/main/java/io/github/dsheirer/dsp/mixer/ScalarComplexMixer.java
@@ -52,11 +52,12 @@ public class ScalarComplexMixer extends ComplexMixer
     * Mixes the complex I & Q samples with samples generated from an oscillator.
     * @param iSamples complex samples to mix
     * @param qSamples complex samples to mix
+     * @param timestamp of the first sample
     * @return mixed samples
     */
-    @Override public ComplexSamples mix(float[] iSamples, float[] qSamples)
+    @Override public ComplexSamples mix(float[] iSamples, float[] qSamples, long timestamp)
    {
-        ComplexSamples mixer = generate(iSamples.length);
+        ComplexSamples mixer = generate(iSamples.length, timestamp);

        float[] iMixer = mixer.i();
        float[] qMixer = mixer.q();
@@ -82,7 +83,7 @@ public class ScalarComplexMixer extends ComplexMixer
    @Override
    public ComplexSamples mix(InterleavedComplexSamples samples)
    {
-        ComplexSamples mixer = generate(samples.samples().length / 2);
+        ComplexSamples mixer = generate(samples.samples().length / 2, samples.timestamp());

        float[] iMixer = mixer.i();
        float[] qMixer = mixer.q();
--- a/src/main/java/io/github/dsheirer/dsp/mixer/VectorComplexMixer.java
+++ b/src/main/java/io/github/dsheirer/dsp/mixer/VectorComplexMixer.java
@@ -1,3 +1,22 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2022 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
 package io.github.dsheirer.dsp.mixer;

 import io.github.dsheirer.sample.complex.ComplexSamples;
@@ -26,14 +45,15 @@ public class VectorComplexMixer extends ComplexMixer
     * Mixes the complex I & Q samples with samples generated from an oscillator.
     * @param iSamples complex samples to mix
     * @param qSamples complex samples to mix
+     * @param timestamp for the first sample
     * @return mixed samples
     */
-    @Override public ComplexSamples mix(float[] iSamples, float[] qSamples)
+    @Override public ComplexSamples mix(float[] iSamples, float[] qSamples, long timestamp)
    {
        VectorUtilities.checkComplexArrayLength(iSamples, qSamples, VECTOR_SPECIES);

        //Reuse this complex samples buffer to store the results and return to caller
-        ComplexSamples mixer = generate(iSamples.length);
+        ComplexSamples mixer = generate(iSamples.length, timestamp);

        float[] iMixer = mixer.i();
        float[] qMixer = mixer.q();
--- a/src/main/java/io/github/dsheirer/dsp/oscillator/AWGNOscillator.java
+++ b/src/main/java/io/github/dsheirer/dsp/oscillator/AWGNOscillator.java
@@ -0,0 +1,117 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.dsp.oscillator;
+
+import io.github.dsheirer.sample.complex.ComplexSamples;
+import java.util.Random;
+
+/**
+ * Additive white gaussian noise wrapper around a complex oscillator that mixes in gaussian noise to the complex
+ * samples generated by the underlying complex oscillator.
+ */
+public class AWGNOscillator implements IComplexOscillator
+{
+    private final Random mRandom = new Random();
+    private IComplexOscillator mComplexOscillator;
+    private float mNoiseScale;
+
+    /**
+     * Constructs an instance
+     * @param complexOscillator to generate samples
+     * @param noiseScale to apply to generated samples to reduce the power of the noise and increase the SNR.
+     */
+    public AWGNOscillator(IComplexOscillator complexOscillator, float noiseScale)
+    {
+        mComplexOscillator = complexOscillator;
+        mNoiseScale = noiseScale;
+    }
+
+    /**
+     * Produce the next scaled noise sample.
+     * @return next scaled noise sample.
+     */
+    private float nextNoise()
+    {
+        return (float)mRandom.nextGaussian() * mNoiseScale;
+    }
+
+    @Override
+    public float[] generate(int sampleCount)
+    {
+        float[] generated = mComplexOscillator.generate(sampleCount);
+
+        for(int x = 0; x < generated.length; x++)
+        {
+            generated[x] += nextNoise();
+        }
+
+        return generated;
+    }
+
+    @Override
+    public ComplexSamples generateComplexSamples(int sampleCount, long timestamp)
+    {
+        ComplexSamples samples = mComplexOscillator.generateComplexSamples(sampleCount, timestamp);
+
+        for(int x = 0; x < samples.i().length; x++)
+        {
+            samples.i()[x] += nextNoise();
+            samples.q()[x] += nextNoise();
+        }
+
+        return samples;
+    }
+
+    @Override
+    public double getFrequency()
+    {
+        return mComplexOscillator.getFrequency();
+    }
+
+    @Override
+    public void setFrequency(double frequency)
+    {
+        mComplexOscillator.setFrequency(frequency);
+    }
+
+    @Override
+    public boolean hasFrequency()
+    {
+        return mComplexOscillator.hasFrequency();
+    }
+
+    @Override
+    public double getSampleRate()
+    {
+        return mComplexOscillator.getSampleRate();
+    }
+
+    @Override
+    public void setSampleRate(double sampleRate)
+    {
+        mComplexOscillator.setSampleRate(sampleRate);
+    }
+
+    @Override
+    public boolean isEnabled()
+    {
+        return mComplexOscillator.isEnabled();
+    }
+}
--- a/src/main/java/io/github/dsheirer/dsp/oscillator/IComplexOscillator.java
+++ b/src/main/java/io/github/dsheirer/dsp/oscillator/IComplexOscillator.java
@@ -33,7 +33,8 @@ public interface IComplexOscillator extends IOscillator
    /**
     * Generates the specified number of complex samples into a complex samples object.
     * @param sampleCount number of complex samples to generate.
+     * @param timestamp for the first sample
     * @return generated samples
     */
-    ComplexSamples generateComplexSamples(int sampleCount);
+    ComplexSamples generateComplexSamples(int sampleCount, long timestamp);
 }
--- a/src/main/java/io/github/dsheirer/dsp/oscillator/ScalarComplexOscillator.java
+++ b/src/main/java/io/github/dsheirer/dsp/oscillator/ScalarComplexOscillator.java
@@ -96,7 +96,7 @@ public class ScalarComplexOscillator extends AbstractOscillator implements IComp
    }

    @Override
-    public ComplexSamples generateComplexSamples(int sampleCount)
+    public ComplexSamples generateComplexSamples(int sampleCount, long timestamp)
    {
        float[] iSamples = new float[sampleCount];
        float[] qSamples = new float[sampleCount];
@@ -133,6 +133,6 @@ public class ScalarComplexOscillator extends AbstractOscillator implements IComp
        mPreviousInphase = previousInphase;
        mPreviousQuadrature = previousQuadrature;

-        return new ComplexSamples(iSamples, qSamples);
+        return new ComplexSamples(iSamples, qSamples, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/dsp/oscillator/VectorComplexOscillator.java
+++ b/src/main/java/io/github/dsheirer/dsp/oscillator/VectorComplexOscillator.java
@@ -21,14 +21,13 @@ package io.github.dsheirer.dsp.oscillator;

 import io.github.dsheirer.sample.complex.ComplexSamples;
 import io.github.dsheirer.vector.VectorUtilities;
+import java.util.Arrays;
 import jdk.incubator.vector.FloatVector;
 import jdk.incubator.vector.VectorSpecies;
 import org.apache.commons.math3.util.FastMath;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import java.util.Arrays;
-
 /**
 * Complex oscillator that uses JDK17 SIMD vector operations to generate complex sample arrays.
 *
@@ -145,9 +144,10 @@ public class VectorComplexOscillator extends AbstractOscillator implements IComp
    /**
     * Generates complex samples.
     * @param sampleCount number of samples to generate and length of the resulting float array.
+     * @param timestamp of the first sample
     * @return generated samples
     */
-    @Override public ComplexSamples generateComplexSamples(int sampleCount)
+    @Override public ComplexSamples generateComplexSamples(int sampleCount, long timestamp)
    {
        if(sampleCount % VECTOR_SPECIES.length() != 0)
        {
@@ -184,6 +184,6 @@ public class VectorComplexOscillator extends AbstractOscillator implements IComp
        previousInphase.intoArray(mPreviousInphases, 0);
        previousQuadrature.intoArray(mPreviousQuadratures, 0);

-        return new ComplexSamples(iSamples, qSamples);
+        return new ComplexSamples(iSamples, qSamples, timestamp);
    }
 }
--- a/src/main/java/io/github/dsheirer/dsp/psk/pll/FrequencyCorrectionSyncMonitor.java
+++ b/src/main/java/io/github/dsheirer/dsp/psk/pll/FrequencyCorrectionSyncMonitor.java
@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
- *  * ******************************************************************************
- *  * Copyright (C) 2014-2020 Dennis Sheirer
- *  *
- *  * This program is free software: you can redistribute it and/or modify
- *  * it under the terms of the GNU General Public License as published by
- *  * the Free Software Foundation, either version 3 of the License, or
- *  * (at your option) any later version.
- *  *
- *  * This program is distributed in the hope that it will be useful,
- *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  * GNU General Public License for more details.
- *  *
- *  * You should have received a copy of the GNU General Public License
- *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *  * *****************************************************************************
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
 *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
 *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
 */
 package io.github.dsheirer.dsp.psk.pll;

@@ -101,7 +98,9 @@ public class FrequencyCorrectionSyncMonitor implements ISyncDetectListener, IFre
    @Override
    public void processFrequencyError(long frequencyError)
    {
-        //Only rebroadcast the frequency error if the sync count is more than 2
+        mFeedbackDecoder.broadcast(SourceEvent.pllFrequencyMeasurement(frequencyError));
+
+        //Only rebroadcast as a frequency error measurement if the sync count is more than 2
        if(mSyncCount > 2)
        {
            mFeedbackDecoder.broadcast(SourceEvent.frequencyErrorMeasurement(frequencyError));
--- a/src/main/java/io/github/dsheirer/dsp/symbol/BinaryToByteBufferAssembler.java
+++ b/src/main/java/io/github/dsheirer/dsp/symbol/BinaryToByteBufferAssembler.java
@@ -21,11 +21,10 @@ package io.github.dsheirer.dsp.symbol;
 import io.github.dsheirer.bits.IBinarySymbolProcessor;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.buffer.IByteBufferProvider;
+import java.nio.ByteBuffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import java.nio.ByteBuffer;
-
 /**
 * Assembles reusable byte buffers from an incoming stream of boolean values.
 */
@@ -58,6 +57,7 @@ public class BinaryToByteBufferAssembler implements IBinarySymbolProcessor, IByt
    {
        if(mCurrentBuffer != null && mBufferListener != null)
        {
+            mCurrentBuffer.flip();
            mBufferListener.receive(mCurrentBuffer);
        }

--- a/src/main/java/io/github/dsheirer/dsp/symbol/DibitToByteBufferAssembler.java
+++ b/src/main/java/io/github/dsheirer/dsp/symbol/DibitToByteBufferAssembler.java
@@ -20,11 +20,10 @@ package io.github.dsheirer.dsp.symbol;

 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.buffer.IByteBufferProvider;
+import java.nio.ByteBuffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import java.nio.ByteBuffer;
-
 /**
 * Assembles reusable byte buffers from an incoming stream of Dibits.
 */
@@ -57,6 +56,7 @@ public class DibitToByteBufferAssembler implements Listener<Dibit>, IByteBufferP
    {
        if(mCurrentBuffer != null && mBufferListener != null)
        {
+            mCurrentBuffer.flip();
            mBufferListener.receive(mCurrentBuffer);
        }

--- a/src/main/java/io/github/dsheirer/edac/BerlekempMassey.java
+++ b/src/main/java/io/github/dsheirer/edac/BerlekempMassey.java
@@ -1,23 +1,20 @@
 /*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
- *  * ******************************************************************************
- *  * Copyright (C) 2014-2019 Dennis Sheirer
- *  *
- *  * This program is free software: you can redistribute it and/or modify
- *  * it under the terms of the GNU General Public License as published by
- *  * the Free Software Foundation, either version 3 of the License, or
- *  * (at your option) any later version.
- *  *
- *  * This program is distributed in the hope that it will be useful,
- *  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  * GNU General Public License for more details.
- *  *
- *  * You should have received a copy of the GNU General Public License
- *  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *  * *****************************************************************************
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
 *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
 *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
 */

 package io.github.dsheirer.edac;
@@ -34,7 +31,7 @@ import org.slf4j.LoggerFactory;
 */
 public class BerlekempMassey
 {
-    public final static Logger mLog = LoggerFactory.getLogger(BerlekempMassey.class);
+    private final static Logger mLog = LoggerFactory.getLogger(BerlekempMassey.class);

    /* Golay field size GF( 2 ** MM ) */
    private int MM;
--- a/src/main/java/io/github/dsheirer/edac/Checksum_5_DMR.java
+++ b/src/main/java/io/github/dsheirer/edac/Checksum_5_DMR.java
@@ -0,0 +1,66 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.edac;
+
+import io.github.dsheirer.bits.CorrectedBinaryMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Implements the 5-bit Checksum error detection algorithm specified in TS 102 361-1 paragraph B.3.11
+ */
+public class Checksum_5_DMR
+{
+    private static final Logger LOGGER = LoggerFactory.getLogger(Checksum_5_DMR.class);
+
+    private static final int[] LC_0 = {0, 1, 2, 3, 4, 5, 6, 7};
+    private static final int[] LC_1 = {8, 9, 10, 11, 12, 13, 14, 15};
+    private static final int[] LC_2 = {16, 17, 18, 19, 20, 21, 22, 23};
+    private static final int[] LC_3 = {24, 25, 26, 27, 28, 29, 30, 31};
+    private static final int[] LC_4 = {32, 33, 34, 35, 36, 37, 38, 39};
+    private static final int[] LC_5 = {40, 41, 42, 43, 44, 45, 46, 47};
+    private static final int[] LC_6 = {48, 49, 50, 51, 52, 53, 54, 55};
+    private static final int[] LC_7 = {56, 57, 58, 59, 60, 61, 62, 63};
+    private static final int[] LC_8 = {64, 65, 66, 67, 68, 69, 70, 71};
+    private static final int[] CHECKSUM = {72, 73, 74, 75, 76};
+
+    /**
+     * Indicates if the 77-bit Full Link Control message is valid.
+     * @param message to check
+     * @return true if the checksum matches.
+     */
+    public static boolean isValid(CorrectedBinaryMessage message)
+    {
+        int accumulator = message.getInt(LC_0);
+        accumulator += message.getInt(LC_1);
+        accumulator += message.getInt(LC_2);
+        accumulator += message.getInt(LC_3);
+        accumulator += message.getInt(LC_4);
+        accumulator += message.getInt(LC_5);
+        accumulator += message.getInt(LC_6);
+        accumulator += message.getInt(LC_7);
+        accumulator += message.getInt(LC_8);
+
+        accumulator = accumulator % 31;
+        int checksum = message.getInt(CHECKSUM);
+
+        return accumulator == checksum;
+    }
+}
--- a/src/main/java/io/github/dsheirer/edac/ReedSolomon_12_9_4_DMR.java
+++ b/src/main/java/io/github/dsheirer/edac/ReedSolomon_12_9_4_DMR.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- *  Copyright (C) 2014-2020 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,12 +20,16 @@
 package io.github.dsheirer.edac;

 import io.github.dsheirer.bits.CorrectedBinaryMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 /**
 * Berlecamp-Massey decoder for Reed Solomon RS(12,9,4) protected messages using DMR generator polynomial
 */
 public class ReedSolomon_12_9_4_DMR extends ReedSolomon_255_DMR
 {
+    private final static Logger mLog = LoggerFactory.getLogger(ReedSolomon_12_9_4_DMR.class);
+
    private static final int[] FLC_CODEWORD_0 = {0, 1, 2, 3, 4, 5, 6, 7};
    private static final int[] FLC_CODEWORD_1 = {8, 9, 10, 11, 12, 13, 14, 15};
    private static final int[] FLC_CODEWORD_2 = {16, 17, 18, 19, 20, 21, 22, 23};
@@ -56,16 +60,16 @@ public class ReedSolomon_12_9_4_DMR extends ReedSolomon_255_DMR
     *
     * @param message to be corrected.
     * @param crcMask as defined in the TS 102-361-1 Table B.21
-     * @return true if the message was corrected.
+     * @return true if the message is correct or if the message was corrected.
     */
    public boolean correctFullLinkControl(CorrectedBinaryMessage message, int crcMask)
    {
        int[] input = new int[255];
        int[] output = new int[255];

-        input[0] = message.getInt(FLC_PARITY_2) ^ crcMask;
-        input[1] = message.getInt(FLC_PARITY_1) ^ crcMask;
-        input[2] = message.getInt(FLC_PARITY_0) ^ crcMask;
+        input[0] = (message.getInt(FLC_PARITY_2) ^ crcMask);
+        input[1] = (message.getInt(FLC_PARITY_1) ^ crcMask);
+        input[2] = (message.getInt(FLC_PARITY_0) ^ crcMask);
        input[3] = message.getInt(FLC_CODEWORD_8);
        input[4] = message.getInt(FLC_CODEWORD_7);
        input[5] = message.getInt(FLC_CODEWORD_6);
@@ -106,4 +110,40 @@ public class ReedSolomon_12_9_4_DMR extends ReedSolomon_255_DMR

        return true;
    }
+
+    public static void main(String[] args)
+    {
+        int[] output = new int[255];
+        int[] input = new int[255];
+        input[0] = 247;
+        input[1] = 236;
+        input[2] = 171;
+        input[3] = 24;
+        input[4] = 46;
+        input[5] = 177;
+        input[6] = 246;
+        input[7] = 205;
+        input[8] = 232;
+        input[9] = 32;
+        input[10] = 124;
+        input[11] = 0;
+
+//        input[254] = 247;
+//        input[253] = 236;
+//        input[252] = 171;
+//        input[251] = 24;
+//        input[250] = 46;
+//        input[249] = 177;
+//        input[248] = 246;
+//        input[247] = 205;
+//        input[246] = 232;
+//        input[245] = 32;
+//        input[244] = 124;
+//        input[243] = 0;
+
+        ReedSolomon_12_9_4_DMR rs = new ReedSolomon_12_9_4_DMR();
+        boolean irrecoverable = rs.decode(input, output);
+
+        mLog.info("Irrecoverable: " + irrecoverable);
+    }
 }
--- a/src/main/java/io/github/dsheirer/gui/JavaFxWindowManager.java
+++ b/src/main/java/io/github/dsheirer/gui/JavaFxWindowManager.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,8 @@ import io.github.dsheirer.alias.AliasModel;
 import io.github.dsheirer.controller.channel.map.ChannelMap;
 import io.github.dsheirer.controller.channel.map.ChannelRange;
 import io.github.dsheirer.eventbus.MyEventBus;
+import io.github.dsheirer.gui.dmr.DMRRecordingViewer;
+import io.github.dsheirer.gui.dmr.ViewDmrRecordingViewerRequest;
 import io.github.dsheirer.gui.icon.IconManager;
 import io.github.dsheirer.gui.icon.ViewIconManagerRequest;
 import io.github.dsheirer.gui.playlist.PlaylistEditor;
@@ -65,6 +67,7 @@ public class JavaFxWindowManager extends Application
    public static final String USER_PREFERENCES_EDITOR = "preferences";
    public static final String STAGE_MONITOR_KEY_CALIBRATION_DIALOG = "calibration.dialog";
    public static final String STAGE_MONITOR_KEY_CHANNEL_MAP_EDITOR = "channel.map";
+    public static final String STAGE_MONITOR_KEY_DMR_MESSAGE_VIEWER = "dmr.message.viewer";
    public static final String STAGE_MONITOR_KEY_ICON_MANAGER_EDITOR = "icon.manager";
    public static final String STAGE_MONITOR_KEY_JMBE_EDITOR = "jmbe.editor";
    public static final String STAGE_MONITOR_KEY_PLAYLIST_EDITOR = "playlist";
@@ -79,12 +82,14 @@ public class JavaFxWindowManager extends Application
    private TunerManager mTunerManager;
    private UserPreferences mUserPreferences;
    private UserPreferencesEditor mUserPreferencesEditor;
+    private DMRRecordingViewer mDmrRecordingViewer;

    private Stage mChannelMapStage;
    private Stage mIconManagerStage;
    private Stage mJmbeEditorStage;
    private Stage mPlaylistStage;
    private Stage mUserPreferencesStage;
+    private Stage mDmrRecordingViewerStage;

    /**
     * Constructs an instance.  Note: this constructor is used for Swing applications.
@@ -189,6 +194,34 @@ public class JavaFxWindowManager extends Application
        return new CalibrationDialog(userPreferences);
    }

+    /**
+     * Stage for the DMR Message Viewer
+     */
+    public Stage getDmrRecordingViewerStage()
+    {
+        if(mDmrRecordingViewerStage == null)
+        {
+            createJFXPanel();
+            Scene scene = new Scene(getDmrRecordingViewer(), 1100, 800);
+            mDmrRecordingViewerStage = new Stage();
+            mDmrRecordingViewerStage.setTitle("sdrtrunk - DMR Recording Viewer");
+            mDmrRecordingViewerStage.setScene(scene);
+            mUserPreferences.getJavaFxPreferences().monitor(mDmrRecordingViewerStage, STAGE_MONITOR_KEY_DMR_MESSAGE_VIEWER);
+        }
+
+        return mDmrRecordingViewerStage;
+    }
+
+    public DMRRecordingViewer getDmrRecordingViewer()
+    {
+        if(mDmrRecordingViewer == null)
+        {
+            mDmrRecordingViewer = new DMRRecordingViewer();
+        }
+
+        return mDmrRecordingViewer;
+    }
+
    public Stage getIconManagerStage()
    {
        if(mIconManagerStage == null)
@@ -416,6 +449,19 @@ public class JavaFxWindowManager extends Application
        });
    }

+    /**
+     * Process a channel map editor request
+     */
+    @Subscribe
+    public void process(final ViewDmrRecordingViewerRequest request)
+    {
+        execute(() -> {
+            getDmrRecordingViewerStage().show();
+            getDmrRecordingViewerStage().requestFocus();
+            getDmrRecordingViewerStage().toFront();
+        });
+    }
+
    @Override
    public void start(Stage primaryStage) throws Exception
    {
--- a/src/main/java/io/github/dsheirer/gui/SDRTrunk.java
+++ b/src/main/java/io/github/dsheirer/gui/SDRTrunk.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@ import io.github.dsheirer.controller.channel.ChannelAutoStartFrame;
 import io.github.dsheirer.controller.channel.ChannelException;
 import io.github.dsheirer.controller.channel.ChannelSelectionManager;
 import io.github.dsheirer.eventbus.MyEventBus;
+import io.github.dsheirer.gui.dmr.ViewDmrRecordingViewerRequest;
 import io.github.dsheirer.gui.icon.ViewIconManagerRequest;
 import io.github.dsheirer.gui.playlist.ViewPlaylistRequest;
 import io.github.dsheirer.gui.preference.CalibrateRequest;
@@ -59,6 +60,26 @@ import io.github.dsheirer.spectrum.SpectralDisplayPanel;
 import io.github.dsheirer.util.ThreadPool;
 import io.github.dsheirer.util.TimeStamp;
 import io.github.dsheirer.vector.calibrate.CalibrationManager;
+import java.awt.AWTException;
+import java.awt.Desktop;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.GraphicsEnvironment;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
 import javafx.application.Platform;
 import javafx.scene.control.ButtonType;
 import jiconfont.icons.font_awesome.FontAwesome;
@@ -80,26 +101,6 @@ import javax.swing.UIManager;
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
 import javax.swing.plaf.metal.MetalLookAndFeel;
-import java.awt.AWTException;
-import java.awt.Desktop;
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.awt.GraphicsEnvironment;
-import java.awt.Point;
-import java.awt.Robot;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;

 public class SDRTrunk implements Listener<TunerEvent>
 {
@@ -413,9 +414,11 @@ public class SDRTrunk implements Listener<TunerEvent>
        viewPlaylistItem.addActionListener(e -> MyEventBus.getGlobalEventBus().post(new ViewPlaylistRequest()));
        viewMenu.add(viewPlaylistItem);

-        JMenuItem preferencesItem = new JMenuItem("User Preferences");
-        preferencesItem.addActionListener(e -> MyEventBus.getGlobalEventBus().post(new ViewUserPreferenceEditorRequest()));
-        viewMenu.add(preferencesItem);
+        viewMenu.add(new JSeparator());
+
+        JMenuItem dmrMessageViewerMenu = new JMenuItem("DMR Recording Viewer");
+        dmrMessageViewerMenu.addActionListener(e -> MyEventBus.getGlobalEventBus().post(new ViewDmrRecordingViewerRequest()));
+        viewMenu.add(dmrMessageViewerMenu);

        JMenuItem settingsMenu = new JMenuItem("Icon Manager");
        settingsMenu.addActionListener(arg0 -> MyEventBus.getGlobalEventBus().post(new ViewIconManagerRequest()));
@@ -436,15 +439,19 @@ public class SDRTrunk implements Listener<TunerEvent>
                    mLog.error("Couldn't open file explorer");

                    JOptionPane.showMessageDialog(mMainGui,
-                        "Can't launch file explorer - files are located at: " +
-                            getHomePath().toString(),
-                        "Can't launch file explorer",
-                        JOptionPane.ERROR_MESSAGE);
+                            "Can't launch file explorer - files are located at: " +
+                                    getHomePath().toString(),
+                            "Can't launch file explorer",
+                            JOptionPane.ERROR_MESSAGE);
                }
            }
        });
        viewMenu.add(logFilesMenu);

+        JMenuItem preferencesItem = new JMenuItem("User Preferences");
+        preferencesItem.addActionListener(e -> MyEventBus.getGlobalEventBus().post(new ViewUserPreferenceEditorRequest()));
+        viewMenu.add(preferencesItem);
+
        viewMenu.add(new JSeparator());
        viewMenu.add(new TunersMenu());
        viewMenu.add(new JSeparator());
--- a/src/main/java/io/github/dsheirer/gui/channelizer/ChannelizerViewer2.java
+++ b/src/main/java/io/github/dsheirer/gui/channelizer/ChannelizerViewer2.java
@@ -1,6 +1,6 @@
 /*
 * *****************************************************************************
- * Copyright (C) 2014-2022 Dennis Sheirer
+ * Copyright (C) 2014-2023 Dennis Sheirer
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@ package io.github.dsheirer.gui.channelizer;

 import io.github.dsheirer.buffer.FloatNativeBuffer;
 import io.github.dsheirer.buffer.INativeBuffer;
+import io.github.dsheirer.dsp.filter.channelizer.PolyphaseChannelSource;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.complex.ComplexSamples;
 import io.github.dsheirer.settings.SettingsManager;
@@ -36,6 +37,12 @@ import io.github.dsheirer.spectrum.ComplexDftProcessor;
 import io.github.dsheirer.spectrum.DFTSize;
 import io.github.dsheirer.spectrum.SpectrumPanel;
 import io.github.dsheirer.spectrum.converter.ComplexDecibelConverter;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
 import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,12 +57,6 @@ import javax.swing.JToggleButton;
 import javax.swing.SpinnerNumberModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;

 public class ChannelizerViewer2 extends JFrame
 {
@@ -194,9 +195,9 @@ public class ChannelizerViewer2 extends JFrame

                            getTopChannelArrayPanel().addChannel(tunerChannel);
                        }
-                        catch(Exception exception)
+                        catch(Exception e1)
                        {
-                            mLog.error("Can't parse frequency from value: " + value);
+                            mLog.error("Can't parse frequency from value: " + value, e1);
                        }
                    }
                }
@@ -229,9 +230,9 @@ public class ChannelizerViewer2 extends JFrame

                            getBottomChannelArrayPanel().addChannel(tunerChannel);
                        }
-                        catch(Exception exception)
+                        catch(Exception e1)
                        {
-                            mLog.error("Can't parse frequency from value: " + value);
+                            mLog.error("Can't parse frequency from value: " + value, e1);
                        }
                    }
                }
@@ -388,6 +389,26 @@ public class ChannelizerViewer2 extends JFrame
                    mComplexDftProcessor.receive(new FloatNativeBuffer(complexSamples.toInterleaved()));
                });

+                if(mSource instanceof PolyphaseChannelSource pcs)
+                {                    List<Integer> indexes = pcs.getOutputProcessorIndexes();
+                    double sRate = pcs.getSampleRate();
+                    long indexCenterFrequency = pcs.getIndexCenterFrequency();
+                    long appliedFrequencyOffset = pcs.getFrequencyOffset();
+                    long requestedCenterFrequency = pcs.getFrequency();
+
+                    StringBuilder sb = new StringBuilder();
+                    sb.append("Polyphase Channel - Bandwidth: ").append(sRate);
+                    sb.append(" Channel/Requested/Offset: ").append(indexCenterFrequency);
+                    sb.append("/").append(requestedCenterFrequency);
+                    sb.append("/").append(appliedFrequencyOffset);
+                    sb.append(" Indexes: ").append(indexes);
+                    sb.append(" Tuner SR:").append(pcs.getTunerSampleRate());
+                    sb.append(" Tuner CF:").append(pcs.getTunerCenterFrequency());
+                    mLog.info(sb.toString());
+
+
+                }
+
                mSource.start();
            }
            else
--- a/src/main/java/io/github/dsheirer/gui/channelizer/SynthesizerViewer.java
+++ b/src/main/java/io/github/dsheirer/gui/channelizer/SynthesizerViewer.java
@@ -34,6 +34,9 @@ import io.github.dsheirer.spectrum.DFTSize;
 import io.github.dsheirer.spectrum.SpectrumPanel;
 import io.github.dsheirer.spectrum.converter.ComplexDecibelConverter;
 import io.github.dsheirer.util.ThreadPool;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.util.concurrent.TimeUnit;
 import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,9 +48,6 @@ import javax.swing.JSpinner;
 import javax.swing.SpinnerNumberModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.util.concurrent.TimeUnit;

 public class SynthesizerViewer extends JFrame
 {
@@ -281,15 +281,15 @@ public class SynthesizerViewer extends JFrame
        @Override
        public void run()
        {
-            ComplexSamples channel1Buffer = getChannel1ControlPanel().getOscillator().generateComplexSamples(mSamplesPerCycle);
-            ComplexSamples channel2Buffer = getChannel2ControlPanel().getOscillator().generateComplexSamples(mSamplesPerCycle);
+            ComplexSamples channel1Buffer = getChannel1ControlPanel().getOscillator().generateComplexSamples(mSamplesPerCycle, 0l);
+            ComplexSamples channel2Buffer = getChannel2ControlPanel().getOscillator().generateComplexSamples(mSamplesPerCycle, 0l);

            ComplexSamples synthesizedBuffer = mSynthesizer.process(channel1Buffer, channel2Buffer);
-            getChannel1Panel().receive(new FloatNativeBuffer(channel1Buffer, System.currentTimeMillis()));
+            getChannel1Panel().receive(new FloatNativeBuffer(channel1Buffer));

-            getChannel2Panel().receive(new FloatNativeBuffer(channel2Buffer, System.currentTimeMillis()));
+            getChannel2Panel().receive(new FloatNativeBuffer(channel2Buffer));

-            getSpectrumPanel().receive(new FloatNativeBuffer(synthesizedBuffer, System.currentTimeMillis()));
+            getSpectrumPanel().receive(new FloatNativeBuffer(synthesizedBuffer));
        }
    }

--- a/src/main/java/io/github/dsheirer/gui/dmr/DMRRecordingViewer.java
+++ b/src/main/java/io/github/dsheirer/gui/dmr/DMRRecordingViewer.java
@@ -0,0 +1,479 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.gui.dmr;
+
+import io.github.dsheirer.message.IMessage;
+import io.github.dsheirer.module.decode.dmr.DMRMessageFramer;
+import io.github.dsheirer.module.decode.dmr.DMRMessageProcessor;
+import io.github.dsheirer.module.decode.dmr.DecodeConfigDMR;
+import io.github.dsheirer.record.binary.BinaryReader;
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.util.function.Predicate;
+import java.util.prefs.Preferences;
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.collections.transformation.FilteredList;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.TextField;
+import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+import javafx.util.Callback;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Utility application to load and view a DMR .bits recording file with the messages fully parsed.
+ */
+public class DMRRecordingViewer extends VBox
+{
+    private static final Logger mLog = LoggerFactory.getLogger(DMRRecordingViewer.class);
+    private static final String LAST_SELECTED_DIRECTORY = "last.selected.directory";
+    private Preferences mPreferences = Preferences.userNodeForPackage(DMRRecordingViewer.class);
+    private Scene mScene;
+    private Button mSelectFileButton;
+    private Label mSelectedFileLabel;
+    private TableView<IMessage> mMessageTableView;
+    private ObservableList<IMessage> mMessages = FXCollections.observableArrayList();
+    private FilteredList<IMessage> mFilteredMessages = new FilteredList<>(mMessages);
+    private CheckBox mShowTS0;
+    private CheckBox mShowTS1;
+    private CheckBox mShowTS2;
+    private CheckBox mUseCompressedTalkgroups;
+    private TextField mSearchText;
+    private TextField mFindText;
+    private Button mFindButton;
+    private Button mFindNextButton;
+
+    public DMRRecordingViewer()
+    {
+        setPadding(new Insets(5));
+        setSpacing(5);
+
+        HBox fileBox = new HBox();
+        fileBox.setMaxWidth(Double.MAX_VALUE);
+        fileBox.setAlignment(Pos.CENTER_LEFT);
+        fileBox.setSpacing(5);
+        HBox.setHgrow(getSelectFileButton(), Priority.NEVER);
+        HBox.setHgrow(getSelectedFileLabel(), Priority.ALWAYS);
+        getSelectedFileLabel().setAlignment(Pos.BASELINE_CENTER);
+
+        HBox compressedBox = new HBox();
+        compressedBox.setAlignment(Pos.CENTER_RIGHT);
+        compressedBox.setMaxWidth(Double.MAX_VALUE);
+        compressedBox.getChildren().addAll(getUseCompressedTalkgroups());
+        HBox.setHgrow(compressedBox, Priority.ALWAYS);
+
+        fileBox.getChildren().addAll(getSelectFileButton(), getSelectedFileLabel(), compressedBox);
+
+        HBox filterBox = new HBox();
+        filterBox.setMaxWidth(Double.MAX_VALUE);
+        filterBox.setAlignment(Pos.BASELINE_CENTER);
+        filterBox.setSpacing(5);
+
+        Label showLabel = new Label("Show:");
+        HBox.setMargin(showLabel, new Insets(0,0,0,15));
+        Label searchLabel = new Label("Message Filter:");
+        HBox.setMargin(searchLabel, new Insets(0,0,0,15));
+        Label findLabel = new Label("Find:");
+
+        HBox.setHgrow(getFindText(), Priority.ALWAYS);
+        HBox.setHgrow(getSearchText(), Priority.ALWAYS);
+
+        filterBox.getChildren().addAll(findLabel, getFindText(), getFindButton(), getFindNextButton(), searchLabel,
+                getSearchText(), showLabel, getShowTS0(), getShowTS1(), getShowTS2());
+
+        VBox.setVgrow(fileBox, Priority.NEVER);
+        VBox.setVgrow(filterBox, Priority.NEVER);
+        VBox.setVgrow(getMessageTableView(), Priority.ALWAYS);
+
+        getChildren().addAll(fileBox, filterBox, getMessageTableView());
+    }
+
+    /**
+     * Processes the recording file and loads the content into the viewer
+     * @param file containing a .bits recording of decoded DMR data.
+     */
+    private void load(File file)
+    {
+        if(file != null && file.exists())
+        {
+            getSelectedFileLabel().setText(file.getName());
+            mMessages.clear();
+
+            DMRMessageFramer messageFramer = new DMRMessageFramer(null);
+            DecodeConfigDMR config = new DecodeConfigDMR();
+            if(getUseCompressedTalkgroups().isSelected())
+            {
+                config.setUseCompressedTalkgroups(true);
+            }
+            DMRMessageProcessor messageProcessor = new DMRMessageProcessor(config);
+            messageFramer.setListener(messageProcessor);
+            messageProcessor.setMessageListener(message -> mMessages.add(message));
+
+            try(BinaryReader reader = new BinaryReader(file.toPath(), 200))
+            {
+                while(reader.hasNext())
+                {
+                    ByteBuffer buffer = reader.next();
+                    messageFramer.receive(buffer);
+                }
+            }
+            catch(Exception ioe)
+            {
+                ioe.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * Updates the filter(s) applies to the list of messages
+     */
+    private void updateFilters()
+    {
+        Predicate<IMessage> timeslotPredicate = message ->
+               (getShowTS0().isSelected() && (message.getTimeslot() == 0)) ||
+               (getShowTS1().isSelected() && (message.getTimeslot() == 1)) ||
+               (getShowTS2().isSelected() && (message.getTimeslot() == 2));
+
+        String filterText = getSearchText().getText();
+
+        if(filterText == null || filterText.isEmpty())
+        {
+            mFilteredMessages.setPredicate(timeslotPredicate);
+        }
+        else
+        {
+            Predicate<IMessage> textPredicate = message -> message.toString().toLowerCase().contains(filterText.toLowerCase());
+            mFilteredMessages.setPredicate(timeslotPredicate.and(textPredicate));
+        }
+    }
+
+    /**
+     * Finds and selects the first row containing the text argument.
+     * @param text to search for.
+     */
+    private void find(String text)
+    {
+        if(text != null && !text.isEmpty())
+        {
+            for(IMessage message: mFilteredMessages)
+            {
+                if(message.toString().toLowerCase().contains(text.toLowerCase()))
+                {
+                    getMessageTableView().getSelectionModel().select(message);
+                    getMessageTableView().scrollTo(message);
+                    return;
+                }
+            }
+        }
+    }
+
+    /**
+     * Finds and selects the first row containing the text argument, after the currently selected row.
+     * @param text to search for.
+     */
+    private void findNext(String text)
+    {
+        if(text != null && !text.isEmpty())
+        {
+            IMessage selected = getMessageTableView().getSelectionModel().getSelectedItem();
+
+            if(selected == null)
+            {
+                find(text);
+                return;
+            }
+
+            int row = mFilteredMessages.indexOf(selected);
+
+            for(int x = row + 1; x < mFilteredMessages.size(); x++)
+            {
+                if(x < mFilteredMessages.size())
+                {
+                    IMessage message = mFilteredMessages.get(x);
+
+                    if(message.toString().toLowerCase().contains(text.toLowerCase()))
+                    {
+                        getMessageTableView().getSelectionModel().select(message);
+                        getMessageTableView().scrollTo(message);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * List view control with DMR messages
+     */
+    private TableView<IMessage> getMessageTableView()
+    {
+        if(mMessageTableView == null)
+        {
+            mMessageTableView = new TableView<>(mFilteredMessages);
+
+            TableColumn timestampColumn = new TableColumn();
+            timestampColumn.setPrefWidth(110);
+            timestampColumn.setText("Time");
+            timestampColumn.setCellValueFactory(new PropertyValueFactory<>("timestamp"));
+
+            TableColumn timeslotColumn = new TableColumn();
+            timeslotColumn.setPrefWidth(35);
+            timeslotColumn.setText("TS");
+            timeslotColumn.setCellValueFactory(new PropertyValueFactory<>("timeslot"));
+
+            TableColumn validColumn = new TableColumn();
+            validColumn.setPrefWidth(50);
+            validColumn.setText("Valid");
+            validColumn.setCellValueFactory(new PropertyValueFactory<>("valid"));
+
+            TableColumn messageColumn = new TableColumn();
+            messageColumn.setPrefWidth(1000);
+            messageColumn.setText("Message");
+            messageColumn.setCellValueFactory((Callback<TableColumn.CellDataFeatures, ObservableValue>) param -> {
+                SimpleStringProperty property = new SimpleStringProperty();
+                if(param.getValue() instanceof IMessage message)
+                {
+                    property.set(message.toString());
+                }
+
+                return property;
+            });
+
+            mMessageTableView.getColumns().addAll(timestampColumn, validColumn, timeslotColumn, messageColumn);
+        }
+
+        return mMessageTableView;
+    }
+
+    /**
+     * File selection button
+     * @return button
+     */
+    private Button getSelectFileButton()
+    {
+        if(mSelectFileButton == null)
+        {
+            mSelectFileButton = new Button("Select ...");
+            mSelectFileButton.onActionProperty().set(event -> {
+                FileChooser fileChooser = new FileChooser();
+                fileChooser.setTitle("Select DMR .bits Recording");
+                String lastDirectory = mPreferences.get(LAST_SELECTED_DIRECTORY, null);
+                if(lastDirectory != null)
+                {
+                    File file = new File(lastDirectory);
+                    if(file.exists() && file.isDirectory())
+                    {
+                        fileChooser.setInitialDirectory(file);
+                    }
+                }
+                fileChooser.setSelectedExtensionFilter(new FileChooser.ExtensionFilter("sdrtrunk bits recording", "*.bits"));
+                File selected = fileChooser.showOpenDialog(getScene().getWindow());
+
+                if(selected != null)
+                {
+                    mLog.info("Last Selected Directory updated to [" + selected.getParent() +"]");
+                    mPreferences.put(LAST_SELECTED_DIRECTORY, selected.getParent());
+                    load(selected);
+                }
+            });
+        }
+
+        return mSelectFileButton;
+    }
+
+    /**
+     * Selected file path label.
+     */
+    private Label getSelectedFileLabel()
+    {
+        if(mSelectedFileLabel == null)
+        {
+            mSelectedFileLabel = new Label(" ");
+        }
+
+        return mSelectedFileLabel;
+    }
+
+    /**
+     * Check box to apply filter to show/hide TS0 messages
+     * @return check box control
+     */
+    private CheckBox getShowTS0()
+    {
+        if(mShowTS0 == null)
+        {
+            mShowTS0 = new CheckBox("TS0");
+            mShowTS0.setSelected(true);
+            mShowTS0.setOnAction(event -> updateFilters());
+        }
+
+        return mShowTS0;
+    }
+
+    /**
+     * Check box to apply filter to show/hide TS0 messages
+     * @return check box control
+     */
+    private CheckBox getShowTS1()
+    {
+        if(mShowTS1 == null)
+        {
+            mShowTS1 = new CheckBox("TS1");
+            mShowTS1.setSelected(true);
+            mShowTS1.setOnAction(event -> updateFilters());
+        }
+
+        return mShowTS1;
+    }
+
+    /**
+     * Check box to apply filter to show/hide TS0 messages
+     * @return check box control
+     */
+    private CheckBox getShowTS2()
+    {
+        if(mShowTS2 == null)
+        {
+            mShowTS2 = new CheckBox("TS2");
+            mShowTS2.setSelected(true);
+            mShowTS2.setOnAction(event -> updateFilters());
+        }
+
+        return mShowTS2;
+    }
+
+    /**
+     * Search text filter box
+     * @return text control for entering search text
+     */
+    private TextField getSearchText()
+    {
+        if(mSearchText == null)
+        {
+            mSearchText = new TextField();
+            mSearchText.textProperty().addListener((observable, oldValue, newValue) -> updateFilters());
+        }
+
+        return mSearchText;
+    }
+
+    /**
+     * Text box for find text
+     */
+    private TextField getFindText()
+    {
+        if(mFindText == null)
+        {
+            mFindText = new TextField();
+            mFindText.textProperty().addListener((observable, oldValue, newValue) -> updateFilters());
+        }
+
+        return mFindText;
+    }
+
+    /**
+     * Find button to search for the text in the find text box.
+     * @return button
+     */
+    private Button getFindButton()
+    {
+        if(mFindButton == null)
+        {
+            mFindButton = new Button("Find");
+            mFindButton.setOnAction(event -> find(getFindText().getText()));
+        }
+
+        return mFindButton;
+    }
+
+    /**
+     * Find next button to search for the text in the find text box.
+     * @return button
+     */
+    private Button getFindNextButton()
+    {
+        if(mFindNextButton == null)
+        {
+            mFindNextButton = new Button("Next");
+            mFindNextButton.setOnAction(event -> findNext(getFindText().getText()));
+        }
+
+        return mFindNextButton;
+    }
+
+    /**
+     * Use Hytera Tier 3 Compressed Talkgroups
+     * @return
+     */
+    private CheckBox getUseCompressedTalkgroups()
+    {
+        if(mUseCompressedTalkgroups == null)
+        {
+            mUseCompressedTalkgroups = new CheckBox("Use Compressed Talkgroups");
+        }
+
+        return mUseCompressedTalkgroups;
+    }
+
+    public static void main(String[] args)
+    {
+        Application viewer = new Application()
+        {
+            @Override
+            public void start(Stage primaryStage) throws Exception
+            {
+                Scene scene = new Scene(new DMRRecordingViewer(), 1100, 800);
+                primaryStage.setTitle("DMR Recording Viewer");
+                primaryStage.setScene(scene);
+                primaryStage.show();
+            }
+        };
+
+        Runnable r = () -> {
+            try
+            {
+                viewer.start(new Stage());
+            }
+            catch(Exception e)
+            {
+                mLog.error("Error starting DMR recording viewer application", e);
+            }
+        };
+
+        Platform.startup(r);
+    }
+}
--- a/src/main/java/io/github/dsheirer/gui/dmr/ViewDmrRecordingViewerRequest.java
+++ b/src/main/java/io/github/dsheirer/gui/dmr/ViewDmrRecordingViewerRequest.java
@@ -0,0 +1,33 @@
+/*
+ * *****************************************************************************
+ * Copyright (C) 2014-2023 Dennis Sheirer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * ****************************************************************************
+ */
+
+package io.github.dsheirer.gui.dmr;
+
+import io.github.dsheirer.gui.JavaFxWindowRequest;
+
+/**
+ * Request to show the DMR recording viewer
+ */
+public class ViewDmrRecordingViewerRequest extends JavaFxWindowRequest
+{
+    /**
+     * Constructs an instance
+     */
+    public ViewDmrRecordingViewerRequest() {}
+}
--- a/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/RadioIdEditor.java
+++ b/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/RadioIdEditor.java
@@ -217,6 +217,9 @@ public class RadioIdEditor extends IdentifierEditor<Radio>
            }
        }

+        mLog.warn("Unable to find radio id editor for protocol [" + protocol + "] and format [" + integerFormat +
+                "] - using default editor");
+
        //Use a default instance
        for(RadioDetail detail: mRadioDetails)
        {
--- a/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/RadioIdRangeEditor.java
+++ b/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/RadioIdRangeEditor.java
@@ -159,7 +159,7 @@ public class RadioIdRangeEditor extends IdentifierEditor<RadioRange>
            else
            {
                mLog.warn("Couldn't find radio ID detail for protocol [" + getItem().getProtocol() +
-                    "] and format [" + format + "]");
+                        "] and format [" + format + "]");
                getFormatLabel().setText(" ");
            }
        }
@@ -267,6 +267,9 @@ public class RadioIdRangeEditor extends IdentifierEditor<RadioRange>
            }
        }

+        mLog.warn("Unable to find radio id range editor for protocol [" + protocol + "] and format [" + integerFormat +
+                "] - using default editor");
+
        //Use a default instance
        for(RadioIdDetail detail: mRadioDetails)
        {
@@ -287,20 +290,23 @@ public class RadioIdRangeEditor extends IdentifierEditor<RadioRange>
    {
        List<RadioIdDetail> details = new ArrayList<>();
        details.add(new RadioIdDetail(Protocol.APCO25, IntegerFormat.DECIMAL, new IntegerFormatter(0,0xFFFFFF),
-            new IntegerFormatter(0,0xFFFFFF), "Format: 0 - 16777215"));
+                new IntegerFormatter(0,0xFFFFFF), "Format: 0 - 16777215"));
        details.add(new RadioIdDetail(Protocol.APCO25, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFFFF),
-            new HexFormatter(0,0xFFFFFF), "Format: 0 - FFFFFF"));
+                new HexFormatter(0,0xFFFFFF), "Format: 0 - FFFFFF"));
        details.add(new RadioIdDetail(Protocol.PASSPORT, IntegerFormat.DECIMAL, new IntegerFormatter(0,0x7FFFFF),
-            new IntegerFormatter(0,0x7FFFFF), "Format: 0 - 8388607"));
+                new IntegerFormatter(0,0x7FFFFF), "Format: 0 - 8388607"));
        details.add(new RadioIdDetail(Protocol.PASSPORT, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0x7FFFFF),
-            new HexFormatter(0,0x7FFFFF), "Format: 0 - 7FFFFF"));
+                new HexFormatter(0,0x7FFFFF), "Format: 0 - 7FFFFF"));
        details.add(new RadioIdDetail(Protocol.UNKNOWN, IntegerFormat.DECIMAL, new IntegerFormatter(0,16777215),
-            new IntegerFormatter(0,16777215), "Format: 0 - FFFFFF"));
+                new IntegerFormatter(0,16777215), "Format: 0 - FFFFFF"));
        details.add(new RadioIdDetail(Protocol.UNKNOWN, IntegerFormat.FORMATTED, new IntegerFormatter(0,16777215),
-            new IntegerFormatter(0,16777215), "Format: 0 - FFFFFF"));
+                new IntegerFormatter(0,16777215), "Format: 0 - FFFFFF"));
        details.add(new RadioIdDetail(Protocol.UNKNOWN, IntegerFormat.HEXADECIMAL, new HexFormatter(0,16777215),
-            new HexFormatter(0,16777215), "Format: 0 - FFFFFF"));
-
+                new HexFormatter(0,16777215), "Format: 0 - FFFFFF"));
+        details.add(new RadioIdDetail(Protocol.DMR, IntegerFormat.DECIMAL, new IntegerFormatter(0,16777215),
+                new IntegerFormatter(0,16777215), "Format: 0 - 16777215"));
+        details.add(new RadioIdDetail(Protocol.DMR, IntegerFormat.HEXADECIMAL, new HexFormatter(0,16777215),
+                new HexFormatter(0,16777215), "Format: 0 - FFFFFF"));
        return details;
    }

--- a/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/TalkgroupEditor.java
+++ b/src/main/java/io/github/dsheirer/gui/playlist/alias/identifier/TalkgroupEditor.java
@@ -135,7 +135,7 @@ public class TalkgroupEditor extends IdentifierEditor<Talkgroup>
            else
            {
                mLog.warn("Couldn't find talkgroup detail for protocol [" + getItem().getProtocol() +
-                    "] and format [" + format + "]");
+                        "] and format [" + format + "]");
            }

            getFormatLabel().setText(talkgroupDetail.getTooltip());
@@ -219,6 +219,9 @@ public class TalkgroupEditor extends IdentifierEditor<Talkgroup>
            }
        }

+        mLog.warn("Unable to find talkgroup editor for protocol [" + protocol + "] and format [" + integerFormat +
+                "] - using default editor");
+
        //Use a default instance
        for(TalkgroupDetail detail: mTalkgroupDetails)
        {
@@ -236,37 +239,37 @@ public class TalkgroupEditor extends IdentifierEditor<Talkgroup>
    {
        mTalkgroupDetails.clear();
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.APCO25, IntegerFormat.DECIMAL, new IntegerFormatter(0,65535),
-            "Format: 0 - 65535"));
+                "Format: 0 - 65535"));
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.APCO25, IntegerFormat.HEXADECIMAL, new HexFormatter(0,65535),
-            "Format: 0 - FFFF"));
-        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.DECIMAL, new IntegerFormatter(0,0xFFFFFF),
-            "Format: 0 - 16,777,215"));
-        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFFFF),
-            "Format: 0 - FFFFFF"));
+                "Format: 0 - FFFF"));
+        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.DECIMAL, new IntegerFormatter(1,0xFFFFFF),
+                "Format: 1 - 16,777,215"));
+        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.DMR, IntegerFormat.HEXADECIMAL, new HexFormatter(1,0xFFFFFF),
+                "Format: 1 - FFFFFF"));
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.FLEETSYNC, IntegerFormat.FORMATTED,
-            new PrefixIdentFormatter(0,0xFFFFF), "Format: PPP-IIII = Prefix (0-127), Ident (0-8191)"));
+                new PrefixIdentFormatter(0,0xFFFFF), "Format: PPP-IIII = Prefix (0-127), Ident (0-8191)"));
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.LTR, IntegerFormat.FORMATTED, new LtrFormatter(0,0x3FFF),
-            "Format: A-HH-TTT = Area (0-1), Home (1-31), Talkgroup (1-255)"));
+                "Format: A-HH-TTT = Area (0-1), Home (1-31), Talkgroup (1-255)"));
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.MDC1200, IntegerFormat.DECIMAL, new IntegerFormatter(0,0xFFFF),
-            "Format: 0 - 65535"));
+                "Format: 0 - 65535"));
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.MDC1200, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFF),
-            "Format: 0 - FFFF"));
+                "Format: 0 - FFFF"));
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.MPT1327, IntegerFormat.FORMATTED,
-            new PrefixIdentFormatter(0,0xFFFFF), "Format: PPP-IIII = Prefix (0-127), Ident (0-8191)"));
+                new PrefixIdentFormatter(0,0xFFFFF), "Format: PPP-IIII = Prefix (0-127), Ident (0-8191)"));
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.NBFM, IntegerFormat.DECIMAL, new IntegerFormatter(1,0xFFFF),
-            "Format: 1 - 65535"));
+                "Format: 1 - 65535"));
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.NBFM, IntegerFormat.HEXADECIMAL, new HexFormatter(1,0xFFFF),
-            "Format: 1 - FFFF"));
+                "Format: 1 - FFFF"));
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.PASSPORT, IntegerFormat.DECIMAL, new IntegerFormatter(0,0xFFFF),
                "Format: 0 - 65535"));
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.PASSPORT, IntegerFormat.HEXADECIMAL, new HexFormatter(0,0xFFFF),
                "Format: 0 - FFFF"));
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.UNKNOWN, IntegerFormat.DECIMAL, new IntegerFormatter(0,16777215),
-            "Format: 0 - FFFFFF"));
+                "Format: 0 - FFFFFF"));
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.UNKNOWN, IntegerFormat.FORMATTED, new IntegerFormatter(0,16777215),
-            "Format: 0 - FFFFFF"));
+                "Format: 0 - FFFFFF"));
        mTalkgroupDetails.add(new TalkgroupDetail(Protocol.UNKNOWN, IntegerFormat.HEXADECIMAL, new HexFormatter(0,16777215),
-            "Format: 0 - FFFFFF"));
+                "Format: 0 - FFFFFF"));
    }

    public static class TalkgroupDetail
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Denny Sheirer	421da1c1ce	Cherry Pick: #1405 polyphase channelizer thread leak.	2023-03-05 06:34:29 -05:00
Denny Sheirer	2412833899	Updates release to 0.5.2	2023-03-05 06:32:56 -05:00
Denny Sheirer	9abf64c6ab	#1449 Updates version to 0.5.1 final (#1451 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2023-02-19 07:17:10 -05:00
Denny Sheirer	1702103f5d	#1449 Updates version to 0.5.1 beta-2 (#1450 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2023-02-19 07:10:44 -05:00
Denny Sheirer	8f68a989b9	#1444 Adds: (#1447 ) * DMR Recording viewer utility * DMR talker aliases * DMR SMS messages * DMR Hytera Tier-III compressed talkgroups support * DMR UDT packet sequences * DMR Hytera Aloha and other unknown CSBK and Link Control messages Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2023-02-18 08:36:55 -05:00
Denny Sheirer	b51a0102ef	#1422 Resolves issue where MotoTRBO IP Site Connect and Capacity Plus voice group user message not decoding Radio & Talkgroup IDs correctly. Creates standalone application for viewing DMR messages from recordings. (#1442 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2023-02-11 15:32:41 -05:00
Denny Sheirer	e177c2c6b0	#1426 Adds JRE accessibility module to support assistive technologies. (#1427 ) Co-authored-by: Denny Sheirer <sheirerd@ainfosec.com>	2023-01-21 07:21:00 -05:00
Denny Sheirer	3567fdf51d	#1393 Updates DMR Talkgroup and Radio ID editors to use correct formatting. Patch submitted by @hockeyref2 (#1425 ) Co-authored-by: Denny Sheirer <sheirerd@ainfosec.com>	2023-01-20 06:50:18 -05:00
Denny Sheirer	323097ba65	#1423 Updates Icecast/Broadcastify feed to attempt reconnect following a mountpoint in use error response. (#1424 ) Co-authored-by: Denny Sheirer <sheirerd@ainfosec.com>	2023-01-20 05:39:38 -05:00
Denny Sheirer	33f2bab7ac	#1419 Reduce logging from USBTunerController for (temporary) failed transfer buffer resubmits. (#1420 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2023-01-18 04:38:30 -05:00
Denny Sheirer	c063cfb201	#1416 Updates P25-P1 To Expose ICMP & Unknown Packet Events in Event History View (#1417 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2023-01-16 05:31:27 -05:00
Denny Sheirer	e99aa3d3b4	#1411 Updates version to 0.5.0 beta1 (#1412 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2023-01-15 06:36:22 -05:00
Denny Sheirer	ec162ff84c	#1408 Updates USB tuners to enhance transfer buffer error handling and logging. When an error occurs while (re)submitting a transfer buffer to LibUsb to fill with sample data, the buffer is temporarily placed in an error queue. Upon successfully submitting the next transfer buffer, we attempt to resubmit a buffer from the error queue, so that we wait until the device can accept buffers before trying to resubmit. If all transfer buffers are exhausted because they are in the error queue, then the tuner gets shutdown with an error state ... there's really no way to recover at this point. (#1409 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2023-01-15 06:16:37 -05:00
Denny Sheirer	f0db2865f2	#1397 Resolves issue where decoding channels go IDLE after period of time. Isolated the cause to a multi-threading issue where the polyphase channel manager receives notification that the tuner center frequency has changed and sets a flag to update each of the channels. This happens concurrent with a previous tuner center frequency change where the flag gets set and the second thread is updating the output processors with the previous frequency change and then unsets the frequency change flag, completely missing the second/latest frequency change update and causing the channels to all tune-out their desired signals as the tuner center frequency changes and the output channels continue mixing to the previous frequency. (#1407 ) Identified and resolved issue where a 2-stream polyphase synthesizer was being updated with an incorrectly designed synthesis filter which was causing massive droop on the second half of the reconstructed channel. Oddly enough, this didn't seem to impact the P25 decoders, but it may have impacted other decoding. Identified and resolved issue with concurrent modification of the modules list in the processing chain associated with recent addition of the channel FFT view in the channel power tab. Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2023-01-15 04:12:42 -05:00
Denny Sheirer	f97b2150b9	#1397 Adds channel fft frequency overlay, cursor readout, pll tracking indicator, and channel bandwidth lines. (#1406 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2023-01-13 04:28:00 -05:00
Denny Sheirer	8ce8aaddf9	#1399 Resolves device ID parsing issue for Motorola ARS Device Registration. (#1400 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2023-01-06 04:17:57 -05:00
Denny Sheirer	e4a85a4ed7	#1386 Updates version to 0.5.0 (final) (#1387 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-25 07:11:25 -05:00
Denny Sheirer	f61a415b43	#1383 Updates tuner editor to resolve sequencing issue where a recently enabled tuner was having its enabled state set to true and then enabling the tuner, which caused the tuner editor to mis-configure the tuner editor panel. (#1385 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-25 07:03:28 -05:00
Denny Sheirer	29ed3b4553	#1287 Disables event panel filtering until the feature is fully implemented with #1368 . The current partial implementation is preventing valid events from displaying for protocols like DMR and likely others. (#1384 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-25 06:45:50 -05:00
Denny Sheirer	a87309e792	#1378 Resolves potential error where tuner shutdown (because of USB I/O error) hangs and causes application to run out of memory. This patch doesn't resolve the original issue with the USB I/O error, but it does ensure that the tuner shutdown which is happening on the USB processing thread, can complete in a timely fashion so that the application doesn't (potentially) crash from out of memory. (#1382 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-24 09:10:17 -05:00
Denny Sheirer	ddb5b5ef87	#1380 Improves Icecast streaming error handling and preserves streaming error messages for broadcast state to display in streaming status panel. Resolves issue with streaming status panel not showing icons and stream type. (#1381 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-24 07:48:04 -05:00
Denny Sheirer	7a58bf85b6	#1312 Resolves issue with radio reference editor attempting to access county info for a site that has county ID set to 0 (ie no county specified). (#1379 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-24 04:45:21 -05:00
Doug Hoffman	8707eb2c88	Correctly identify padded MP3 frames (#1375 )	2022-12-23 06:12:44 -05:00
Denny Sheirer	08499ac73f	#1237 Ensure MP3 input sample rate is supported by LAME encoder settings. (#1376 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-23 06:06:10 -05:00
Dennis Sheirer	70170ff70f	Revert "Disable resampling if requested sample rate not supported" This reverts commit `7de28519a1`.	2022-12-18 08:29:35 -05:00
Denny Sheirer	bad5589c0d	#1369 Updates to Version 0.5.0 Beta 7 (#1370 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-18 07:17:23 -05:00
Doug Hoffman	7de28519a1	Disable resampling if requested sample rate not supported	2022-12-18 04:57:21 -05:00
Doug Hoffman	bbd907514e	Handle streaming audio as frames (#1244 )	2022-12-18 04:46:07 -05:00
Denny Sheirer	4a68cd9407	#1364 Enhancements to resolve issue with tuner shutdown hang on application shutdown. (#1365 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-18 04:29:55 -05:00
Denny Sheirer	dc327a2855	#1362 Updates heterodyne channelizer with alternate sorted set implementation to resolve issue when determining if the tuner can tune a requested channel. (#1363 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-17 09:28:29 -05:00
Denny Sheirer	9af593a785	#1360 Resolves issue with Polyphase channelizer and decoded message timestamps for P25 and other protocols. (#1361 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-17 08:50:29 -05:00
Denny Sheirer	24f4c22cdd	#1358 Resolves issue where decoded AMBE (DMR & P25-2) tone identifiers are not sent to the alias action manager. (#1359 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-17 07:35:16 -05:00
Denny Sheirer	bc462b9652	#1351 Restores semi-accurate timestamps of sample buffers to ensure P25 & DMR decoded messages have accurate timestamps and MBE recording voice frames have accurate timestamps. (#1357 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-17 06:39:35 -05:00
Denny Sheirer	047dec6da1	#1355 Updates logging libraries to latest version and updates logging libraries to latest version. (#1356 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-17 04:06:44 -05:00
Denny Sheirer	bf935555bb	#1353 Resolves issue where polyphase channelizer would mis-tune channels after a period of time resulting in idle decoding channels. (#1354 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-12-17 03:54:50 -05:00
Dennis Sheirer	efe36b0682	Updates README	2022-12-03 09:29:20 -05:00
Denny Sheirer	a18d4498aa	#1346 Updates radio reference library to version 15.1.9 (#1347 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-11-25 09:11:10 -05:00
Denny Sheirer	803dc2531c	#1318 Resolves issue where bitstream recorder no longer works. Solution submitted by @apankowski. (#1345 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-11-24 06:16:44 -05:00
Denny Sheirer	1b062bcd06	#1343 Resolves issue where user-initiated FFT size change causes waterfall panel pixel array to be updated/resized while a memory image source repaint has been requested and the parameters become incongruent, causing an array index out of bounds error. Pushes the pixel array update operation onto the swing thread to ensure only a single thread is modifying the pixel map for rendering. (#1344 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-11-24 04:23:48 -05:00
Denny Sheirer	a24c3736f4	#1340 Updates tuner and frequency controllers to apply locking to ensure multi-threaded access to freuqency control planes doesn't allow center tuned frequency to become indeterminant which can result in channels being mistuned and stop decoding. (#1341 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-11-20 07:55:30 -05:00
Denny Sheirer	ac61b681e6	#1338 Updates logger to include date in log entries. Removes info logger when creating channel log files. (#1339 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-11-20 05:54:05 -05:00
Denny Sheirer	0866bfd555	#1336 Resolves issue with color setting changes not inheriting the correct translucency which causes the channel overlays in the spectral display to be solid color instead of semi-transparent. (#1337 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-11-20 05:43:28 -05:00
Denny Sheirer	79fed701d9	#1337 Updates build to use JDK19 for distribution images and updates all 3rd-party libraries to latest. Note: build system continues to be compatible with JDK 17 and 18, but Gradle 7.6 to build distribution images. Gradle 7.6 is not released yet, but RC3 is available. (#1335 ) Co-authored-by: Dennis Sheirer <dsheirer@github.com>	2022-11-20 05:36:41 -05:00