@livekit/rtc-node 0.13.24 → 0.13.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/audio_filter.cjs +2 -2
- package/dist/audio_filter.cjs.map +1 -1
- package/dist/audio_filter.js +1 -1
- package/dist/audio_filter.js.map +1 -1
- package/dist/audio_frame.cjs +9 -5
- package/dist/audio_frame.cjs.map +1 -1
- package/dist/audio_frame.d.cts +2 -7
- package/dist/audio_frame.d.ts +2 -7
- package/dist/audio_frame.d.ts.map +1 -1
- package/dist/audio_frame.js +8 -4
- package/dist/audio_frame.js.map +1 -1
- package/dist/audio_mixer.cjs +1 -1
- package/dist/audio_mixer.cjs.map +1 -1
- package/dist/audio_mixer.d.cts +1 -6
- package/dist/audio_mixer.d.ts +1 -6
- package/dist/audio_mixer.js +1 -1
- package/dist/audio_mixer.js.map +1 -1
- package/dist/audio_resampler.cjs +20 -12
- package/dist/audio_resampler.cjs.map +1 -1
- package/dist/audio_resampler.d.cts +6 -6
- package/dist/audio_resampler.d.ts +6 -6
- package/dist/audio_resampler.d.ts.map +1 -1
- package/dist/audio_resampler.js +12 -4
- package/dist/audio_resampler.js.map +1 -1
- package/dist/audio_source.cjs +11 -7
- package/dist/audio_source.cjs.map +1 -1
- package/dist/audio_source.d.cts +1 -7
- package/dist/audio_source.d.ts +1 -7
- package/dist/audio_source.d.ts.map +1 -1
- package/dist/audio_source.js +8 -3
- package/dist/audio_source.js.map +1 -1
- package/dist/audio_stream.cjs +16 -6
- package/dist/audio_stream.cjs.map +1 -1
- package/dist/audio_stream.d.cts +1 -14
- package/dist/audio_stream.d.ts +1 -14
- package/dist/audio_stream.d.ts.map +1 -1
- package/dist/audio_stream.js +15 -5
- package/dist/audio_stream.js.map +1 -1
- package/dist/data_streams/index.d.cts +2 -10
- package/dist/data_streams/index.d.ts +2 -10
- package/dist/data_streams/stream_reader.cjs +8 -0
- package/dist/data_streams/stream_reader.cjs.map +1 -1
- package/dist/data_streams/stream_reader.d.cts +2 -10
- package/dist/data_streams/stream_reader.d.ts +2 -10
- package/dist/data_streams/stream_reader.d.ts.map +1 -1
- package/dist/data_streams/stream_reader.js +8 -0
- package/dist/data_streams/stream_reader.js.map +1 -1
- package/dist/data_streams/stream_writer.d.cts +2 -10
- package/dist/data_streams/stream_writer.d.ts +2 -10
- package/dist/data_streams/types.cjs.map +1 -1
- package/dist/data_streams/types.d.cts +2 -10
- package/dist/data_streams/types.d.ts +2 -10
- package/dist/data_streams/types.d.ts.map +1 -1
- package/dist/e2ee.cjs +21 -21
- package/dist/e2ee.cjs.map +1 -1
- package/dist/e2ee.d.cts +1 -2
- package/dist/e2ee.d.ts +1 -2
- package/dist/e2ee.d.ts.map +1 -1
- package/dist/e2ee.js +2 -2
- package/dist/e2ee.js.map +1 -1
- package/dist/ffi_client.cjs +11 -12
- package/dist/ffi_client.cjs.map +1 -1
- package/dist/ffi_client.d.cts +3 -16
- package/dist/ffi_client.d.ts +3 -16
- package/dist/ffi_client.d.ts.map +1 -1
- package/dist/ffi_client.js +5 -3
- package/dist/ffi_client.js.map +1 -1
- package/dist/frame_processor.cjs +13 -2
- package/dist/frame_processor.cjs.map +1 -1
- package/dist/frame_processor.d.cts +5 -8
- package/dist/frame_processor.d.ts +5 -8
- package/dist/frame_processor.d.ts.map +1 -1
- package/dist/frame_processor.js +10 -1
- package/dist/frame_processor.js.map +1 -1
- package/dist/index.cjs +25 -23
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +3 -16
- package/dist/index.d.ts +3 -16
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -7
- package/dist/index.js.map +1 -1
- package/dist/participant.cjs +38 -38
- package/dist/participant.cjs.map +1 -1
- package/dist/participant.d.cts +2 -15
- package/dist/participant.d.ts +2 -15
- package/dist/participant.d.ts.map +1 -1
- package/dist/participant.js +12 -12
- package/dist/participant.js.map +1 -1
- package/dist/room.cjs +14 -14
- package/dist/room.cjs.map +1 -1
- package/dist/room.d.cts +2 -15
- package/dist/room.d.ts +2 -15
- package/dist/room.d.ts.map +1 -1
- package/dist/room.js +10 -10
- package/dist/room.js.map +1 -1
- package/dist/rpc.cjs.map +1 -1
- package/dist/rpc.d.cts +1 -2
- package/dist/rpc.d.ts +1 -2
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js.map +1 -1
- package/dist/{stream_reader-Ch2zvjU3.d.cts → stream_reader-CuG4b8Y-.d.cts} +1 -1
- package/dist/{stream_reader-DRyR29vo.d.ts → stream_reader-CuG4b8Y-.d.ts} +1 -1
- package/dist/track.cjs +3 -3
- package/dist/track.cjs.map +1 -1
- package/dist/track.d.cts +1 -14
- package/dist/track.d.ts +1 -14
- package/dist/track.d.ts.map +1 -1
- package/dist/track.js +1 -1
- package/dist/track.js.map +1 -1
- package/dist/track_publication.cjs +4 -4
- package/dist/track_publication.cjs.map +1 -1
- package/dist/track_publication.d.cts +1 -14
- package/dist/track_publication.d.ts +1 -14
- package/dist/track_publication.d.ts.map +1 -1
- package/dist/track_publication.js +2 -2
- package/dist/track_publication.js.map +1 -1
- package/dist/version.cjs +1 -1
- package/dist/version.cjs.map +1 -1
- package/dist/version.d.cts +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dist/version.js.map +1 -1
- package/dist/video_frame.cjs +42 -42
- package/dist/video_frame.cjs.map +1 -1
- package/dist/video_frame.d.cts +1 -6
- package/dist/video_frame.d.ts +1 -6
- package/dist/video_frame.d.ts.map +1 -1
- package/dist/video_frame.js +2 -2
- package/dist/video_frame.js.map +1 -1
- package/dist/video_source.cjs +5 -5
- package/dist/video_source.cjs.map +1 -1
- package/dist/video_source.d.cts +1 -14
- package/dist/video_source.d.ts +1 -14
- package/dist/video_source.d.ts.map +1 -1
- package/dist/video_source.js +2 -2
- package/dist/video_source.js.map +1 -1
- package/dist/video_stream.cjs +12 -4
- package/dist/video_stream.cjs.map +1 -1
- package/dist/video_stream.d.cts +1 -14
- package/dist/video_stream.d.ts +1 -14
- package/dist/video_stream.d.ts.map +1 -1
- package/dist/video_stream.js +10 -2
- package/dist/video_stream.js.map +1 -1
- package/package.json +7 -37
- package/src/audio_filter.ts +2 -2
- package/src/audio_frame.ts +17 -5
- package/src/audio_mixer.ts +1 -1
- package/src/audio_resampler.ts +14 -4
- package/src/audio_source.ts +13 -5
- package/src/audio_stream.ts +21 -6
- package/src/data_streams/stream_reader.ts +19 -1
- package/src/data_streams/types.ts +1 -1
- package/src/e2ee.ts +3 -3
- package/src/ffi_client.ts +7 -5
- package/src/frame_processor.ts +21 -0
- package/src/index.ts +6 -5
- package/src/participant.ts +17 -17
- package/src/room.ts +22 -22
- package/src/rpc.ts +1 -1
- package/src/tests/e2e.test.ts +11 -8
- package/src/track.ts +4 -4
- package/src/track_publication.ts +6 -6
- package/src/version.ts +1 -1
- package/src/video_frame.ts +3 -3
- package/src/video_source.ts +3 -3
- package/src/video_stream.ts +15 -3
- package/Cargo.toml +0 -25
- package/build.rs +0 -9
- package/dist/napi/native.cjs +0 -301
- package/dist/napi/native.d.cjs +0 -17
- package/dist/napi/native.d.cjs.map +0 -1
- package/dist/napi/native.d.d.cts +0 -21
- package/dist/napi/native.d.d.ts +0 -21
- package/dist/napi/native.d.js +0 -1
- package/dist/napi/native.d.js.map +0 -1
- package/dist/napi/native.d.ts +0 -19
- package/dist/napi/native.js +0 -15
- package/dist/native.cjs +0 -301
- package/dist/native.d.ts +0 -19
- package/dist/native.js +0 -15
- package/dist/proto/audio_frame_pb.cjs +0 -1357
- package/dist/proto/audio_frame_pb.cjs.map +0 -1
- package/dist/proto/audio_frame_pb.d.cts +0 -1183
- package/dist/proto/audio_frame_pb.d.ts +0 -1183
- package/dist/proto/audio_frame_pb.d.ts.map +0 -1
- package/dist/proto/audio_frame_pb.js +0 -1283
- package/dist/proto/audio_frame_pb.js.map +0 -1
- package/dist/proto/data_stream_pb.cjs +0 -1638
- package/dist/proto/data_stream_pb.cjs.map +0 -1
- package/dist/proto/data_stream_pb.d.cts +0 -1449
- package/dist/proto/data_stream_pb.d.ts +0 -1449
- package/dist/proto/data_stream_pb.d.ts.map +0 -1
- package/dist/proto/data_stream_pb.js +0 -1559
- package/dist/proto/data_stream_pb.js.map +0 -1
- package/dist/proto/e2ee_pb.cjs +0 -746
- package/dist/proto/e2ee_pb.cjs.map +0 -1
- package/dist/proto/e2ee_pb.d.cts +0 -653
- package/dist/proto/e2ee_pb.d.ts +0 -653
- package/dist/proto/e2ee_pb.d.ts.map +0 -1
- package/dist/proto/e2ee_pb.js +0 -696
- package/dist/proto/e2ee_pb.js.map +0 -1
- package/dist/proto/ffi_pb.cjs +0 -477
- package/dist/proto/ffi_pb.cjs.map +0 -1
- package/dist/proto/ffi_pb.d.cts +0 -1321
- package/dist/proto/ffi_pb.d.ts +0 -1321
- package/dist/proto/ffi_pb.d.ts.map +0 -1
- package/dist/proto/ffi_pb.js +0 -444
- package/dist/proto/ffi_pb.js.map +0 -1
- package/dist/proto/handle_pb.cjs +0 -53
- package/dist/proto/handle_pb.cjs.map +0 -1
- package/dist/proto/handle_pb.d.cts +0 -31
- package/dist/proto/handle_pb.d.ts +0 -31
- package/dist/proto/handle_pb.d.ts.map +0 -1
- package/dist/proto/handle_pb.js +0 -29
- package/dist/proto/handle_pb.js.map +0 -1
- package/dist/proto/participant_pb.cjs +0 -173
- package/dist/proto/participant_pb.cjs.map +0 -1
- package/dist/proto/participant_pb.d.cts +0 -218
- package/dist/proto/participant_pb.d.ts +0 -218
- package/dist/proto/participant_pb.d.ts.map +0 -1
- package/dist/proto/participant_pb.js +0 -145
- package/dist/proto/participant_pb.js.map +0 -1
- package/dist/proto/room_pb.cjs +0 -3374
- package/dist/proto/room_pb.cjs.map +0 -1
- package/dist/proto/room_pb.d.cts +0 -3028
- package/dist/proto/room_pb.d.ts +0 -3028
- package/dist/proto/room_pb.d.ts.map +0 -1
- package/dist/proto/room_pb.js +0 -3232
- package/dist/proto/room_pb.js.map +0 -1
- package/dist/proto/rpc_pb.cjs +0 -328
- package/dist/proto/rpc_pb.cjs.map +0 -1
- package/dist/proto/rpc_pb.d.cts +0 -267
- package/dist/proto/rpc_pb.d.ts +0 -267
- package/dist/proto/rpc_pb.d.ts.map +0 -1
- package/dist/proto/rpc_pb.js +0 -294
- package/dist/proto/rpc_pb.js.map +0 -1
- package/dist/proto/stats_pb.cjs +0 -1370
- package/dist/proto/stats_pb.cjs.map +0 -1
- package/dist/proto/stats_pb.d.cts +0 -1764
- package/dist/proto/stats_pb.d.ts +0 -1764
- package/dist/proto/stats_pb.d.ts.map +0 -1
- package/dist/proto/stats_pb.js +0 -1300
- package/dist/proto/stats_pb.js.map +0 -1
- package/dist/proto/track_pb.cjs +0 -630
- package/dist/proto/track_pb.cjs.map +0 -1
- package/dist/proto/track_pb.d.cts +0 -542
- package/dist/proto/track_pb.d.ts +0 -542
- package/dist/proto/track_pb.d.ts.map +0 -1
- package/dist/proto/track_pb.js +0 -584
- package/dist/proto/track_pb.js.map +0 -1
- package/dist/proto/track_publication_pb.cjs +0 -194
- package/dist/proto/track_publication_pb.cjs.map +0 -1
- package/dist/proto/track_publication_pb.d.cts +0 -135
- package/dist/proto/track_publication_pb.d.ts +0 -135
- package/dist/proto/track_publication_pb.d.ts.map +0 -1
- package/dist/proto/track_publication_pb.js +0 -164
- package/dist/proto/track_publication_pb.js.map +0 -1
- package/dist/proto/video_frame_pb.cjs +0 -723
- package/dist/proto/video_frame_pb.cjs.map +0 -1
- package/dist/proto/video_frame_pb.d.cts +0 -667
- package/dist/proto/video_frame_pb.d.ts +0 -667
- package/dist/proto/video_frame_pb.d.ts.map +0 -1
- package/dist/proto/video_frame_pb.js +0 -673
- package/dist/proto/video_frame_pb.js.map +0 -1
- package/src/lib.rs +0 -9
- package/src/napi/native.cjs +0 -301
- package/src/napi/native.d.ts +0 -19
- package/src/napi/native.js +0 -15
- package/src/nodejs.rs +0 -134
- package/src/proto/audio_frame_pb.ts +0 -2270
- package/src/proto/data_stream_pb.ts +0 -2674
- package/src/proto/e2ee_pb.ts +0 -1231
- package/src/proto/ffi_pb.ts +0 -1700
- package/src/proto/handle_pb.ts +0 -69
- package/src/proto/participant_pb.ts +0 -351
- package/src/proto/room_pb.ts +0 -5661
- package/src/proto/rpc_pb.ts +0 -539
- package/src/proto/stats_pb.ts +0 -3050
- package/src/proto/track_pb.ts +0 -1040
- package/src/proto/track_publication_pb.ts +0 -284
- package/src/proto/video_frame_pb.ts +0 -1236
package/dist/audio_filter.cjs
CHANGED
|
@@ -21,11 +21,11 @@ __export(audio_filter_exports, {
|
|
|
21
21
|
AudioFilter: () => AudioFilter
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(audio_filter_exports);
|
|
24
|
+
var import_rtc_ffi_bindings = require("@livekit/rtc-ffi-bindings");
|
|
24
25
|
var import_ffi_client = require("./ffi_client.cjs");
|
|
25
|
-
var import_audio_frame_pb = require("./proto/audio_frame_pb.cjs");
|
|
26
26
|
class AudioFilter {
|
|
27
27
|
constructor(moduleId, path, dependencies = []) {
|
|
28
|
-
const req = new
|
|
28
|
+
const req = new import_rtc_ffi_bindings.LoadAudioFilterPluginRequest({
|
|
29
29
|
moduleId,
|
|
30
30
|
pluginPath: path,
|
|
31
31
|
dependencies
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/audio_filter.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport {
|
|
1
|
+
{"version":3,"sources":["../src/audio_filter.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type { LoadAudioFilterPluginResponse } from '@livekit/rtc-ffi-bindings';\nimport { LoadAudioFilterPluginRequest } from '@livekit/rtc-ffi-bindings';\nimport { FfiClient } from './ffi_client.js';\n\nexport class AudioFilter {\n constructor(moduleId: string, path: string, dependencies: string[] = []) {\n const req = new LoadAudioFilterPluginRequest({\n moduleId,\n pluginPath: path,\n dependencies,\n });\n\n const res = FfiClient.instance.request<LoadAudioFilterPluginResponse>({\n message: {\n case: 'loadAudioFilterPlugin',\n value: req,\n },\n });\n\n if (res.error) {\n throw new Error(`Failed to initialize audio filter: ${res.error}`);\n }\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,8BAA6C;AAC7C,wBAA0B;AAEnB,MAAM,YAAY;AAAA,EACvB,YAAY,UAAkB,MAAc,eAAyB,CAAC,GAAG;AACvE,UAAM,MAAM,IAAI,qDAA6B;AAAA,MAC3C;AAAA,MACA,YAAY;AAAA,MACZ;AAAA,IACF,CAAC;AAED,UAAM,MAAM,4BAAU,SAAS,QAAuC;AAAA,MACpE,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,QAAI,IAAI,OAAO;AACb,YAAM,IAAI,MAAM,sCAAsC,IAAI,KAAK,EAAE;AAAA,IACnE;AAAA,EACF;AACF;","names":[]}
|
package/dist/audio_filter.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import { LoadAudioFilterPluginRequest } from "@livekit/rtc-ffi-bindings";
|
|
1
2
|
import { FfiClient } from "./ffi_client.js";
|
|
2
|
-
import { LoadAudioFilterPluginRequest } from "./proto/audio_frame_pb.js";
|
|
3
3
|
class AudioFilter {
|
|
4
4
|
constructor(moduleId, path, dependencies = []) {
|
|
5
5
|
const req = new LoadAudioFilterPluginRequest({
|
package/dist/audio_filter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/audio_filter.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport {
|
|
1
|
+
{"version":3,"sources":["../src/audio_filter.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type { LoadAudioFilterPluginResponse } from '@livekit/rtc-ffi-bindings';\nimport { LoadAudioFilterPluginRequest } from '@livekit/rtc-ffi-bindings';\nimport { FfiClient } from './ffi_client.js';\n\nexport class AudioFilter {\n constructor(moduleId: string, path: string, dependencies: string[] = []) {\n const req = new LoadAudioFilterPluginRequest({\n moduleId,\n pluginPath: path,\n dependencies,\n });\n\n const res = FfiClient.instance.request<LoadAudioFilterPluginResponse>({\n message: {\n case: 'loadAudioFilterPlugin',\n value: req,\n },\n });\n\n if (res.error) {\n throw new Error(`Failed to initialize audio filter: ${res.error}`);\n }\n }\n}\n"],"mappings":"AAIA,SAAS,oCAAoC;AAC7C,SAAS,iBAAiB;AAEnB,MAAM,YAAY;AAAA,EACvB,YAAY,UAAkB,MAAc,eAAyB,CAAC,GAAG;AACvE,UAAM,MAAM,IAAI,6BAA6B;AAAA,MAC3C;AAAA,MACA,YAAY;AAAA,MACZ;AAAA,IACF,CAAC;AAED,UAAM,MAAM,UAAU,SAAS,QAAuC;AAAA,MACpE,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,QAAI,IAAI,OAAO;AACb,YAAM,IAAI,MAAM,sCAAsC,IAAI,KAAK,EAAE;AAAA,IACnE;AAAA,EACF;AACF;","names":[]}
|
package/dist/audio_frame.cjs
CHANGED
|
@@ -22,8 +22,8 @@ __export(audio_frame_exports, {
|
|
|
22
22
|
combineAudioFrames: () => combineAudioFrames
|
|
23
23
|
});
|
|
24
24
|
module.exports = __toCommonJS(audio_frame_exports);
|
|
25
|
+
var import_rtc_ffi_bindings = require("@livekit/rtc-ffi-bindings");
|
|
25
26
|
var import_ffi_client = require("./ffi_client.cjs");
|
|
26
|
-
var import_audio_frame_pb = require("./proto/audio_frame_pb.cjs");
|
|
27
27
|
class AudioFrame {
|
|
28
28
|
// note: if converting from Uint8Array to Int16Array, *do not* use buffer.slice!
|
|
29
29
|
// it is marked unstable by Node and can cause undefined behaviour, such as massive chunks of
|
|
@@ -37,9 +37,9 @@ class AudioFrame {
|
|
|
37
37
|
this.samplesPerChannel = samplesPerChannel;
|
|
38
38
|
this._userdata = userdata;
|
|
39
39
|
}
|
|
40
|
-
static create(sampleRate, channels, samplesPerChannel) {
|
|
40
|
+
static create(sampleRate, channels, samplesPerChannel, userdata) {
|
|
41
41
|
const data = new Int16Array(channels * samplesPerChannel);
|
|
42
|
-
return new AudioFrame(data, sampleRate, channels, samplesPerChannel);
|
|
42
|
+
return new AudioFrame(data, sampleRate, channels, samplesPerChannel, userdata);
|
|
43
43
|
}
|
|
44
44
|
/** @internal */
|
|
45
45
|
static fromOwnedInfo(owned) {
|
|
@@ -56,7 +56,7 @@ class AudioFrame {
|
|
|
56
56
|
}
|
|
57
57
|
/** @internal */
|
|
58
58
|
protoInfo() {
|
|
59
|
-
return new
|
|
59
|
+
return new import_rtc_ffi_bindings.AudioFrameBufferInfo({
|
|
60
60
|
dataPtr: import_ffi_client.FfiClient.instance.retrievePtr(new Uint8Array(this.data.buffer)),
|
|
61
61
|
sampleRate: this.sampleRate,
|
|
62
62
|
numChannels: this.channels,
|
|
@@ -89,7 +89,11 @@ const combineAudioFrames = (buffer) => {
|
|
|
89
89
|
totalSamplesPerChannel += frame.samplesPerChannel;
|
|
90
90
|
}
|
|
91
91
|
const data = new Int16Array(buffer.map((x) => [...x.data]).flat());
|
|
92
|
-
|
|
92
|
+
const mergedUserdata = {};
|
|
93
|
+
for (const frame of buffer) {
|
|
94
|
+
Object.assign(mergedUserdata, frame.userdata);
|
|
95
|
+
}
|
|
96
|
+
return new AudioFrame(data, sampleRate, channels, totalSamplesPerChannel, mergedUserdata);
|
|
93
97
|
};
|
|
94
98
|
// Annotate the CommonJS export names for ESM import in node:
|
|
95
99
|
0 && (module.exports = {
|
package/dist/audio_frame.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/audio_frame.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport {
|
|
1
|
+
{"version":3,"sources":["../src/audio_frame.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type { OwnedAudioFrameBuffer } from '@livekit/rtc-ffi-bindings';\nimport { AudioFrameBufferInfo } from '@livekit/rtc-ffi-bindings';\nimport { FfiClient, FfiHandle } from './ffi_client.js';\n\nexport class AudioFrame {\n data: Int16Array;\n sampleRate: number;\n channels: number;\n samplesPerChannel: number;\n\n private _userdata: Record<string, unknown>;\n\n // note: if converting from Uint8Array to Int16Array, *do not* use buffer.slice!\n // it is marked unstable by Node and can cause undefined behaviour, such as massive chunks of\n // noise being added to the end.\n // it is recommended to use buffer.subarray instead.\n // XXX(nbsp): add this when writing proper docs\n constructor(\n data: Int16Array,\n sampleRate: number,\n channels: number,\n samplesPerChannel: number,\n userdata: Record<string, unknown> = {},\n ) {\n this.data = data;\n this.sampleRate = sampleRate;\n this.channels = channels;\n this.samplesPerChannel = samplesPerChannel;\n this._userdata = userdata;\n }\n\n static create(\n sampleRate: number,\n channels: number,\n samplesPerChannel: number,\n userdata?: Record<string, unknown>,\n ): AudioFrame {\n const data = new Int16Array(channels * samplesPerChannel);\n return new AudioFrame(data, sampleRate, channels, samplesPerChannel, userdata);\n }\n\n /** @internal */\n static fromOwnedInfo(owned: OwnedAudioFrameBuffer): AudioFrame {\n const info = owned.info!;\n const len = info.numChannels! * info.samplesPerChannel! * 2; // c_int16\n const data = FfiClient.instance.copyBuffer(info.dataPtr!, len);\n new FfiHandle(owned.handle!.id!).dispose();\n return new AudioFrame(\n new Int16Array(data.buffer),\n info.sampleRate!,\n info.numChannels!,\n info.samplesPerChannel!,\n );\n }\n\n /** @internal */\n protoInfo(): AudioFrameBufferInfo {\n return new AudioFrameBufferInfo({\n dataPtr: FfiClient.instance.retrievePtr(new Uint8Array(this.data.buffer)),\n sampleRate: this.sampleRate,\n numChannels: this.channels,\n samplesPerChannel: this.samplesPerChannel,\n });\n }\n\n /** Returns the user data associated with the audio frame. */\n get userdata() {\n return this._userdata;\n }\n}\n\n/**\n * Combines one or more `rtc.AudioFrame` objects into a single `rtc.AudioFrame`.\n *\n * This function concatenates the audio data from multiple frames, ensuring that all frames have\n * the same sample rate and number of channels. It efficiently merges the data by preallocating the\n * necessary memory and copying the frame data without unnecessary reallocations.\n *\n * @param buffer - a single AudioFrame or list thereof\n */\nexport const combineAudioFrames = (buffer: AudioFrame | AudioFrame[]): AudioFrame => {\n if (!Array.isArray(buffer)) {\n return buffer;\n }\n buffer = buffer as AudioFrame[];\n\n if (buffer.length === 0) {\n throw new Error('buffer is empty');\n }\n\n const sampleRate = buffer[0]!.sampleRate;\n const channels = buffer[0]!.channels;\n\n let totalSamplesPerChannel = 0;\n for (const frame of buffer) {\n if (frame.sampleRate != sampleRate) {\n throw new Error(`sample rate mismatch: expected ${sampleRate}, got ${frame.sampleRate}`);\n }\n\n if (frame.channels != channels) {\n throw new Error(`channel mismatch: expected ${channels}, got ${frame.channels}`);\n }\n\n totalSamplesPerChannel += frame.samplesPerChannel;\n }\n\n const data = new Int16Array(buffer.map((x) => [...x.data]).flat());\n\n // Merge userdata from all frames\n const mergedUserdata: Record<string, unknown> = {};\n for (const frame of buffer) {\n Object.assign(mergedUserdata, frame.userdata);\n }\n\n return new AudioFrame(data, sampleRate, channels, totalSamplesPerChannel, mergedUserdata);\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,8BAAqC;AACrC,wBAAqC;AAE9B,MAAM,WAAW;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAatB,YACE,MACA,YACA,UACA,mBACA,WAAoC,CAAC,GACrC;AACA,SAAK,OAAO;AACZ,SAAK,aAAa;AAClB,SAAK,WAAW;AAChB,SAAK,oBAAoB;AACzB,SAAK,YAAY;AAAA,EACnB;AAAA,EAEA,OAAO,OACL,YACA,UACA,mBACA,UACY;AACZ,UAAM,OAAO,IAAI,WAAW,WAAW,iBAAiB;AACxD,WAAO,IAAI,WAAW,MAAM,YAAY,UAAU,mBAAmB,QAAQ;AAAA,EAC/E;AAAA;AAAA,EAGA,OAAO,cAAc,OAA0C;AAC7D,UAAM,OAAO,MAAM;AACnB,UAAM,MAAM,KAAK,cAAe,KAAK,oBAAqB;AAC1D,UAAM,OAAO,4BAAU,SAAS,WAAW,KAAK,SAAU,GAAG;AAC7D,QAAI,4BAAU,MAAM,OAAQ,EAAG,EAAE,QAAQ;AACzC,WAAO,IAAI;AAAA,MACT,IAAI,WAAW,KAAK,MAAM;AAAA,MAC1B,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,IACP;AAAA,EACF;AAAA;AAAA,EAGA,YAAkC;AAChC,WAAO,IAAI,6CAAqB;AAAA,MAC9B,SAAS,4BAAU,SAAS,YAAY,IAAI,WAAW,KAAK,KAAK,MAAM,CAAC;AAAA,MACxE,YAAY,KAAK;AAAA,MACjB,aAAa,KAAK;AAAA,MAClB,mBAAmB,KAAK;AAAA,IAC1B,CAAC;AAAA,EACH;AAAA;AAAA,EAGA,IAAI,WAAW;AACb,WAAO,KAAK;AAAA,EACd;AACF;AAWO,MAAM,qBAAqB,CAAC,WAAkD;AACnF,MAAI,CAAC,MAAM,QAAQ,MAAM,GAAG;AAC1B,WAAO;AAAA,EACT;AACA,WAAS;AAET,MAAI,OAAO,WAAW,GAAG;AACvB,UAAM,IAAI,MAAM,iBAAiB;AAAA,EACnC;AAEA,QAAM,aAAa,OAAO,CAAC,EAAG;AAC9B,QAAM,WAAW,OAAO,CAAC,EAAG;AAE5B,MAAI,yBAAyB;AAC7B,aAAW,SAAS,QAAQ;AAC1B,QAAI,MAAM,cAAc,YAAY;AAClC,YAAM,IAAI,MAAM,kCAAkC,UAAU,SAAS,MAAM,UAAU,EAAE;AAAA,IACzF;AAEA,QAAI,MAAM,YAAY,UAAU;AAC9B,YAAM,IAAI,MAAM,8BAA8B,QAAQ,SAAS,MAAM,QAAQ,EAAE;AAAA,IACjF;AAEA,8BAA0B,MAAM;AAAA,EAClC;AAEA,QAAM,OAAO,IAAI,WAAW,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC;AAGjE,QAAM,iBAA0C,CAAC;AACjD,aAAW,SAAS,QAAQ;AAC1B,WAAO,OAAO,gBAAgB,MAAM,QAAQ;AAAA,EAC9C;AAEA,SAAO,IAAI,WAAW,MAAM,YAAY,UAAU,wBAAwB,cAAc;AAC1F;","names":[]}
|
package/dist/audio_frame.d.cts
CHANGED
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
import { OwnedAudioFrameBuffer, AudioFrameBufferInfo } from '
|
|
2
|
-
import '@bufbuild/protobuf';
|
|
3
|
-
import './proto/track_pb.cjs';
|
|
4
|
-
import './proto/stats_pb.cjs';
|
|
5
|
-
import './proto/e2ee_pb.cjs';
|
|
6
|
-
import './proto/handle_pb.cjs';
|
|
1
|
+
import { OwnedAudioFrameBuffer, AudioFrameBufferInfo } from '@livekit/rtc-ffi-bindings';
|
|
7
2
|
|
|
8
3
|
declare class AudioFrame {
|
|
9
4
|
data: Int16Array;
|
|
@@ -12,7 +7,7 @@ declare class AudioFrame {
|
|
|
12
7
|
samplesPerChannel: number;
|
|
13
8
|
private _userdata;
|
|
14
9
|
constructor(data: Int16Array, sampleRate: number, channels: number, samplesPerChannel: number, userdata?: Record<string, unknown>);
|
|
15
|
-
static create(sampleRate: number, channels: number, samplesPerChannel: number): AudioFrame;
|
|
10
|
+
static create(sampleRate: number, channels: number, samplesPerChannel: number, userdata?: Record<string, unknown>): AudioFrame;
|
|
16
11
|
/** @internal */
|
|
17
12
|
static fromOwnedInfo(owned: OwnedAudioFrameBuffer): AudioFrame;
|
|
18
13
|
/** @internal */
|
package/dist/audio_frame.d.ts
CHANGED
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
import { OwnedAudioFrameBuffer, AudioFrameBufferInfo } from '
|
|
2
|
-
import '@bufbuild/protobuf';
|
|
3
|
-
import './proto/track_pb.js';
|
|
4
|
-
import './proto/stats_pb.js';
|
|
5
|
-
import './proto/e2ee_pb.js';
|
|
6
|
-
import './proto/handle_pb.js';
|
|
1
|
+
import { OwnedAudioFrameBuffer, AudioFrameBufferInfo } from '@livekit/rtc-ffi-bindings';
|
|
7
2
|
|
|
8
3
|
declare class AudioFrame {
|
|
9
4
|
data: Int16Array;
|
|
@@ -12,7 +7,7 @@ declare class AudioFrame {
|
|
|
12
7
|
samplesPerChannel: number;
|
|
13
8
|
private _userdata;
|
|
14
9
|
constructor(data: Int16Array, sampleRate: number, channels: number, samplesPerChannel: number, userdata?: Record<string, unknown>);
|
|
15
|
-
static create(sampleRate: number, channels: number, samplesPerChannel: number): AudioFrame;
|
|
10
|
+
static create(sampleRate: number, channels: number, samplesPerChannel: number, userdata?: Record<string, unknown>): AudioFrame;
|
|
16
11
|
/** @internal */
|
|
17
12
|
static fromOwnedInfo(owned: OwnedAudioFrameBuffer): AudioFrame;
|
|
18
13
|
/** @internal */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audio_frame.d.ts","sourceRoot":"","sources":["../src/audio_frame.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"audio_frame.d.ts","sourceRoot":"","sources":["../src/audio_frame.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAGjE,qBAAa,UAAU;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAE1B,OAAO,CAAC,SAAS,CAA0B;gBAQzC,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IASxC,MAAM,CAAC,MAAM,CACX,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACjC,UAAU;IAKb,gBAAgB;IAChB,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,qBAAqB,GAAG,UAAU;IAa9D,gBAAgB;IAChB,SAAS,IAAI,oBAAoB;IASjC,6DAA6D;IAC7D,IAAI,QAAQ,4BAEX;CACF;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,GAAI,QAAQ,UAAU,GAAG,UAAU,EAAE,KAAG,UAmCtE,CAAC"}
|
package/dist/audio_frame.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import { AudioFrameBufferInfo } from "@livekit/rtc-ffi-bindings";
|
|
1
2
|
import { FfiClient, FfiHandle } from "./ffi_client.js";
|
|
2
|
-
import { AudioFrameBufferInfo } from "./proto/audio_frame_pb.js";
|
|
3
3
|
class AudioFrame {
|
|
4
4
|
// note: if converting from Uint8Array to Int16Array, *do not* use buffer.slice!
|
|
5
5
|
// it is marked unstable by Node and can cause undefined behaviour, such as massive chunks of
|
|
@@ -13,9 +13,9 @@ class AudioFrame {
|
|
|
13
13
|
this.samplesPerChannel = samplesPerChannel;
|
|
14
14
|
this._userdata = userdata;
|
|
15
15
|
}
|
|
16
|
-
static create(sampleRate, channels, samplesPerChannel) {
|
|
16
|
+
static create(sampleRate, channels, samplesPerChannel, userdata) {
|
|
17
17
|
const data = new Int16Array(channels * samplesPerChannel);
|
|
18
|
-
return new AudioFrame(data, sampleRate, channels, samplesPerChannel);
|
|
18
|
+
return new AudioFrame(data, sampleRate, channels, samplesPerChannel, userdata);
|
|
19
19
|
}
|
|
20
20
|
/** @internal */
|
|
21
21
|
static fromOwnedInfo(owned) {
|
|
@@ -65,7 +65,11 @@ const combineAudioFrames = (buffer) => {
|
|
|
65
65
|
totalSamplesPerChannel += frame.samplesPerChannel;
|
|
66
66
|
}
|
|
67
67
|
const data = new Int16Array(buffer.map((x) => [...x.data]).flat());
|
|
68
|
-
|
|
68
|
+
const mergedUserdata = {};
|
|
69
|
+
for (const frame of buffer) {
|
|
70
|
+
Object.assign(mergedUserdata, frame.userdata);
|
|
71
|
+
}
|
|
72
|
+
return new AudioFrame(data, sampleRate, channels, totalSamplesPerChannel, mergedUserdata);
|
|
69
73
|
};
|
|
70
74
|
export {
|
|
71
75
|
AudioFrame,
|
package/dist/audio_frame.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/audio_frame.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport {
|
|
1
|
+
{"version":3,"sources":["../src/audio_frame.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type { OwnedAudioFrameBuffer } from '@livekit/rtc-ffi-bindings';\nimport { AudioFrameBufferInfo } from '@livekit/rtc-ffi-bindings';\nimport { FfiClient, FfiHandle } from './ffi_client.js';\n\nexport class AudioFrame {\n data: Int16Array;\n sampleRate: number;\n channels: number;\n samplesPerChannel: number;\n\n private _userdata: Record<string, unknown>;\n\n // note: if converting from Uint8Array to Int16Array, *do not* use buffer.slice!\n // it is marked unstable by Node and can cause undefined behaviour, such as massive chunks of\n // noise being added to the end.\n // it is recommended to use buffer.subarray instead.\n // XXX(nbsp): add this when writing proper docs\n constructor(\n data: Int16Array,\n sampleRate: number,\n channels: number,\n samplesPerChannel: number,\n userdata: Record<string, unknown> = {},\n ) {\n this.data = data;\n this.sampleRate = sampleRate;\n this.channels = channels;\n this.samplesPerChannel = samplesPerChannel;\n this._userdata = userdata;\n }\n\n static create(\n sampleRate: number,\n channels: number,\n samplesPerChannel: number,\n userdata?: Record<string, unknown>,\n ): AudioFrame {\n const data = new Int16Array(channels * samplesPerChannel);\n return new AudioFrame(data, sampleRate, channels, samplesPerChannel, userdata);\n }\n\n /** @internal */\n static fromOwnedInfo(owned: OwnedAudioFrameBuffer): AudioFrame {\n const info = owned.info!;\n const len = info.numChannels! * info.samplesPerChannel! * 2; // c_int16\n const data = FfiClient.instance.copyBuffer(info.dataPtr!, len);\n new FfiHandle(owned.handle!.id!).dispose();\n return new AudioFrame(\n new Int16Array(data.buffer),\n info.sampleRate!,\n info.numChannels!,\n info.samplesPerChannel!,\n );\n }\n\n /** @internal */\n protoInfo(): AudioFrameBufferInfo {\n return new AudioFrameBufferInfo({\n dataPtr: FfiClient.instance.retrievePtr(new Uint8Array(this.data.buffer)),\n sampleRate: this.sampleRate,\n numChannels: this.channels,\n samplesPerChannel: this.samplesPerChannel,\n });\n }\n\n /** Returns the user data associated with the audio frame. */\n get userdata() {\n return this._userdata;\n }\n}\n\n/**\n * Combines one or more `rtc.AudioFrame` objects into a single `rtc.AudioFrame`.\n *\n * This function concatenates the audio data from multiple frames, ensuring that all frames have\n * the same sample rate and number of channels. It efficiently merges the data by preallocating the\n * necessary memory and copying the frame data without unnecessary reallocations.\n *\n * @param buffer - a single AudioFrame or list thereof\n */\nexport const combineAudioFrames = (buffer: AudioFrame | AudioFrame[]): AudioFrame => {\n if (!Array.isArray(buffer)) {\n return buffer;\n }\n buffer = buffer as AudioFrame[];\n\n if (buffer.length === 0) {\n throw new Error('buffer is empty');\n }\n\n const sampleRate = buffer[0]!.sampleRate;\n const channels = buffer[0]!.channels;\n\n let totalSamplesPerChannel = 0;\n for (const frame of buffer) {\n if (frame.sampleRate != sampleRate) {\n throw new Error(`sample rate mismatch: expected ${sampleRate}, got ${frame.sampleRate}`);\n }\n\n if (frame.channels != channels) {\n throw new Error(`channel mismatch: expected ${channels}, got ${frame.channels}`);\n }\n\n totalSamplesPerChannel += frame.samplesPerChannel;\n }\n\n const data = new Int16Array(buffer.map((x) => [...x.data]).flat());\n\n // Merge userdata from all frames\n const mergedUserdata: Record<string, unknown> = {};\n for (const frame of buffer) {\n Object.assign(mergedUserdata, frame.userdata);\n }\n\n return new AudioFrame(data, sampleRate, channels, totalSamplesPerChannel, mergedUserdata);\n};\n"],"mappings":"AAIA,SAAS,4BAA4B;AACrC,SAAS,WAAW,iBAAiB;AAE9B,MAAM,WAAW;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAatB,YACE,MACA,YACA,UACA,mBACA,WAAoC,CAAC,GACrC;AACA,SAAK,OAAO;AACZ,SAAK,aAAa;AAClB,SAAK,WAAW;AAChB,SAAK,oBAAoB;AACzB,SAAK,YAAY;AAAA,EACnB;AAAA,EAEA,OAAO,OACL,YACA,UACA,mBACA,UACY;AACZ,UAAM,OAAO,IAAI,WAAW,WAAW,iBAAiB;AACxD,WAAO,IAAI,WAAW,MAAM,YAAY,UAAU,mBAAmB,QAAQ;AAAA,EAC/E;AAAA;AAAA,EAGA,OAAO,cAAc,OAA0C;AAC7D,UAAM,OAAO,MAAM;AACnB,UAAM,MAAM,KAAK,cAAe,KAAK,oBAAqB;AAC1D,UAAM,OAAO,UAAU,SAAS,WAAW,KAAK,SAAU,GAAG;AAC7D,QAAI,UAAU,MAAM,OAAQ,EAAG,EAAE,QAAQ;AACzC,WAAO,IAAI;AAAA,MACT,IAAI,WAAW,KAAK,MAAM;AAAA,MAC1B,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,IACP;AAAA,EACF;AAAA;AAAA,EAGA,YAAkC;AAChC,WAAO,IAAI,qBAAqB;AAAA,MAC9B,SAAS,UAAU,SAAS,YAAY,IAAI,WAAW,KAAK,KAAK,MAAM,CAAC;AAAA,MACxE,YAAY,KAAK;AAAA,MACjB,aAAa,KAAK;AAAA,MAClB,mBAAmB,KAAK;AAAA,IAC1B,CAAC;AAAA,EACH;AAAA;AAAA,EAGA,IAAI,WAAW;AACb,WAAO,KAAK;AAAA,EACd;AACF;AAWO,MAAM,qBAAqB,CAAC,WAAkD;AACnF,MAAI,CAAC,MAAM,QAAQ,MAAM,GAAG;AAC1B,WAAO;AAAA,EACT;AACA,WAAS;AAET,MAAI,OAAO,WAAW,GAAG;AACvB,UAAM,IAAI,MAAM,iBAAiB;AAAA,EACnC;AAEA,QAAM,aAAa,OAAO,CAAC,EAAG;AAC9B,QAAM,WAAW,OAAO,CAAC,EAAG;AAE5B,MAAI,yBAAyB;AAC7B,aAAW,SAAS,QAAQ;AAC1B,QAAI,MAAM,cAAc,YAAY;AAClC,YAAM,IAAI,MAAM,kCAAkC,UAAU,SAAS,MAAM,UAAU,EAAE;AAAA,IACzF;AAEA,QAAI,MAAM,YAAY,UAAU;AAC9B,YAAM,IAAI,MAAM,8BAA8B,QAAQ,SAAS,MAAM,QAAQ,EAAE;AAAA,IACjF;AAEA,8BAA0B,MAAM;AAAA,EAClC;AAEA,QAAM,OAAO,IAAI,WAAW,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC;AAGjE,QAAM,iBAA0C,CAAC;AACjD,aAAW,SAAS,QAAQ;AAC1B,WAAO,OAAO,gBAAgB,MAAM,QAAQ;AAAA,EAC9C;AAEA,SAAO,IAAI,WAAW,MAAM,YAAY,UAAU,wBAAwB,cAAc;AAC1F;","names":[]}
|
package/dist/audio_mixer.cjs
CHANGED
|
@@ -152,7 +152,7 @@ class AudioMixer {
|
|
|
152
152
|
const removals = [];
|
|
153
153
|
for (const result of results) {
|
|
154
154
|
if (result.status !== "fulfilled") {
|
|
155
|
-
import_log.log.warn("AudioMixer: Stream contribution failed
|
|
155
|
+
import_log.log.warn({ reason: result.reason }, "AudioMixer: Stream contribution failed");
|
|
156
156
|
continue;
|
|
157
157
|
}
|
|
158
158
|
const contrib = result.value;
|
package/dist/audio_mixer.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/audio_mixer.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2025 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport { AsyncQueue } from './async_queue.js';\nimport { AudioFrame } from './audio_frame.js';\nimport { log } from './log.js';\n\n// Re-export AsyncQueue for backward compatibility\nexport { AsyncQueue } from './async_queue.js';\n\n// Define types for async iteration (since lib: es2015 doesn't include them)\ntype AudioStream = {\n [Symbol.asyncIterator](): {\n next(): Promise<IteratorResult<AudioFrame>>;\n };\n};\n\ninterface Contribution {\n stream: AudioStream;\n data: Int16Array;\n buffer: Int16Array;\n hadData: boolean;\n exhausted: boolean;\n}\n\nexport interface AudioMixerOptions {\n /**\n * The size of the audio block (in samples) for mixing.\n * If not provided, defaults to sampleRate / 10 (100ms).\n */\n blocksize?: number;\n\n /**\n * The maximum wait time in milliseconds for each stream to provide\n * audio data before timing out. Defaults to 100 ms.\n */\n streamTimeoutMs?: number;\n\n /**\n * The maximum number of mixed frames to store in the output queue.\n * Defaults to 100.\n */\n capacity?: number;\n}\n\n/**\n * AudioMixer combines multiple async audio streams into a single output stream.\n *\n * The mixer accepts multiple async audio streams and mixes them into a single output stream.\n * Each output frame is generated with a fixed chunk size determined by the blocksize (in samples).\n * If blocksize is not provided (or 0), it defaults to 100ms.\n *\n * Each input stream is processed in parallel, accumulating audio data until at least one chunk\n * of samples is available. If an input stream does not provide data within the specified timeout,\n * a warning is logged. The mixer can be closed immediately\n * (dropping unconsumed frames) or allowed to flush remaining data using endInput().\n *\n * @example\n * ```typescript\n * const mixer = new AudioMixer(48000, 2);\n * mixer.addStream(stream1);\n * mixer.addStream(stream2);\n *\n * for await (const frame of mixer) {\n * // Process mixed audio frame\n * }\n * ```\n */\nexport class AudioMixer {\n private streams: Set<AudioStream>;\n private buffers: Map<AudioStream, Int16Array>;\n private streamIterators: Map<AudioStream, { next(): Promise<IteratorResult<AudioFrame>> }>;\n private sampleRate: number;\n private numChannels: number;\n private chunkSize: number;\n private streamTimeoutMs: number;\n private queue: AsyncQueue<AudioFrame>;\n private streamSignal: AsyncQueue<void>; // Signals when streams are added\n private ending: boolean;\n private mixerTask?: Promise<void>;\n private closed: boolean;\n\n /**\n * Initialize the AudioMixer.\n *\n * @param sampleRate - The audio sample rate in Hz.\n * @param numChannels - The number of audio channels.\n * @param options - Optional configuration for the mixer.\n */\n constructor(sampleRate: number, numChannels: number, options: AudioMixerOptions = {}) {\n this.streams = new Set();\n this.buffers = new Map();\n this.streamIterators = new Map();\n this.sampleRate = sampleRate;\n this.numChannels = numChannels;\n this.chunkSize =\n options.blocksize && options.blocksize > 0 ? options.blocksize : Math.floor(sampleRate / 10);\n this.streamTimeoutMs = options.streamTimeoutMs ?? 100;\n this.queue = new AsyncQueue<AudioFrame>(options.capacity ?? 100);\n this.streamSignal = new AsyncQueue<void>(1); // there should only be one mixer\n this.ending = false;\n this.closed = false;\n\n // Start the mixer task\n this.mixerTask = this.mixer();\n }\n\n /**\n * Add an audio stream to the mixer.\n *\n * The stream is added to the internal set of streams and an empty buffer is initialized for it,\n * if not already present.\n *\n * @param stream - An async iterable that produces AudioFrame objects.\n * @throws Error if the mixer has been closed.\n */\n addStream(stream: AudioStream): void {\n if (this.ending) {\n throw new Error('Cannot add stream after mixer has been closed');\n }\n\n this.streams.add(stream);\n if (!this.buffers.has(stream)) {\n this.buffers.set(stream, new Int16Array(0));\n }\n\n // Signal that a stream was added (non-blocking)\n this.streamSignal.put(undefined).catch(() => {\n // Ignore errors if signal queue is closed\n });\n }\n\n /**\n * Remove an audio stream from the mixer.\n *\n * This method removes the specified stream and its associated buffer from the mixer.\n *\n * @param stream - The audio stream to remove.\n */\n removeStream(stream: AudioStream): void {\n this.streams.delete(stream);\n this.buffers.delete(stream);\n this.streamIterators.delete(stream);\n }\n\n /**\n * Returns an async iterator for the mixed audio frames.\n */\n [Symbol.asyncIterator]() {\n return {\n next: async (): Promise<IteratorResult<AudioFrame>> => {\n const frame = await this.getNextFrame();\n if (frame === null) {\n return { done: true, value: undefined };\n }\n return { done: false, value: frame };\n },\n };\n }\n\n /**\n * Immediately stop mixing and close the mixer.\n *\n * This stops the mixing task, and any unconsumed output in the queue may be dropped.\n */\n async aclose(): Promise<void> {\n if (this.closed) {\n return;\n }\n this.closed = true;\n this.ending = true;\n\n // Close both queues to wake up any waiting operations\n this.streamSignal.close();\n this.queue.close();\n\n await this.mixerTask;\n }\n\n /**\n * Signal that no more streams will be added.\n *\n * This method marks the mixer as closed so that it flushes any remaining buffered output before ending.\n * Note that existing streams will still be processed until exhausted.\n */\n endInput(): void {\n this.ending = true;\n }\n\n private async getNextFrame(): Promise<AudioFrame | null> {\n while (true) {\n // Try to get an item from the queue (non-blocking)\n const frame = this.queue.get();\n\n if (frame !== undefined) {\n return frame;\n }\n\n // Check if mixer is closed or ending\n if (this.queue.closed || (this.ending && this.streams.size === 0)) {\n return null;\n }\n\n // Queue is empty but mixer is still running - wait for an item to be added\n await this.queue.waitForItem();\n }\n }\n\n private async mixer(): Promise<void> {\n // Main mixing loop that continuously processes streams and produces output frames\n while (true) {\n // If we're in ending mode and there are no more streams, exit\n if (this.ending && this.streams.size === 0) {\n break;\n }\n\n if (this.streams.size === 0) {\n // Wait for a stream to be added (signal queue will have an item)\n await this.streamSignal.waitForItem();\n // Consume the signal\n this.streamSignal.get();\n continue;\n }\n\n // Process all streams in parallel\n const streamArray = Array.from(this.streams);\n const promises = streamArray.map((stream) => this.getContribution(stream));\n const results = await Promise.all(\n promises.map((p) =>\n p\n .then((value) => ({ status: 'fulfilled' as const, value }))\n .catch((reason) => ({ status: 'rejected' as const, reason })),\n ),\n );\n\n const contributions: Int16Array[] = [];\n let anyData = false;\n const removals: AudioStream[] = [];\n\n for (const result of results) {\n if (result.status !== 'fulfilled') {\n log.warn('AudioMixer: Stream contribution failed:', result.reason);\n continue;\n }\n\n const contrib = result.value;\n contributions.push(contrib.data);\n this.buffers.set(contrib.stream, contrib.buffer);\n\n if (contrib.hadData) {\n anyData = true;\n }\n\n // Mark exhausted streams with no remaining buffer for removal\n if (contrib.exhausted && contrib.buffer.length === 0) {\n removals.push(contrib.stream);\n }\n }\n\n // Remove exhausted streams\n for (const stream of removals) {\n this.removeStream(stream);\n }\n\n // If all streams are exhausted, end the mixer automatically.\n // This keeps `for await...of` consumers from hanging indefinitely when inputs complete.\n if (!this.ending && removals.length > 0 && this.streams.size === 0) {\n this.ending = true;\n }\n\n if (!anyData) {\n // No data available from any stream, wait briefly before trying again\n await this.sleep(1);\n continue;\n }\n\n // Mix the audio data\n const mixed = this.mixAudio(contributions);\n const frame = new AudioFrame(mixed, this.sampleRate, this.numChannels, this.chunkSize);\n\n if (this.closed) {\n break;\n }\n\n try {\n // Add mixed frame to output queue\n await this.queue.put(frame);\n } catch {\n // Queue closed while trying to add frame\n break;\n }\n }\n\n // Close the queue to signal end of stream\n this.queue.close();\n }\n\n private async getContribution(stream: AudioStream): Promise<Contribution> {\n let buf = this.buffers.get(stream) ?? new Int16Array(0);\n const initialBufferLength = buf.length;\n let exhausted = false;\n let receivedDataInThisCall = false;\n\n // Get or create iterator for this stream\n let iterator = this.streamIterators.get(stream);\n if (!iterator) {\n iterator = stream[Symbol.asyncIterator]();\n this.streamIterators.set(stream, iterator);\n }\n\n // Accumulate data until we have at least chunkSize samples\n while (buf.length < this.chunkSize * this.numChannels && !exhausted && !this.closed) {\n try {\n const result = await Promise.race([iterator.next(), this.timeout(this.streamTimeoutMs)]);\n\n if (result === 'timeout') {\n console.warn(`AudioMixer: stream timeout after ${this.streamTimeoutMs}ms`);\n break;\n }\n\n if (result.done) {\n exhausted = true;\n break;\n }\n\n const frame = result.value;\n const newData = frame.data;\n\n // Mark that we received data in this call\n receivedDataInThisCall = true;\n\n // Concatenate buffers\n if (buf.length === 0) {\n buf = newData;\n } else {\n const combined = new Int16Array(buf.length + newData.length);\n combined.set(buf);\n combined.set(newData, buf.length);\n buf = combined;\n }\n } catch (error) {\n console.error(`AudioMixer: Error reading from stream:`, error);\n exhausted = true;\n break;\n }\n }\n\n // Extract contribution and update buffer\n let contrib: Int16Array;\n const samplesNeeded = this.chunkSize * this.numChannels;\n\n if (buf.length >= samplesNeeded) {\n // Extract the needed samples and keep the remainder in the buffer\n contrib = buf.subarray(0, samplesNeeded);\n buf = buf.subarray(samplesNeeded);\n } else {\n // Pad with zeros if we don't have enough data\n const padded = new Int16Array(samplesNeeded);\n padded.set(buf);\n contrib = padded;\n buf = new Int16Array(0);\n }\n\n // hadData means: we had data at start OR we received data during this call OR we have data remaining\n const hadData = initialBufferLength > 0 || receivedDataInThisCall || buf.length > 0;\n\n return {\n stream,\n data: contrib,\n buffer: buf,\n hadData,\n exhausted,\n };\n }\n\n private mixAudio(contributions: Int16Array[]): Int16Array {\n if (contributions.length === 0) {\n return new Int16Array(this.chunkSize * this.numChannels);\n }\n\n const length = this.chunkSize * this.numChannels;\n // Use a wider accumulator to avoid int16 overflow while summing.\n const acc = new Int32Array(length);\n\n // Sum all contributions\n for (const contrib of contributions) {\n for (let i = 0; i < length; i++) {\n const val = contrib[i];\n if (val !== undefined) {\n acc[i] = (acc[i] ?? 0) + val;\n }\n }\n }\n\n // Clip to Int16 range\n const mixed = new Int16Array(length);\n for (let i = 0; i < length; i++) {\n const val = acc[i] ?? 0;\n if (val > 32767) {\n mixed[i] = 32767;\n } else if (val < -32768) {\n mixed[i] = -32768;\n } else {\n mixed[i] = val;\n }\n }\n\n return mixed;\n }\n\n private sleep(ms: number): Promise<void> {\n return new Promise((resolve) => setTimeout(resolve, ms));\n }\n\n private timeout(ms: number): Promise<'timeout'> {\n return new Promise((resolve) => setTimeout(() => resolve('timeout'), ms));\n }\n}\n"],"mappings":"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","names":["import_async_queue"]}
|
|
1
|
+
{"version":3,"sources":["../src/audio_mixer.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2025 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport { AsyncQueue } from './async_queue.js';\nimport { AudioFrame } from './audio_frame.js';\nimport { log } from './log.js';\n\n// Re-export AsyncQueue for backward compatibility\nexport { AsyncQueue } from './async_queue.js';\n\n// Define types for async iteration (since lib: es2015 doesn't include them)\ntype AudioStream = {\n [Symbol.asyncIterator](): {\n next(): Promise<IteratorResult<AudioFrame>>;\n };\n};\n\ninterface Contribution {\n stream: AudioStream;\n data: Int16Array;\n buffer: Int16Array;\n hadData: boolean;\n exhausted: boolean;\n}\n\nexport interface AudioMixerOptions {\n /**\n * The size of the audio block (in samples) for mixing.\n * If not provided, defaults to sampleRate / 10 (100ms).\n */\n blocksize?: number;\n\n /**\n * The maximum wait time in milliseconds for each stream to provide\n * audio data before timing out. Defaults to 100 ms.\n */\n streamTimeoutMs?: number;\n\n /**\n * The maximum number of mixed frames to store in the output queue.\n * Defaults to 100.\n */\n capacity?: number;\n}\n\n/**\n * AudioMixer combines multiple async audio streams into a single output stream.\n *\n * The mixer accepts multiple async audio streams and mixes them into a single output stream.\n * Each output frame is generated with a fixed chunk size determined by the blocksize (in samples).\n * If blocksize is not provided (or 0), it defaults to 100ms.\n *\n * Each input stream is processed in parallel, accumulating audio data until at least one chunk\n * of samples is available. If an input stream does not provide data within the specified timeout,\n * a warning is logged. The mixer can be closed immediately\n * (dropping unconsumed frames) or allowed to flush remaining data using endInput().\n *\n * @example\n * ```typescript\n * const mixer = new AudioMixer(48000, 2);\n * mixer.addStream(stream1);\n * mixer.addStream(stream2);\n *\n * for await (const frame of mixer) {\n * // Process mixed audio frame\n * }\n * ```\n */\nexport class AudioMixer {\n private streams: Set<AudioStream>;\n private buffers: Map<AudioStream, Int16Array>;\n private streamIterators: Map<AudioStream, { next(): Promise<IteratorResult<AudioFrame>> }>;\n private sampleRate: number;\n private numChannels: number;\n private chunkSize: number;\n private streamTimeoutMs: number;\n private queue: AsyncQueue<AudioFrame>;\n private streamSignal: AsyncQueue<void>; // Signals when streams are added\n private ending: boolean;\n private mixerTask?: Promise<void>;\n private closed: boolean;\n\n /**\n * Initialize the AudioMixer.\n *\n * @param sampleRate - The audio sample rate in Hz.\n * @param numChannels - The number of audio channels.\n * @param options - Optional configuration for the mixer.\n */\n constructor(sampleRate: number, numChannels: number, options: AudioMixerOptions = {}) {\n this.streams = new Set();\n this.buffers = new Map();\n this.streamIterators = new Map();\n this.sampleRate = sampleRate;\n this.numChannels = numChannels;\n this.chunkSize =\n options.blocksize && options.blocksize > 0 ? options.blocksize : Math.floor(sampleRate / 10);\n this.streamTimeoutMs = options.streamTimeoutMs ?? 100;\n this.queue = new AsyncQueue<AudioFrame>(options.capacity ?? 100);\n this.streamSignal = new AsyncQueue<void>(1); // there should only be one mixer\n this.ending = false;\n this.closed = false;\n\n // Start the mixer task\n this.mixerTask = this.mixer();\n }\n\n /**\n * Add an audio stream to the mixer.\n *\n * The stream is added to the internal set of streams and an empty buffer is initialized for it,\n * if not already present.\n *\n * @param stream - An async iterable that produces AudioFrame objects.\n * @throws Error if the mixer has been closed.\n */\n addStream(stream: AudioStream): void {\n if (this.ending) {\n throw new Error('Cannot add stream after mixer has been closed');\n }\n\n this.streams.add(stream);\n if (!this.buffers.has(stream)) {\n this.buffers.set(stream, new Int16Array(0));\n }\n\n // Signal that a stream was added (non-blocking)\n this.streamSignal.put(undefined).catch(() => {\n // Ignore errors if signal queue is closed\n });\n }\n\n /**\n * Remove an audio stream from the mixer.\n *\n * This method removes the specified stream and its associated buffer from the mixer.\n *\n * @param stream - The audio stream to remove.\n */\n removeStream(stream: AudioStream): void {\n this.streams.delete(stream);\n this.buffers.delete(stream);\n this.streamIterators.delete(stream);\n }\n\n /**\n * Returns an async iterator for the mixed audio frames.\n */\n [Symbol.asyncIterator]() {\n return {\n next: async (): Promise<IteratorResult<AudioFrame>> => {\n const frame = await this.getNextFrame();\n if (frame === null) {\n return { done: true, value: undefined };\n }\n return { done: false, value: frame };\n },\n };\n }\n\n /**\n * Immediately stop mixing and close the mixer.\n *\n * This stops the mixing task, and any unconsumed output in the queue may be dropped.\n */\n async aclose(): Promise<void> {\n if (this.closed) {\n return;\n }\n this.closed = true;\n this.ending = true;\n\n // Close both queues to wake up any waiting operations\n this.streamSignal.close();\n this.queue.close();\n\n await this.mixerTask;\n }\n\n /**\n * Signal that no more streams will be added.\n *\n * This method marks the mixer as closed so that it flushes any remaining buffered output before ending.\n * Note that existing streams will still be processed until exhausted.\n */\n endInput(): void {\n this.ending = true;\n }\n\n private async getNextFrame(): Promise<AudioFrame | null> {\n while (true) {\n // Try to get an item from the queue (non-blocking)\n const frame = this.queue.get();\n\n if (frame !== undefined) {\n return frame;\n }\n\n // Check if mixer is closed or ending\n if (this.queue.closed || (this.ending && this.streams.size === 0)) {\n return null;\n }\n\n // Queue is empty but mixer is still running - wait for an item to be added\n await this.queue.waitForItem();\n }\n }\n\n private async mixer(): Promise<void> {\n // Main mixing loop that continuously processes streams and produces output frames\n while (true) {\n // If we're in ending mode and there are no more streams, exit\n if (this.ending && this.streams.size === 0) {\n break;\n }\n\n if (this.streams.size === 0) {\n // Wait for a stream to be added (signal queue will have an item)\n await this.streamSignal.waitForItem();\n // Consume the signal\n this.streamSignal.get();\n continue;\n }\n\n // Process all streams in parallel\n const streamArray = Array.from(this.streams);\n const promises = streamArray.map((stream) => this.getContribution(stream));\n const results = await Promise.all(\n promises.map((p) =>\n p\n .then((value) => ({ status: 'fulfilled' as const, value }))\n .catch((reason) => ({ status: 'rejected' as const, reason })),\n ),\n );\n\n const contributions: Int16Array[] = [];\n let anyData = false;\n const removals: AudioStream[] = [];\n\n for (const result of results) {\n if (result.status !== 'fulfilled') {\n log.warn({ reason: result.reason }, 'AudioMixer: Stream contribution failed');\n continue;\n }\n\n const contrib = result.value;\n contributions.push(contrib.data);\n this.buffers.set(contrib.stream, contrib.buffer);\n\n if (contrib.hadData) {\n anyData = true;\n }\n\n // Mark exhausted streams with no remaining buffer for removal\n if (contrib.exhausted && contrib.buffer.length === 0) {\n removals.push(contrib.stream);\n }\n }\n\n // Remove exhausted streams\n for (const stream of removals) {\n this.removeStream(stream);\n }\n\n // If all streams are exhausted, end the mixer automatically.\n // This keeps `for await...of` consumers from hanging indefinitely when inputs complete.\n if (!this.ending && removals.length > 0 && this.streams.size === 0) {\n this.ending = true;\n }\n\n if (!anyData) {\n // No data available from any stream, wait briefly before trying again\n await this.sleep(1);\n continue;\n }\n\n // Mix the audio data\n const mixed = this.mixAudio(contributions);\n const frame = new AudioFrame(mixed, this.sampleRate, this.numChannels, this.chunkSize);\n\n if (this.closed) {\n break;\n }\n\n try {\n // Add mixed frame to output queue\n await this.queue.put(frame);\n } catch {\n // Queue closed while trying to add frame\n break;\n }\n }\n\n // Close the queue to signal end of stream\n this.queue.close();\n }\n\n private async getContribution(stream: AudioStream): Promise<Contribution> {\n let buf = this.buffers.get(stream) ?? new Int16Array(0);\n const initialBufferLength = buf.length;\n let exhausted = false;\n let receivedDataInThisCall = false;\n\n // Get or create iterator for this stream\n let iterator = this.streamIterators.get(stream);\n if (!iterator) {\n iterator = stream[Symbol.asyncIterator]();\n this.streamIterators.set(stream, iterator);\n }\n\n // Accumulate data until we have at least chunkSize samples\n while (buf.length < this.chunkSize * this.numChannels && !exhausted && !this.closed) {\n try {\n const result = await Promise.race([iterator.next(), this.timeout(this.streamTimeoutMs)]);\n\n if (result === 'timeout') {\n console.warn(`AudioMixer: stream timeout after ${this.streamTimeoutMs}ms`);\n break;\n }\n\n if (result.done) {\n exhausted = true;\n break;\n }\n\n const frame = result.value;\n const newData = frame.data;\n\n // Mark that we received data in this call\n receivedDataInThisCall = true;\n\n // Concatenate buffers\n if (buf.length === 0) {\n buf = newData;\n } else {\n const combined = new Int16Array(buf.length + newData.length);\n combined.set(buf);\n combined.set(newData, buf.length);\n buf = combined;\n }\n } catch (error) {\n console.error(`AudioMixer: Error reading from stream:`, error);\n exhausted = true;\n break;\n }\n }\n\n // Extract contribution and update buffer\n let contrib: Int16Array;\n const samplesNeeded = this.chunkSize * this.numChannels;\n\n if (buf.length >= samplesNeeded) {\n // Extract the needed samples and keep the remainder in the buffer\n contrib = buf.subarray(0, samplesNeeded);\n buf = buf.subarray(samplesNeeded);\n } else {\n // Pad with zeros if we don't have enough data\n const padded = new Int16Array(samplesNeeded);\n padded.set(buf);\n contrib = padded;\n buf = new Int16Array(0);\n }\n\n // hadData means: we had data at start OR we received data during this call OR we have data remaining\n const hadData = initialBufferLength > 0 || receivedDataInThisCall || buf.length > 0;\n\n return {\n stream,\n data: contrib,\n buffer: buf,\n hadData,\n exhausted,\n };\n }\n\n private mixAudio(contributions: Int16Array[]): Int16Array {\n if (contributions.length === 0) {\n return new Int16Array(this.chunkSize * this.numChannels);\n }\n\n const length = this.chunkSize * this.numChannels;\n // Use a wider accumulator to avoid int16 overflow while summing.\n const acc = new Int32Array(length);\n\n // Sum all contributions\n for (const contrib of contributions) {\n for (let i = 0; i < length; i++) {\n const val = contrib[i];\n if (val !== undefined) {\n acc[i] = (acc[i] ?? 0) + val;\n }\n }\n }\n\n // Clip to Int16 range\n const mixed = new Int16Array(length);\n for (let i = 0; i < length; i++) {\n const val = acc[i] ?? 0;\n if (val > 32767) {\n mixed[i] = 32767;\n } else if (val < -32768) {\n mixed[i] = -32768;\n } else {\n mixed[i] = val;\n }\n }\n\n return mixed;\n }\n\n private sleep(ms: number): Promise<void> {\n return new Promise((resolve) => setTimeout(resolve, ms));\n }\n\n private timeout(ms: number): Promise<'timeout'> {\n return new Promise((resolve) => setTimeout(() => resolve('timeout'), ms));\n }\n}\n"],"mappings":"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","names":["import_async_queue"]}
|
package/dist/audio_mixer.d.cts
CHANGED
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
import { AudioFrame } from './audio_frame.cjs';
|
|
2
2
|
export { AsyncQueue } from './async_queue.cjs';
|
|
3
|
-
import '
|
|
4
|
-
import '@bufbuild/protobuf';
|
|
5
|
-
import './proto/track_pb.cjs';
|
|
6
|
-
import './proto/stats_pb.cjs';
|
|
7
|
-
import './proto/e2ee_pb.cjs';
|
|
8
|
-
import './proto/handle_pb.cjs';
|
|
3
|
+
import '@livekit/rtc-ffi-bindings';
|
|
9
4
|
|
|
10
5
|
type AudioStream = {
|
|
11
6
|
[Symbol.asyncIterator](): {
|
package/dist/audio_mixer.d.ts
CHANGED
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
import { AudioFrame } from './audio_frame.js';
|
|
2
2
|
export { AsyncQueue } from './async_queue.js';
|
|
3
|
-
import '
|
|
4
|
-
import '@bufbuild/protobuf';
|
|
5
|
-
import './proto/track_pb.js';
|
|
6
|
-
import './proto/stats_pb.js';
|
|
7
|
-
import './proto/e2ee_pb.js';
|
|
8
|
-
import './proto/handle_pb.js';
|
|
3
|
+
import '@livekit/rtc-ffi-bindings';
|
|
9
4
|
|
|
10
5
|
type AudioStream = {
|
|
11
6
|
[Symbol.asyncIterator](): {
|
package/dist/audio_mixer.js
CHANGED
|
@@ -128,7 +128,7 @@ class AudioMixer {
|
|
|
128
128
|
const removals = [];
|
|
129
129
|
for (const result of results) {
|
|
130
130
|
if (result.status !== "fulfilled") {
|
|
131
|
-
log.warn("AudioMixer: Stream contribution failed
|
|
131
|
+
log.warn({ reason: result.reason }, "AudioMixer: Stream contribution failed");
|
|
132
132
|
continue;
|
|
133
133
|
}
|
|
134
134
|
const contrib = result.value;
|
package/dist/audio_mixer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/audio_mixer.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2025 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport { AsyncQueue } from './async_queue.js';\nimport { AudioFrame } from './audio_frame.js';\nimport { log } from './log.js';\n\n// Re-export AsyncQueue for backward compatibility\nexport { AsyncQueue } from './async_queue.js';\n\n// Define types for async iteration (since lib: es2015 doesn't include them)\ntype AudioStream = {\n [Symbol.asyncIterator](): {\n next(): Promise<IteratorResult<AudioFrame>>;\n };\n};\n\ninterface Contribution {\n stream: AudioStream;\n data: Int16Array;\n buffer: Int16Array;\n hadData: boolean;\n exhausted: boolean;\n}\n\nexport interface AudioMixerOptions {\n /**\n * The size of the audio block (in samples) for mixing.\n * If not provided, defaults to sampleRate / 10 (100ms).\n */\n blocksize?: number;\n\n /**\n * The maximum wait time in milliseconds for each stream to provide\n * audio data before timing out. Defaults to 100 ms.\n */\n streamTimeoutMs?: number;\n\n /**\n * The maximum number of mixed frames to store in the output queue.\n * Defaults to 100.\n */\n capacity?: number;\n}\n\n/**\n * AudioMixer combines multiple async audio streams into a single output stream.\n *\n * The mixer accepts multiple async audio streams and mixes them into a single output stream.\n * Each output frame is generated with a fixed chunk size determined by the blocksize (in samples).\n * If blocksize is not provided (or 0), it defaults to 100ms.\n *\n * Each input stream is processed in parallel, accumulating audio data until at least one chunk\n * of samples is available. If an input stream does not provide data within the specified timeout,\n * a warning is logged. The mixer can be closed immediately\n * (dropping unconsumed frames) or allowed to flush remaining data using endInput().\n *\n * @example\n * ```typescript\n * const mixer = new AudioMixer(48000, 2);\n * mixer.addStream(stream1);\n * mixer.addStream(stream2);\n *\n * for await (const frame of mixer) {\n * // Process mixed audio frame\n * }\n * ```\n */\nexport class AudioMixer {\n private streams: Set<AudioStream>;\n private buffers: Map<AudioStream, Int16Array>;\n private streamIterators: Map<AudioStream, { next(): Promise<IteratorResult<AudioFrame>> }>;\n private sampleRate: number;\n private numChannels: number;\n private chunkSize: number;\n private streamTimeoutMs: number;\n private queue: AsyncQueue<AudioFrame>;\n private streamSignal: AsyncQueue<void>; // Signals when streams are added\n private ending: boolean;\n private mixerTask?: Promise<void>;\n private closed: boolean;\n\n /**\n * Initialize the AudioMixer.\n *\n * @param sampleRate - The audio sample rate in Hz.\n * @param numChannels - The number of audio channels.\n * @param options - Optional configuration for the mixer.\n */\n constructor(sampleRate: number, numChannels: number, options: AudioMixerOptions = {}) {\n this.streams = new Set();\n this.buffers = new Map();\n this.streamIterators = new Map();\n this.sampleRate = sampleRate;\n this.numChannels = numChannels;\n this.chunkSize =\n options.blocksize && options.blocksize > 0 ? options.blocksize : Math.floor(sampleRate / 10);\n this.streamTimeoutMs = options.streamTimeoutMs ?? 100;\n this.queue = new AsyncQueue<AudioFrame>(options.capacity ?? 100);\n this.streamSignal = new AsyncQueue<void>(1); // there should only be one mixer\n this.ending = false;\n this.closed = false;\n\n // Start the mixer task\n this.mixerTask = this.mixer();\n }\n\n /**\n * Add an audio stream to the mixer.\n *\n * The stream is added to the internal set of streams and an empty buffer is initialized for it,\n * if not already present.\n *\n * @param stream - An async iterable that produces AudioFrame objects.\n * @throws Error if the mixer has been closed.\n */\n addStream(stream: AudioStream): void {\n if (this.ending) {\n throw new Error('Cannot add stream after mixer has been closed');\n }\n\n this.streams.add(stream);\n if (!this.buffers.has(stream)) {\n this.buffers.set(stream, new Int16Array(0));\n }\n\n // Signal that a stream was added (non-blocking)\n this.streamSignal.put(undefined).catch(() => {\n // Ignore errors if signal queue is closed\n });\n }\n\n /**\n * Remove an audio stream from the mixer.\n *\n * This method removes the specified stream and its associated buffer from the mixer.\n *\n * @param stream - The audio stream to remove.\n */\n removeStream(stream: AudioStream): void {\n this.streams.delete(stream);\n this.buffers.delete(stream);\n this.streamIterators.delete(stream);\n }\n\n /**\n * Returns an async iterator for the mixed audio frames.\n */\n [Symbol.asyncIterator]() {\n return {\n next: async (): Promise<IteratorResult<AudioFrame>> => {\n const frame = await this.getNextFrame();\n if (frame === null) {\n return { done: true, value: undefined };\n }\n return { done: false, value: frame };\n },\n };\n }\n\n /**\n * Immediately stop mixing and close the mixer.\n *\n * This stops the mixing task, and any unconsumed output in the queue may be dropped.\n */\n async aclose(): Promise<void> {\n if (this.closed) {\n return;\n }\n this.closed = true;\n this.ending = true;\n\n // Close both queues to wake up any waiting operations\n this.streamSignal.close();\n this.queue.close();\n\n await this.mixerTask;\n }\n\n /**\n * Signal that no more streams will be added.\n *\n * This method marks the mixer as closed so that it flushes any remaining buffered output before ending.\n * Note that existing streams will still be processed until exhausted.\n */\n endInput(): void {\n this.ending = true;\n }\n\n private async getNextFrame(): Promise<AudioFrame | null> {\n while (true) {\n // Try to get an item from the queue (non-blocking)\n const frame = this.queue.get();\n\n if (frame !== undefined) {\n return frame;\n }\n\n // Check if mixer is closed or ending\n if (this.queue.closed || (this.ending && this.streams.size === 0)) {\n return null;\n }\n\n // Queue is empty but mixer is still running - wait for an item to be added\n await this.queue.waitForItem();\n }\n }\n\n private async mixer(): Promise<void> {\n // Main mixing loop that continuously processes streams and produces output frames\n while (true) {\n // If we're in ending mode and there are no more streams, exit\n if (this.ending && this.streams.size === 0) {\n break;\n }\n\n if (this.streams.size === 0) {\n // Wait for a stream to be added (signal queue will have an item)\n await this.streamSignal.waitForItem();\n // Consume the signal\n this.streamSignal.get();\n continue;\n }\n\n // Process all streams in parallel\n const streamArray = Array.from(this.streams);\n const promises = streamArray.map((stream) => this.getContribution(stream));\n const results = await Promise.all(\n promises.map((p) =>\n p\n .then((value) => ({ status: 'fulfilled' as const, value }))\n .catch((reason) => ({ status: 'rejected' as const, reason })),\n ),\n );\n\n const contributions: Int16Array[] = [];\n let anyData = false;\n const removals: AudioStream[] = [];\n\n for (const result of results) {\n if (result.status !== 'fulfilled') {\n log.warn('AudioMixer: Stream contribution failed:', result.reason);\n continue;\n }\n\n const contrib = result.value;\n contributions.push(contrib.data);\n this.buffers.set(contrib.stream, contrib.buffer);\n\n if (contrib.hadData) {\n anyData = true;\n }\n\n // Mark exhausted streams with no remaining buffer for removal\n if (contrib.exhausted && contrib.buffer.length === 0) {\n removals.push(contrib.stream);\n }\n }\n\n // Remove exhausted streams\n for (const stream of removals) {\n this.removeStream(stream);\n }\n\n // If all streams are exhausted, end the mixer automatically.\n // This keeps `for await...of` consumers from hanging indefinitely when inputs complete.\n if (!this.ending && removals.length > 0 && this.streams.size === 0) {\n this.ending = true;\n }\n\n if (!anyData) {\n // No data available from any stream, wait briefly before trying again\n await this.sleep(1);\n continue;\n }\n\n // Mix the audio data\n const mixed = this.mixAudio(contributions);\n const frame = new AudioFrame(mixed, this.sampleRate, this.numChannels, this.chunkSize);\n\n if (this.closed) {\n break;\n }\n\n try {\n // Add mixed frame to output queue\n await this.queue.put(frame);\n } catch {\n // Queue closed while trying to add frame\n break;\n }\n }\n\n // Close the queue to signal end of stream\n this.queue.close();\n }\n\n private async getContribution(stream: AudioStream): Promise<Contribution> {\n let buf = this.buffers.get(stream) ?? new Int16Array(0);\n const initialBufferLength = buf.length;\n let exhausted = false;\n let receivedDataInThisCall = false;\n\n // Get or create iterator for this stream\n let iterator = this.streamIterators.get(stream);\n if (!iterator) {\n iterator = stream[Symbol.asyncIterator]();\n this.streamIterators.set(stream, iterator);\n }\n\n // Accumulate data until we have at least chunkSize samples\n while (buf.length < this.chunkSize * this.numChannels && !exhausted && !this.closed) {\n try {\n const result = await Promise.race([iterator.next(), this.timeout(this.streamTimeoutMs)]);\n\n if (result === 'timeout') {\n console.warn(`AudioMixer: stream timeout after ${this.streamTimeoutMs}ms`);\n break;\n }\n\n if (result.done) {\n exhausted = true;\n break;\n }\n\n const frame = result.value;\n const newData = frame.data;\n\n // Mark that we received data in this call\n receivedDataInThisCall = true;\n\n // Concatenate buffers\n if (buf.length === 0) {\n buf = newData;\n } else {\n const combined = new Int16Array(buf.length + newData.length);\n combined.set(buf);\n combined.set(newData, buf.length);\n buf = combined;\n }\n } catch (error) {\n console.error(`AudioMixer: Error reading from stream:`, error);\n exhausted = true;\n break;\n }\n }\n\n // Extract contribution and update buffer\n let contrib: Int16Array;\n const samplesNeeded = this.chunkSize * this.numChannels;\n\n if (buf.length >= samplesNeeded) {\n // Extract the needed samples and keep the remainder in the buffer\n contrib = buf.subarray(0, samplesNeeded);\n buf = buf.subarray(samplesNeeded);\n } else {\n // Pad with zeros if we don't have enough data\n const padded = new Int16Array(samplesNeeded);\n padded.set(buf);\n contrib = padded;\n buf = new Int16Array(0);\n }\n\n // hadData means: we had data at start OR we received data during this call OR we have data remaining\n const hadData = initialBufferLength > 0 || receivedDataInThisCall || buf.length > 0;\n\n return {\n stream,\n data: contrib,\n buffer: buf,\n hadData,\n exhausted,\n };\n }\n\n private mixAudio(contributions: Int16Array[]): Int16Array {\n if (contributions.length === 0) {\n return new Int16Array(this.chunkSize * this.numChannels);\n }\n\n const length = this.chunkSize * this.numChannels;\n // Use a wider accumulator to avoid int16 overflow while summing.\n const acc = new Int32Array(length);\n\n // Sum all contributions\n for (const contrib of contributions) {\n for (let i = 0; i < length; i++) {\n const val = contrib[i];\n if (val !== undefined) {\n acc[i] = (acc[i] ?? 0) + val;\n }\n }\n }\n\n // Clip to Int16 range\n const mixed = new Int16Array(length);\n for (let i = 0; i < length; i++) {\n const val = acc[i] ?? 0;\n if (val > 32767) {\n mixed[i] = 32767;\n } else if (val < -32768) {\n mixed[i] = -32768;\n } else {\n mixed[i] = val;\n }\n }\n\n return mixed;\n }\n\n private sleep(ms: number): Promise<void> {\n return new Promise((resolve) => setTimeout(resolve, ms));\n }\n\n private timeout(ms: number): Promise<'timeout'> {\n return new Promise((resolve) => setTimeout(() => resolve('timeout'), ms));\n }\n}\n"],"mappings":"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","names":["AsyncQueue"]}
|
|
1
|
+
{"version":3,"sources":["../src/audio_mixer.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2025 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport { AsyncQueue } from './async_queue.js';\nimport { AudioFrame } from './audio_frame.js';\nimport { log } from './log.js';\n\n// Re-export AsyncQueue for backward compatibility\nexport { AsyncQueue } from './async_queue.js';\n\n// Define types for async iteration (since lib: es2015 doesn't include them)\ntype AudioStream = {\n [Symbol.asyncIterator](): {\n next(): Promise<IteratorResult<AudioFrame>>;\n };\n};\n\ninterface Contribution {\n stream: AudioStream;\n data: Int16Array;\n buffer: Int16Array;\n hadData: boolean;\n exhausted: boolean;\n}\n\nexport interface AudioMixerOptions {\n /**\n * The size of the audio block (in samples) for mixing.\n * If not provided, defaults to sampleRate / 10 (100ms).\n */\n blocksize?: number;\n\n /**\n * The maximum wait time in milliseconds for each stream to provide\n * audio data before timing out. Defaults to 100 ms.\n */\n streamTimeoutMs?: number;\n\n /**\n * The maximum number of mixed frames to store in the output queue.\n * Defaults to 100.\n */\n capacity?: number;\n}\n\n/**\n * AudioMixer combines multiple async audio streams into a single output stream.\n *\n * The mixer accepts multiple async audio streams and mixes them into a single output stream.\n * Each output frame is generated with a fixed chunk size determined by the blocksize (in samples).\n * If blocksize is not provided (or 0), it defaults to 100ms.\n *\n * Each input stream is processed in parallel, accumulating audio data until at least one chunk\n * of samples is available. If an input stream does not provide data within the specified timeout,\n * a warning is logged. The mixer can be closed immediately\n * (dropping unconsumed frames) or allowed to flush remaining data using endInput().\n *\n * @example\n * ```typescript\n * const mixer = new AudioMixer(48000, 2);\n * mixer.addStream(stream1);\n * mixer.addStream(stream2);\n *\n * for await (const frame of mixer) {\n * // Process mixed audio frame\n * }\n * ```\n */\nexport class AudioMixer {\n private streams: Set<AudioStream>;\n private buffers: Map<AudioStream, Int16Array>;\n private streamIterators: Map<AudioStream, { next(): Promise<IteratorResult<AudioFrame>> }>;\n private sampleRate: number;\n private numChannels: number;\n private chunkSize: number;\n private streamTimeoutMs: number;\n private queue: AsyncQueue<AudioFrame>;\n private streamSignal: AsyncQueue<void>; // Signals when streams are added\n private ending: boolean;\n private mixerTask?: Promise<void>;\n private closed: boolean;\n\n /**\n * Initialize the AudioMixer.\n *\n * @param sampleRate - The audio sample rate in Hz.\n * @param numChannels - The number of audio channels.\n * @param options - Optional configuration for the mixer.\n */\n constructor(sampleRate: number, numChannels: number, options: AudioMixerOptions = {}) {\n this.streams = new Set();\n this.buffers = new Map();\n this.streamIterators = new Map();\n this.sampleRate = sampleRate;\n this.numChannels = numChannels;\n this.chunkSize =\n options.blocksize && options.blocksize > 0 ? options.blocksize : Math.floor(sampleRate / 10);\n this.streamTimeoutMs = options.streamTimeoutMs ?? 100;\n this.queue = new AsyncQueue<AudioFrame>(options.capacity ?? 100);\n this.streamSignal = new AsyncQueue<void>(1); // there should only be one mixer\n this.ending = false;\n this.closed = false;\n\n // Start the mixer task\n this.mixerTask = this.mixer();\n }\n\n /**\n * Add an audio stream to the mixer.\n *\n * The stream is added to the internal set of streams and an empty buffer is initialized for it,\n * if not already present.\n *\n * @param stream - An async iterable that produces AudioFrame objects.\n * @throws Error if the mixer has been closed.\n */\n addStream(stream: AudioStream): void {\n if (this.ending) {\n throw new Error('Cannot add stream after mixer has been closed');\n }\n\n this.streams.add(stream);\n if (!this.buffers.has(stream)) {\n this.buffers.set(stream, new Int16Array(0));\n }\n\n // Signal that a stream was added (non-blocking)\n this.streamSignal.put(undefined).catch(() => {\n // Ignore errors if signal queue is closed\n });\n }\n\n /**\n * Remove an audio stream from the mixer.\n *\n * This method removes the specified stream and its associated buffer from the mixer.\n *\n * @param stream - The audio stream to remove.\n */\n removeStream(stream: AudioStream): void {\n this.streams.delete(stream);\n this.buffers.delete(stream);\n this.streamIterators.delete(stream);\n }\n\n /**\n * Returns an async iterator for the mixed audio frames.\n */\n [Symbol.asyncIterator]() {\n return {\n next: async (): Promise<IteratorResult<AudioFrame>> => {\n const frame = await this.getNextFrame();\n if (frame === null) {\n return { done: true, value: undefined };\n }\n return { done: false, value: frame };\n },\n };\n }\n\n /**\n * Immediately stop mixing and close the mixer.\n *\n * This stops the mixing task, and any unconsumed output in the queue may be dropped.\n */\n async aclose(): Promise<void> {\n if (this.closed) {\n return;\n }\n this.closed = true;\n this.ending = true;\n\n // Close both queues to wake up any waiting operations\n this.streamSignal.close();\n this.queue.close();\n\n await this.mixerTask;\n }\n\n /**\n * Signal that no more streams will be added.\n *\n * This method marks the mixer as closed so that it flushes any remaining buffered output before ending.\n * Note that existing streams will still be processed until exhausted.\n */\n endInput(): void {\n this.ending = true;\n }\n\n private async getNextFrame(): Promise<AudioFrame | null> {\n while (true) {\n // Try to get an item from the queue (non-blocking)\n const frame = this.queue.get();\n\n if (frame !== undefined) {\n return frame;\n }\n\n // Check if mixer is closed or ending\n if (this.queue.closed || (this.ending && this.streams.size === 0)) {\n return null;\n }\n\n // Queue is empty but mixer is still running - wait for an item to be added\n await this.queue.waitForItem();\n }\n }\n\n private async mixer(): Promise<void> {\n // Main mixing loop that continuously processes streams and produces output frames\n while (true) {\n // If we're in ending mode and there are no more streams, exit\n if (this.ending && this.streams.size === 0) {\n break;\n }\n\n if (this.streams.size === 0) {\n // Wait for a stream to be added (signal queue will have an item)\n await this.streamSignal.waitForItem();\n // Consume the signal\n this.streamSignal.get();\n continue;\n }\n\n // Process all streams in parallel\n const streamArray = Array.from(this.streams);\n const promises = streamArray.map((stream) => this.getContribution(stream));\n const results = await Promise.all(\n promises.map((p) =>\n p\n .then((value) => ({ status: 'fulfilled' as const, value }))\n .catch((reason) => ({ status: 'rejected' as const, reason })),\n ),\n );\n\n const contributions: Int16Array[] = [];\n let anyData = false;\n const removals: AudioStream[] = [];\n\n for (const result of results) {\n if (result.status !== 'fulfilled') {\n log.warn({ reason: result.reason }, 'AudioMixer: Stream contribution failed');\n continue;\n }\n\n const contrib = result.value;\n contributions.push(contrib.data);\n this.buffers.set(contrib.stream, contrib.buffer);\n\n if (contrib.hadData) {\n anyData = true;\n }\n\n // Mark exhausted streams with no remaining buffer for removal\n if (contrib.exhausted && contrib.buffer.length === 0) {\n removals.push(contrib.stream);\n }\n }\n\n // Remove exhausted streams\n for (const stream of removals) {\n this.removeStream(stream);\n }\n\n // If all streams are exhausted, end the mixer automatically.\n // This keeps `for await...of` consumers from hanging indefinitely when inputs complete.\n if (!this.ending && removals.length > 0 && this.streams.size === 0) {\n this.ending = true;\n }\n\n if (!anyData) {\n // No data available from any stream, wait briefly before trying again\n await this.sleep(1);\n continue;\n }\n\n // Mix the audio data\n const mixed = this.mixAudio(contributions);\n const frame = new AudioFrame(mixed, this.sampleRate, this.numChannels, this.chunkSize);\n\n if (this.closed) {\n break;\n }\n\n try {\n // Add mixed frame to output queue\n await this.queue.put(frame);\n } catch {\n // Queue closed while trying to add frame\n break;\n }\n }\n\n // Close the queue to signal end of stream\n this.queue.close();\n }\n\n private async getContribution(stream: AudioStream): Promise<Contribution> {\n let buf = this.buffers.get(stream) ?? new Int16Array(0);\n const initialBufferLength = buf.length;\n let exhausted = false;\n let receivedDataInThisCall = false;\n\n // Get or create iterator for this stream\n let iterator = this.streamIterators.get(stream);\n if (!iterator) {\n iterator = stream[Symbol.asyncIterator]();\n this.streamIterators.set(stream, iterator);\n }\n\n // Accumulate data until we have at least chunkSize samples\n while (buf.length < this.chunkSize * this.numChannels && !exhausted && !this.closed) {\n try {\n const result = await Promise.race([iterator.next(), this.timeout(this.streamTimeoutMs)]);\n\n if (result === 'timeout') {\n console.warn(`AudioMixer: stream timeout after ${this.streamTimeoutMs}ms`);\n break;\n }\n\n if (result.done) {\n exhausted = true;\n break;\n }\n\n const frame = result.value;\n const newData = frame.data;\n\n // Mark that we received data in this call\n receivedDataInThisCall = true;\n\n // Concatenate buffers\n if (buf.length === 0) {\n buf = newData;\n } else {\n const combined = new Int16Array(buf.length + newData.length);\n combined.set(buf);\n combined.set(newData, buf.length);\n buf = combined;\n }\n } catch (error) {\n console.error(`AudioMixer: Error reading from stream:`, error);\n exhausted = true;\n break;\n }\n }\n\n // Extract contribution and update buffer\n let contrib: Int16Array;\n const samplesNeeded = this.chunkSize * this.numChannels;\n\n if (buf.length >= samplesNeeded) {\n // Extract the needed samples and keep the remainder in the buffer\n contrib = buf.subarray(0, samplesNeeded);\n buf = buf.subarray(samplesNeeded);\n } else {\n // Pad with zeros if we don't have enough data\n const padded = new Int16Array(samplesNeeded);\n padded.set(buf);\n contrib = padded;\n buf = new Int16Array(0);\n }\n\n // hadData means: we had data at start OR we received data during this call OR we have data remaining\n const hadData = initialBufferLength > 0 || receivedDataInThisCall || buf.length > 0;\n\n return {\n stream,\n data: contrib,\n buffer: buf,\n hadData,\n exhausted,\n };\n }\n\n private mixAudio(contributions: Int16Array[]): Int16Array {\n if (contributions.length === 0) {\n return new Int16Array(this.chunkSize * this.numChannels);\n }\n\n const length = this.chunkSize * this.numChannels;\n // Use a wider accumulator to avoid int16 overflow while summing.\n const acc = new Int32Array(length);\n\n // Sum all contributions\n for (const contrib of contributions) {\n for (let i = 0; i < length; i++) {\n const val = contrib[i];\n if (val !== undefined) {\n acc[i] = (acc[i] ?? 0) + val;\n }\n }\n }\n\n // Clip to Int16 range\n const mixed = new Int16Array(length);\n for (let i = 0; i < length; i++) {\n const val = acc[i] ?? 0;\n if (val > 32767) {\n mixed[i] = 32767;\n } else if (val < -32768) {\n mixed[i] = -32768;\n } else {\n mixed[i] = val;\n }\n }\n\n return mixed;\n }\n\n private sleep(ms: number): Promise<void> {\n return new Promise((resolve) => setTimeout(resolve, ms));\n }\n\n private timeout(ms: number): Promise<'timeout'> {\n return new Promise((resolve) => setTimeout(() => resolve('timeout'), ms));\n }\n}\n"],"mappings":"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","names":["AsyncQueue"]}
|
package/dist/audio_resampler.cjs
CHANGED
|
@@ -22,15 +22,15 @@ __export(audio_resampler_exports, {
|
|
|
22
22
|
AudioResamplerQuality: () => AudioResamplerQuality
|
|
23
23
|
});
|
|
24
24
|
module.exports = __toCommonJS(audio_resampler_exports);
|
|
25
|
+
var import_rtc_ffi_bindings = require("@livekit/rtc-ffi-bindings");
|
|
25
26
|
var import_audio_frame = require("./audio_frame.cjs");
|
|
26
27
|
var import_ffi_client = require("./ffi_client.cjs");
|
|
27
|
-
var import_audio_frame_pb = require("./proto/audio_frame_pb.cjs");
|
|
28
28
|
var AudioResamplerQuality = ((AudioResamplerQuality2) => {
|
|
29
|
-
AudioResamplerQuality2[AudioResamplerQuality2["QUICK"] =
|
|
30
|
-
AudioResamplerQuality2[AudioResamplerQuality2["LOW"] =
|
|
31
|
-
AudioResamplerQuality2[AudioResamplerQuality2["MEDIUM"] =
|
|
32
|
-
AudioResamplerQuality2[AudioResamplerQuality2["HIGH"] =
|
|
33
|
-
AudioResamplerQuality2[AudioResamplerQuality2["VERY_HIGH"] =
|
|
29
|
+
AudioResamplerQuality2[AudioResamplerQuality2["QUICK"] = import_rtc_ffi_bindings.SoxQualityRecipe.SOXR_QUALITY_QUICK] = "QUICK";
|
|
30
|
+
AudioResamplerQuality2[AudioResamplerQuality2["LOW"] = import_rtc_ffi_bindings.SoxQualityRecipe.SOXR_QUALITY_LOW] = "LOW";
|
|
31
|
+
AudioResamplerQuality2[AudioResamplerQuality2["MEDIUM"] = import_rtc_ffi_bindings.SoxQualityRecipe.SOXR_QUALITY_MEDIUM] = "MEDIUM";
|
|
32
|
+
AudioResamplerQuality2[AudioResamplerQuality2["HIGH"] = import_rtc_ffi_bindings.SoxQualityRecipe.SOXR_QUALITY_HIGH] = "HIGH";
|
|
33
|
+
AudioResamplerQuality2[AudioResamplerQuality2["VERY_HIGH"] = import_rtc_ffi_bindings.SoxQualityRecipe.SOXR_QUALITY_VERYHIGH] = "VERY_HIGH";
|
|
34
34
|
return AudioResamplerQuality2;
|
|
35
35
|
})(AudioResamplerQuality || {});
|
|
36
36
|
class AudioResampler {
|
|
@@ -51,13 +51,13 @@ class AudioResampler {
|
|
|
51
51
|
this.#inputRate = inputRate;
|
|
52
52
|
this.#outputRate = outputRate;
|
|
53
53
|
this.#channels = channels;
|
|
54
|
-
const req = new
|
|
54
|
+
const req = new import_rtc_ffi_bindings.NewSoxResamplerRequest({
|
|
55
55
|
inputRate,
|
|
56
56
|
outputRate,
|
|
57
57
|
numChannels: channels,
|
|
58
58
|
qualityRecipe: quality,
|
|
59
|
-
inputDataType:
|
|
60
|
-
outputDataType:
|
|
59
|
+
inputDataType: import_rtc_ffi_bindings.SoxResamplerDataType.SOXR_DATATYPE_INT16I,
|
|
60
|
+
outputDataType: import_rtc_ffi_bindings.SoxResamplerDataType.SOXR_DATATYPE_INT16I,
|
|
61
61
|
flags: 0
|
|
62
62
|
});
|
|
63
63
|
const res = import_ffi_client.FfiClient.instance.request({
|
|
@@ -84,6 +84,13 @@ class AudioResampler {
|
|
|
84
84
|
get channels() {
|
|
85
85
|
return this.#channels;
|
|
86
86
|
}
|
|
87
|
+
/**
|
|
88
|
+
* Releases the underlying native resampler handle. Must be called when
|
|
89
|
+
* the resampler is no longer needed to avoid leaking the FD.
|
|
90
|
+
*/
|
|
91
|
+
close() {
|
|
92
|
+
this.#ffiHandle.dispose();
|
|
93
|
+
}
|
|
87
94
|
/**
|
|
88
95
|
* Push audio data into the resampler and retrieve any available resampled data.
|
|
89
96
|
*
|
|
@@ -96,7 +103,7 @@ class AudioResampler {
|
|
|
96
103
|
* be empty if no output data is available yet.
|
|
97
104
|
*/
|
|
98
105
|
push(data) {
|
|
99
|
-
const req = new
|
|
106
|
+
const req = new import_rtc_ffi_bindings.PushSoxResamplerRequest({
|
|
100
107
|
resamplerHandle: this.#ffiHandle.handle,
|
|
101
108
|
dataPtr: data.protoInfo().dataPtr,
|
|
102
109
|
size: data.data.byteLength
|
|
@@ -119,7 +126,8 @@ class AudioResampler {
|
|
|
119
126
|
new Int16Array(outputData.buffer),
|
|
120
127
|
this.#outputRate,
|
|
121
128
|
this.#channels,
|
|
122
|
-
Math.trunc(outputData.length / this.#channels / 2)
|
|
129
|
+
Math.trunc(outputData.length / this.#channels / 2),
|
|
130
|
+
data.userdata
|
|
123
131
|
)
|
|
124
132
|
];
|
|
125
133
|
}
|
|
@@ -131,7 +139,7 @@ class AudioResampler {
|
|
|
131
139
|
* internal buffers are processed and all resampled data is output.
|
|
132
140
|
*/
|
|
133
141
|
flush() {
|
|
134
|
-
const req = new
|
|
142
|
+
const req = new import_rtc_ffi_bindings.FlushSoxResamplerRequest({
|
|
135
143
|
resamplerHandle: this.#ffiHandle.handle
|
|
136
144
|
});
|
|
137
145
|
const res = import_ffi_client.FfiClient.instance.request({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/audio_resampler.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport
|
|
1
|
+
{"version":3,"sources":["../src/audio_resampler.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type {\n FlushSoxResamplerResponse,\n NewSoxResamplerResponse,\n PushSoxResamplerResponse,\n} from '@livekit/rtc-ffi-bindings';\nimport {\n FlushSoxResamplerRequest,\n NewSoxResamplerRequest,\n PushSoxResamplerRequest,\n SoxQualityRecipe,\n SoxResamplerDataType,\n} from '@livekit/rtc-ffi-bindings';\nimport { AudioFrame } from './audio_frame.js';\nimport { FfiClient, FfiHandle } from './ffi_client.js';\n\n/**\n * Resampler quality. Higher quality settings result in better audio quality but require more\n * processing power.\n */\nexport enum AudioResamplerQuality {\n QUICK = SoxQualityRecipe.SOXR_QUALITY_QUICK,\n LOW = SoxQualityRecipe.SOXR_QUALITY_LOW,\n MEDIUM = SoxQualityRecipe.SOXR_QUALITY_MEDIUM,\n HIGH = SoxQualityRecipe.SOXR_QUALITY_HIGH,\n VERY_HIGH = SoxQualityRecipe.SOXR_QUALITY_VERYHIGH,\n}\n\n/**\n * AudioResampler provides functionality to resample audio data from an input sample rate to\n * an output sample rate using the Sox resampling library. It supports multiple channels and\n * configurable resampling quality.\n */\nexport class AudioResampler {\n #inputRate: number;\n #outputRate: number;\n #channels: number;\n #ffiHandle: FfiHandle;\n\n /**\n * Initializes a new AudioResampler.\n *\n * @param inputRate - The sample rate of the input audio data (in Hz).\n * @param outputRate - The desired sample rate of the output audio data (in Hz).\n * @param channels - The number of audio channels (e.g., 1 for mono, 2 for stereo). Defaults to 1.\n * @param quality - The quality setting for the resampler. Defaults to\n * `AudioResamplerQuality.MEDIUM`.\n */\n constructor(\n inputRate: number,\n outputRate: number,\n channels = 1,\n quality = AudioResamplerQuality.MEDIUM,\n ) {\n this.#inputRate = inputRate;\n this.#outputRate = outputRate;\n this.#channels = channels;\n\n const req = new NewSoxResamplerRequest({\n inputRate,\n outputRate,\n numChannels: channels,\n qualityRecipe: quality as number as SoxQualityRecipe,\n inputDataType: SoxResamplerDataType.SOXR_DATATYPE_INT16I,\n outputDataType: SoxResamplerDataType.SOXR_DATATYPE_INT16I,\n flags: 0,\n });\n\n const res = FfiClient.instance.request<NewSoxResamplerResponse>({\n message: {\n case: 'newSoxResampler',\n value: req,\n },\n });\n\n switch (res.message.case) {\n case 'resampler':\n this.#ffiHandle = new FfiHandle(res.message.value.handle!.id!);\n break;\n case 'error':\n default:\n throw new Error(res.message.value);\n }\n }\n\n get inputRate(): number {\n return this.#inputRate;\n }\n\n get outputRate(): number {\n return this.#outputRate;\n }\n\n get channels(): number {\n return this.#channels;\n }\n\n /**\n * Releases the underlying native resampler handle. Must be called when\n * the resampler is no longer needed to avoid leaking the FD.\n */\n close() {\n this.#ffiHandle.dispose();\n }\n\n /**\n * Push audio data into the resampler and retrieve any available resampled data.\n *\n * This method accepts audio data, resamples it according to the configured input and output rates,\n * and returns any resampled data that is available after processing the input.\n *\n * @param data - The audio frame to resample\n *\n * @returns A list of {@link AudioFrame} objects containing the resampled audio data. The list may\n * be empty if no output data is available yet.\n */\n push(data: AudioFrame): AudioFrame[] {\n const req = new PushSoxResamplerRequest({\n resamplerHandle: this.#ffiHandle.handle,\n dataPtr: data.protoInfo().dataPtr,\n size: data.data.byteLength,\n });\n\n const res = FfiClient.instance.request<PushSoxResamplerResponse>({\n message: {\n case: 'pushSoxResampler',\n value: req,\n },\n });\n\n if (res.error) {\n throw new Error(res.error);\n }\n\n if (!res.outputPtr) {\n return [];\n }\n\n const outputData = FfiClient.instance.copyBuffer(res.outputPtr, res.size!);\n\n return [\n new AudioFrame(\n new Int16Array(outputData.buffer),\n this.#outputRate,\n this.#channels,\n Math.trunc(outputData.length / this.#channels / 2),\n data.userdata,\n ),\n ];\n }\n\n /**\n * Flush any remaining audio data through the resampler and retrieve the resampled data.\n *\n * @remarks\n * This method should be called when no more input data will be provided to ensure that all\n * internal buffers are processed and all resampled data is output.\n */\n flush(): AudioFrame[] {\n const req = new FlushSoxResamplerRequest({\n resamplerHandle: this.#ffiHandle.handle,\n });\n\n const res = FfiClient.instance.request<FlushSoxResamplerResponse>({\n message: {\n case: 'flushSoxResampler',\n value: req,\n },\n });\n\n if (res.error) {\n throw new Error(res.error);\n }\n\n if (!res.outputPtr) {\n return [];\n }\n\n const outputData = FfiClient.instance.copyBuffer(res.outputPtr, res.size!);\n return [\n new AudioFrame(\n new Int16Array(outputData.buffer),\n this.#outputRate,\n this.#channels,\n Math.trunc(outputData.length / this.#channels / 2),\n ),\n ];\n }\n}\n"],"mappings":"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","names":["AudioResamplerQuality"]}
|
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
import { AudioFrame } from './audio_frame.cjs';
|
|
2
|
-
import '
|
|
3
|
-
import '@bufbuild/protobuf';
|
|
4
|
-
import './proto/track_pb.cjs';
|
|
5
|
-
import './proto/stats_pb.cjs';
|
|
6
|
-
import './proto/e2ee_pb.cjs';
|
|
7
|
-
import './proto/handle_pb.cjs';
|
|
2
|
+
import '@livekit/rtc-ffi-bindings';
|
|
8
3
|
|
|
9
4
|
/**
|
|
10
5
|
* Resampler quality. Higher quality settings result in better audio quality but require more
|
|
@@ -37,6 +32,11 @@ declare class AudioResampler {
|
|
|
37
32
|
get inputRate(): number;
|
|
38
33
|
get outputRate(): number;
|
|
39
34
|
get channels(): number;
|
|
35
|
+
/**
|
|
36
|
+
* Releases the underlying native resampler handle. Must be called when
|
|
37
|
+
* the resampler is no longer needed to avoid leaking the FD.
|
|
38
|
+
*/
|
|
39
|
+
close(): void;
|
|
40
40
|
/**
|
|
41
41
|
* Push audio data into the resampler and retrieve any available resampled data.
|
|
42
42
|
*
|