@libraz/libsonare 1.8.0 → 1.8.1

package/src/worklet/mixer-processor.ts

@@ -15,6 +15,7 @@ import {
   meterRingFromSharedBuffer,
   type SharedMeterRingWriter,
   type SharedSpectrumRingWriter,
+  SONARE_FLOOR_DB,
   SONARE_METER_RING_RECORD_FLOATS,
   type SonareWorkletMeterSnapshot,
   type SonareWorkletSpectrumSnapshot,
@@ -47,8 +48,8 @@ export class SonareWorkletProcessor {
    *
    * `targetId` is always the master and the four LUFS / gain-reduction fields
    * are always unavailable here — the mixer worklet does not run the
-   * K-weighting filters, and a floor value would read as silence — so both are
-   * set once rather than per interval.
+   * K-weighting filters or the engine's pre-trim input tap — so finite floor
+   * values are set once rather than per interval.
    */
   private readonly meterScratch: SonareWorkletMeterSnapshot = {
     type: 'meter',
@@ -65,6 +66,8 @@ export class SonareWorkletProcessor {
     shortTermLufs: Number.NaN,
     integratedLufs: Number.NaN,
     gainReductionDb: Number.NaN,
+    inputPeakDbL: SONARE_FLOOR_DB,
+    inputPeakDbR: SONARE_FLOOR_DB,
   };
   private spectrumRing?: SharedSpectrumRingWriter;
   private spectrumBands: Float32Array;
@@ -276,6 +279,8 @@ export class SonareWorkletProcessor {
       shortTermLufs: Number.NaN,
       integratedLufs: Number.NaN,
       gainReductionDb: Number.NaN,
+      inputPeakDbL: SONARE_FLOOR_DB,
+      inputPeakDbR: SONARE_FLOOR_DB,
     };
     // Alternative channels for one record, not a broadcast pair: a transport
     // that supplies both (the engine registration resolves both to
@@ -309,6 +314,8 @@ export class SonareWorkletProcessor {
     ring.records[offset + 11] = meter.shortTermLufs;
     ring.records[offset + 12] = meter.integratedLufs;
     ring.records[offset + 13] = meter.gainReductionDb;
+    ring.records[offset + 14] = meter.inputPeakDbL;
+    ring.records[offset + 15] = meter.inputPeakDbR;
     Atomics.store(ring.header, 0, writeIndex + 1);
     // writeIndex is a free-running monotonic counter, so an overflow guard here
     // would fire on essentially every write past the first `capacity` records
@@ -377,7 +384,7 @@ export class SonareWorkletProcessor {
       return;
     }
     const writeIndex = Atomics.load(ring.header, 0);
-    const offset = (writeIndex % ring.capacity) * ring.recordFloats;
+    const offset = (writeIndex % ring.capacity) * SONARE_METER_RING_RECORD_FLOATS;
     ring.records[offset] = encodeFrameLo(frame);
     ring.records[offset + 1] = encodeFrameHi(frame);
     ring.records[offset + 2] = bands.length;

package/src/worklet/protocol.ts

@@ -41,6 +41,10 @@ export interface SonareWorkletMeterSnapshot {
   shortTermLufs: number;
   integratedLufs: number;
   gainReductionDb: number;
+  /** Maximum pre-trim input peak for the left channel, in dBFS. */
+  inputPeakDbL: number;
+  /** Maximum pre-trim input peak for the right channel, in dBFS. */
+  inputPeakDbR: number;
 }
 
 export interface SonareWorkletSpectrumSnapshot {
@@ -52,18 +56,21 @@ export interface SonareWorkletSpectrumSnapshot {
 export const SONARE_METER_RING_HEADER_INTS = 4;
 // Record layout: [frameLo, frameHi, targetId, peakDbL, peakDbR, rmsDbL, rmsDbR,
 // correlation, truePeakDbL, truePeakDbR, momentaryLufs, shortTermLufs,
-// integratedLufs, gainReductionDb].
+// integratedLufs, gainReductionDb, inputPeakDbL, inputPeakDbR].
 // The sample-frame index is monotonically increasing and quickly exceeds the
 // 2^24 exact-integer range of a single Float32 slot (~349 s at 48 kHz), so it is
 // stored split across two Float32 lanes (low 24 bits + high bits) for exact
 // reconstruction. See encodeFrameLo/encodeFrameHi/decodeFrame.
-export const SONARE_METER_RING_RECORD_FLOATS = 14;
+export const SONARE_METER_RING_RECORD_FLOATS = 16;
 export const SONARE_SPECTRUM_RING_HEADER_INTS = 5;
 // Scope ring header: [writeIndex, capacity, recordFloats, bands, maxPoints,
 // reserved]. Record layout: [frameLo, frameHi, targetId, bandCount, pointCount,
 // band0..band(bands-1), l0, r0, l1, r1, ... (maxPoints stereo pairs)].
 export const SONARE_SCOPE_RING_HEADER_INTS = 6;
 export const SONARE_SCOPE_RING_RECORD_PREFIX_FLOATS = 5;
+/** Scope band and goniometer point counts used when a caller supplies none. */
+export const SONARE_SCOPE_DEFAULT_BANDS = 48;
+export const SONARE_SCOPE_DEFAULT_MAX_POINTS = 32;
 
 /** Base for splitting a frame index into two exactly-representable Float32 lanes. */
 const SONARE_FRAME_LANE_BASE = 0x1000000; // 2^24
@@ -121,6 +128,10 @@ export enum SonareEngineCommandType {
   // Queueable lane monitor-mode transition. The worklet command vocabulary
   // deliberately leaves 18..25 unused; this is the stable ABI-v3 ordinal.
   SetTrackMonitorMode = 26,
+  // Queueable master-meter integrated-loudness reset. Numeric value 28 mirrors
+  // rt::CommandType::kResetMasterMeterIntegrated; 27 remains the appended MIDI
+  // UMP slot command in the native vocabulary.
+  ResetMasterLoudnessMeter = 28,
 }
 
 export enum SonareEngineTelemetryType {
@@ -387,6 +398,8 @@ export function readSonareMeterRingBuffer(
       shortTermLufs: ring.records[offset + 11],
       integratedLufs: ring.records[offset + 12],
       gainReductionDb: ring.records[offset + 13],
+      inputPeakDbL: ring.records[offset + 14],
+      inputPeakDbR: ring.records[offset + 15],
     });
   }
   return { nextReadIndex: writeIndex, meters };
@@ -456,8 +469,8 @@ export function sonareScopeRingRecordFloats(bands: number, maxPoints: number): n
 
 export function sonareScopeRingBufferByteLength(
   capacity: number,
-  bands = 48,
-  maxPoints = 32,
+  bands = SONARE_SCOPE_DEFAULT_BANDS,
+  maxPoints = SONARE_SCOPE_DEFAULT_MAX_POINTS,
 ): number {
   const clampedCapacity = Math.max(1, Math.floor(capacity));
   const clampedBands = Math.max(1, Math.floor(bands));
@@ -472,8 +485,8 @@ export function sonareScopeRingBufferByteLength(
 
 export function createSonareScopeRingBuffer(
   capacity = 64,
-  bands = 48,
-  maxPoints = 32,
+  bands = SONARE_SCOPE_DEFAULT_BANDS,
+  maxPoints = SONARE_SCOPE_DEFAULT_MAX_POINTS,
 ): SonareScopeRingBuffer {
   const clampedCapacity = Math.max(1, Math.floor(capacity));
   const clampedBands = Math.max(1, Math.floor(bands));
@@ -552,8 +565,14 @@ export function scopeRingFromSharedBuffer(
   const existingBands = Atomics.load(header, 3);
   const existingMaxPoints = Atomics.load(header, 4);
   const capacity = Math.max(1, Math.floor(existingCapacity || fallbackCapacity || 1));
-  const bands = Math.max(1, Math.floor(existingBands || fallbackBands || 48));
-  const maxPoints = Math.max(0, Math.floor(existingMaxPoints || (fallbackMaxPoints ?? 32)));
+  const bands = Math.max(
+    1,
+    Math.floor(existingBands || fallbackBands || SONARE_SCOPE_DEFAULT_BANDS),
+  );
+  const maxPoints = Math.max(
+    0,
+    Math.floor(existingMaxPoints || (fallbackMaxPoints ?? SONARE_SCOPE_DEFAULT_MAX_POINTS)),
+  );
   const recordFloats = sonareScopeRingRecordFloats(bands, maxPoints);
   const minBytes = sonareScopeRingBufferByteLength(capacity, bands, maxPoints);
   if (sharedBuffer.byteLength < minBytes) {
@@ -1102,6 +1121,8 @@ export function meterFromEngine(meter: EngineMeterTelemetry): SonareWorkletMeter
     shortTermLufs: meter.shortTermLufs,
     integratedLufs: meter.integratedLufs,
     gainReductionDb: meter.gainReductionDb,
+    inputPeakDbL: meter.inputPeakDbL,
+    inputPeakDbR: meter.inputPeakDbR,
   };
 }