forked from Blendman974/faceclaw
Merge branch 'microphone-fixes'
This commit is contained in:
commit
f7fa4addc0
9 files changed
+665
-51
No files matched your search
@@ -12,8 +12,8 @@
|
||||
*
|
||||
* Per-temple: each arm is its own endpoint and its own 2-mic array (front
|
||||
* mic near the hinge = chanMask bit0, rear mic near the touchpad = bit1);
|
||||
* the same config goes to both temples. Stereo payloads arrive as two
|
||||
* CONCATENATED channel blocks (front then rear), not interleaved. Sessions
|
||||
* the same config goes to both temples. Stereo payloads are INTERLEAVED PCM16
|
||||
* (ch0, ch1, ch0, ch1, ...), the capture dispatch buffer verbatim. Sessions
|
||||
* hold a 90 s lease; renew with op RENEW while streaming.
|
||||
*
|
||||
* Pure module: byte codecs only, no platform imports (the BLE plumbing lives
|
||||
@@ -54,7 +54,7 @@ export type MicConfig = {
|
||||
/**
|
||||
* Host-side per-microphone selection. Each temple streams its full
|
||||
* front+rear stereo pair over BLE (wire channelMask stays 0b11); the phone
|
||||
* splits the concatenated channels and this mask decides which of the four
|
||||
* deinterleaves the channels and this mask decides which of the four
|
||||
* mics feed levels-for-use, beamforming, captions, and recording. A temple
|
||||
* with both mics off is sent STOP so its stream doesn't waste bandwidth.
|
||||
*/
|
||||
@@ -168,8 +168,42 @@ export type MicStatus = {
|
||||
framesEmitted: number;
|
||||
/** The rate actually in effect (16 kHz on current firmware). */
|
||||
effectiveRateHz: number;
|
||||
/** Tap diagnostics; absent from firmware that sends only the 21-byte body. */
|
||||
diagnostics: MicStatusDiagnostics | null;
|
||||
};
|
||||
|
||||
/** Result of a firmware call the temple has not made yet. */
|
||||
export const MIC_RET_NONE = 127;
|
||||
|
||||
/** Occupant of one stock PCM app slot. */
|
||||
export type MicSlotState = "empty" | "other" | "tap";
|
||||
|
||||
/**
|
||||
* Counters from the status extension; they reset on each CONFIGURE. The
|
||||
* firmware debug overlay shows the same values on each lens.
|
||||
*/
|
||||
export type MicStatusDiagnostics = {
|
||||
/** Calls into the PCM tap (any outcome). */
|
||||
tapCalls: number;
|
||||
tapLastBytes: number;
|
||||
tapLastSlot: number;
|
||||
/** Tap calls dropped because the session was inactive or unarmed. */
|
||||
skipIdle: number;
|
||||
/** Tap calls dropped because the streaming lease had lapsed. */
|
||||
skipLease: number;
|
||||
/** Tap calls dropped because the frame buffer allocation failed. */
|
||||
skipAlloc: number;
|
||||
/** Signed firmware results, or MIC_RET_NONE when not called yet. */
|
||||
registerResult: number;
|
||||
unregisterResult: number;
|
||||
notifyResult: number;
|
||||
/** Stock PCM slot table, read live: [slot 0, slot 1]. */
|
||||
slots: [MicSlotState, MicSlotState];
|
||||
leaseRemainingS: number;
|
||||
};
|
||||
|
||||
const MIC_STATUS_DIAGNOSTICS_BYTES = 40;
|
||||
|
||||
function le16(data: Uint8Array, offset: number): number {
|
||||
return data[offset]! | (data[offset + 1]! << 8);
|
||||
}
|
||||
@@ -210,6 +244,27 @@ export function decodeMicStatus(body: Uint8Array): MicStatus | null {
|
||||
side: body[14] === 2 ? "left" : "right",
|
||||
framesEmitted: le32(body, 15),
|
||||
effectiveRateHz: le16(body, 19) * 100,
|
||||
diagnostics: body.length >= MIC_STATUS_DIAGNOSTICS_BYTES ? decodeMicDiagnostics(body) : null,
|
||||
};
|
||||
}
|
||||
|
||||
const SLOT_STATES: MicSlotState[] = ["empty", "other", "tap", "other"];
|
||||
|
||||
function decodeMicDiagnostics(body: Uint8Array): MicStatusDiagnostics {
|
||||
const s8 = (offset: number) => (body[offset]! >= 0x80 ? body[offset]! - 0x100 : body[offset]!);
|
||||
const table = body[37]!;
|
||||
return {
|
||||
tapCalls: le32(body, 21),
|
||||
tapLastBytes: le16(body, 25),
|
||||
tapLastSlot: body[27]!,
|
||||
skipIdle: le16(body, 28),
|
||||
skipLease: le16(body, 30),
|
||||
skipAlloc: le16(body, 32),
|
||||
registerResult: s8(34),
|
||||
unregisterResult: s8(35),
|
||||
notifyResult: s8(36),
|
||||
slots: [SLOT_STATES[table & 3]!, SLOT_STATES[(table >> 2) & 3]!],
|
||||
leaseRemainingS: le16(body, 38),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -260,25 +315,26 @@ export function decodeMicStreamFrame(data: Uint8Array): MicStreamFrame | null {
|
||||
|
||||
/**
|
||||
* Split a raw PCM16 SM payload into per-channel Float32Arrays in [-1, 1].
|
||||
* Channels arrive as CONCATENATED blocks (front then rear), matching the
|
||||
* firmware's stereo callback, which dispatches two back-to-back extraction
|
||||
* results rather than interleaving.
|
||||
* Channels arrive INTERLEAVED: the firmware forwards the stock capture
|
||||
* dispatch buffer, which the stock algo reads as ch0 = pcm[2i], ch1 =
|
||||
* pcm[2i+1] (in samples). Channel 0 is assumed to be the front mic; that
|
||||
* mapping is not yet confirmed on hardware.
|
||||
*/
|
||||
export function splitConcatenatedPcm16(frame: MicStreamFrame): Float32Array[] | null {
|
||||
export function splitInterleavedPcm16(frame: MicStreamFrame): Float32Array[] | null {
|
||||
if (frame.codec !== "raw" || frame.format !== "pcm16" || frame.channelCount < 1) {
|
||||
return null;
|
||||
}
|
||||
const channels = frame.channelCount;
|
||||
const bytesPerChannel = Math.floor(frame.payload.length / channels) & ~1;
|
||||
const samplesPerChannel = bytesPerChannel / 2;
|
||||
const frameBytes = channels * 2;
|
||||
const samplesPerChannel = Math.floor(frame.payload.length / frameBytes);
|
||||
if (samplesPerChannel <= 0) return null;
|
||||
const out: Float32Array[] = [];
|
||||
for (let channel = 0; channel < channels; channel++) {
|
||||
const base = channel * bytesPerChannel;
|
||||
const samples = new Float32Array(samplesPerChannel);
|
||||
for (let index = 0; index < samplesPerChannel; index++) {
|
||||
const lo = frame.payload[base + index * 2]!;
|
||||
const hi = frame.payload[base + index * 2 + 1]!;
|
||||
const offset = index * frameBytes + channel * 2;
|
||||
const lo = frame.payload[offset]!;
|
||||
const hi = frame.payload[offset + 1]!;
|
||||
let value = lo | (hi << 8);
|
||||
if (value >= 0x8000) value -= 0x10000;
|
||||
samples[index] = value / 32768;
|
||||
|
||||
@@ -23,7 +23,7 @@ import {
|
||||
isStockAudioPacket,
|
||||
micChannelKey,
|
||||
micChannelLabel,
|
||||
splitConcatenatedPcm16,
|
||||
splitInterleavedPcm16,
|
||||
templeActive,
|
||||
type MicChannelKey,
|
||||
type MicConfig,
|
||||
@@ -586,7 +586,7 @@ class MicSession {
|
||||
return;
|
||||
}
|
||||
const side: MicSide = arm === "L" ? "left" : "right";
|
||||
const channels = splitConcatenatedPcm16(frame);
|
||||
const channels = splitInterleavedPcm16(frame);
|
||||
if (!channels || channels.length === 0) return;
|
||||
|
||||
// Meter every arriving channel — a host-disabled mic still shows its
|
||||
|
||||
Reference in new issue
Block a user