@octoseq/mir 0.1.0-main.994cb4e → 0.1.0-main.9ea6d2e

package/src/index.ts

@@ -35,8 +35,14 @@ export type {
   FrequencyKeyframe,
   // Band-Scoped MIR (F3)
   BandMirFunctionId,
+  BandCqtFunctionId,
+  BandEventFunctionId,
   BandMirDiagnostics,
   BandMir1DResult,
+  BandCqt1DResult,
+  BandMirEvent,
+  BandEventDiagnostics,
+  BandEventsResult,
   // CQT (F5)
   CqtConfig,
   CqtSpectrogram,
@@ -84,7 +90,8 @@ export { spectrogram } from "./dsp/spectrogram";
 // Derived spectral features (CPU, reuse spectrogram)
 // ----------------------------
 
-export { spectralCentroid, spectralFlux } from "./dsp/spectral";
+export type { AmplitudeEnvelopeConfig, AmplitudeEnvelopeResult } from "./dsp/spectral";
+export { amplitudeEnvelope, spectralCentroid, spectralFlux } from "./dsp/spectral";
 
 // ----------------------------
 // Onsets / Peaks
@@ -116,6 +123,22 @@ export { generateTempoHypotheses } from "./dsp/tempoHypotheses";
 
 export { computePhaseHypotheses, generateBeatTimes } from "./dsp/phaseAlignment";
 
+// ----------------------------
+// Peak Picking
+// ----------------------------
+
+export {
+    pickPeaks,
+    pickPeaksAdaptive,
+    computeAdaptiveThreshold,
+    applyHysteresisGate,
+    DEFAULT_PEAK_PICKING_PARAMS,
+    type PeakPickingParams,
+    type PeakPickingResult,
+    type AdaptivePeakPickingResult,
+    type HysteresisGateParams,
+} from "./dsp/peakPicking";
+
 // ----------------------------
 // Musical Time (B4)
 // ----------------------------
@@ -191,10 +214,47 @@ export {
     bandAmplitudeEnvelope,
     bandOnsetStrength,
     bandSpectralFlux,
+    bandSpectralCentroid,
     runBandMirBatch,
     getBandMirFunctionLabel,
 } from "./dsp/bandMir";
 
+// ----------------------------
+// Band Events (F3)
+// ----------------------------
+
+export type {
+    BandOnsetPeaksOptions,
+    BandBeatCandidatesOptions,
+    BandEventsBatchRequest,
+    BandEventsBatchResult,
+} from "./dsp/bandEvents";
+export {
+    bandOnsetPeaks,
+    bandBeatCandidates,
+    runBandEventsBatch,
+    getBandEventFunctionLabel,
+} from "./dsp/bandEvents";
+
+// ----------------------------
+// Band CQT (F3)
+// ----------------------------
+
+export type {
+    BandCqtOptions,
+    MaskedCqtSpectrogram,
+    BandCqtBatchRequest,
+    BandCqtBatchResult,
+} from "./dsp/bandCqt";
+export {
+    applyBandMaskToCqt,
+    bandCqtHarmonicEnergy,
+    bandCqtBassPitchMotion,
+    bandCqtTonalStability,
+    runBandCqtBatch,
+    getBandCqtFunctionLabel,
+} from "./dsp/bandCqt";
+
 // ----------------------------
 // HPSS
 // ----------------------------
@@ -248,6 +308,38 @@ export {
 export type { BandProposalOptions } from "./dsp/bandProposal";
 export { generateBandProposals } from "./dsp/bandProposal";
 
+// ----------------------------
+// Custom Signal Reduction
+// ----------------------------
+
+export type {
+    ReductionInput,
+    ReductionAlgorithmId,
+    BinRangeOptions,
+    OnsetStrengthOptions,
+    SpectralFluxOptions,
+    ReductionOptions,
+    ReductionResult,
+    // Polarity
+    PolarityMode,
+    // Stabilization
+    StabilizationMode,
+    EnvelopeMode,
+    StabilizationOptions,
+} from "./dsp/customSignalReduction";
+export {
+    reduce2DToSignal,
+    getReductionAlgorithmLabel,
+    getReductionAlgorithmDescription,
+    // Polarity
+    applyPolarity,
+    // Stabilization
+    stabilizeSignal,
+    // Statistics
+    computePercentiles,
+    computeLocalStats,
+} from "./dsp/customSignalReduction";
+
 // ----------------------------
 // Visualisation utilities
 // ----------------------------

package/src/runner/runMir.ts

@@ -6,7 +6,7 @@ import { onsetEnvelopeFromMel, onsetEnvelopeFromMelGpu } from "../dsp/onset";
 import { peakPick } from "../dsp/peakPick";
 import { hpss } from "../dsp/hpss";
 import { hpssGpu } from "../dsp/hpssGpu";
-import { spectralCentroid, spectralFlux } from "../dsp/spectral";
+import { amplitudeEnvelope, spectralCentroid, spectralFlux } from "../dsp/spectral";
 import { spectrogram, type AudioBufferLike, type Spectrogram, type SpectrogramConfig } from "../dsp/spectrogram";
 import { cqtSpectrogram, withCqtDefaults } from "../dsp/cqt";
 import { harmonicEnergy, bassPitchMotion, tonalStability } from "../dsp/cqtSignals";
@@ -88,6 +88,29 @@ export async function runMir(
         window: "hann",
     };
 
+    // Amplitude envelope: compute directly from raw audio (no spectrogram needed)
+    if (request.fn === "amplitudeEnvelope") {
+        const cpuStart = nowMs();
+        const result = amplitudeEnvelope(audio.mono, audio.sampleRate, {
+            hopSize: specConfig.hopSize,
+            windowSize: specConfig.fftSize,
+        });
+        const cpuEnd = nowMs();
+        return {
+            kind: "1d",
+            times: result.times,
+            values: result.values,
+            meta: {
+                backend: "cpu",
+                usedGpu: false,
+                timings: {
+                    totalMs: cpuEnd - t0,
+                    cpuMs: cpuEnd - cpuStart,
+                },
+            },
+        };
+    }
+
     // CPU: spectrogram + centroid/flux are CPU-only today.
     const cpuStart = nowMs();
     const spec: Spectrogram = await spectrogram(asAudioBufferLike(audio), specConfig, undefined, {

package/src/types.ts

@@ -349,6 +349,8 @@ export type FrequencyBand = {
     id: string;
     /** Human-readable label (editable). */
     label: string;
+    /** The audio source this band belongs to ("mixdown" or stem ID). */
+    sourceId: string;
     /** Whether the band is currently active for processing. */
     enabled: boolean;
     /** Time scope for this band. */
@@ -375,7 +377,7 @@ export type FrequencyBand = {
  */
 export type FrequencyBandStructure = {
     /** Schema version for future migrations. */
-    version: 1;
+    version: 2;
     /** Ordered list of frequency bands (by sortOrder). */
     bands: FrequencyBand[];
     /** ISO timestamp when the structure was created. */
@@ -424,12 +426,28 @@ export type FrequencyKeyframe = {
 // ----------------------------
 
 /**
- * Band MIR function identifiers.
+ * Band MIR function identifiers (STFT-based).
  */
 export type BandMirFunctionId =
     | "bandAmplitudeEnvelope"
     | "bandOnsetStrength"
-    | "bandSpectralFlux";
+    | "bandSpectralFlux"
+    | "bandSpectralCentroid";
+
+/**
+ * Band CQT function identifiers (CQT-based).
+ */
+export type BandCqtFunctionId =
+    | "bandCqtHarmonicEnergy"
+    | "bandCqtBassPitchMotion"
+    | "bandCqtTonalStability";
+
+/**
+ * Band event function identifiers (derived from 1D signals).
+ */
+export type BandEventFunctionId =
+    | "bandOnsetPeaks"
+    | "bandBeatCandidates";
 
 /**
  * Diagnostics for band MIR computation.
@@ -449,7 +467,7 @@ export type BandMirDiagnostics = {
 };
 
 /**
- * Result of a band-scoped MIR computation.
+ * Result of a band-scoped MIR computation (STFT-based).
  */
 export type BandMir1DResult = {
     kind: "bandMir1d";
@@ -469,7 +487,80 @@ export type BandMir1DResult = {
     diagnostics: BandMirDiagnostics;
 };
 
+/**
+ * Result of a band-scoped CQT computation.
+ */
+export type BandCqt1DResult = {
+    kind: "bandCqt1d";
+    /** ID of the band this result is for. */
+    bandId: string;
+    /** Label of the band (for display). */
+    bandLabel: string;
+    /** The CQT function that produced this result. */
+    fn: BandCqtFunctionId;
+    /** Frame times aligned to CQT timebase. */
+    times: Float32Array;
+    /** Signal values per frame. */
+    values: Float32Array;
+    /** Execution metadata. */
+    meta: MirRunMeta;
+    /** Diagnostics about energy retention and potential issues. */
+    diagnostics: BandMirDiagnostics;
+};
+
+/**
+ * A band event (onset peak or beat candidate within a band).
+ */
+export type BandMirEvent = {
+    /** Time in seconds. */
+    time: number;
+    /** Relative weight/strength (0-1 normalized). */
+    weight: number;
+    /** Optional beat position if beat grid exists. */
+    beatPosition?: number;
+    /** Optional beat phase if beat grid exists. */
+    beatPhase?: number;
+};
+
+/**
+ * Diagnostics for band event extraction.
+ */
+export type BandEventDiagnostics = {
+    /** Total number of events extracted. */
+    eventCount: number;
+    /** Events per second (density). */
+    eventsPerSecond: number;
+    /** Warning messages (e.g., too sparse or too dense). */
+    warnings: string[];
+};
+
+/**
+ * Result of band event extraction.
+ */
+export type BandEventsResult = {
+    kind: "bandEvents";
+    /** ID of the band this result is for. */
+    bandId: string;
+    /** Label of the band (for display). */
+    bandLabel: string;
+    /** The event function that produced this result. */
+    fn: BandEventFunctionId;
+    /** Extracted events. */
+    events: BandMirEvent[];
+    /** Source signal used for extraction (for debugging). */
+    sourceSignal?: {
+        fn: BandMirFunctionId;
+        times: Float32Array;
+        values: Float32Array;
+    };
+    /** Execution metadata. */
+    meta: MirRunMeta;
+    /** Diagnostics about extraction quality. */
+    diagnostics: BandEventDiagnostics;
+};
+
 export type MirFunctionId =
+    | "amplitudeEnvelope"
     | "spectralCentroid"
     | "spectralFlux"
     | "melSpectrogram"
@@ -691,6 +782,8 @@ export type BandProposalConfig = {
     minSalience?: number;
     /** Minimum separation in octaves between proposals. Default: 0.5. */
     minSeparationOctaves?: number;
+    /** Minimum band width (Hz). Prevents implausibly narrow proposals. Default: 20. */
+    minBandwidthHz?: number;
     /** Time window for analysis in seconds (0 = full track). Default: 0. */
     analysisWindow?: number;
 };