@norskvideo/norsk-studio-built-ins 1.6.1 → 1.7.0
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/client/info.js +250 -980
- package/client/processor.audioLevel/styles.css +164 -0
- package/client/processor.audioMixer/styles.css +249 -0
- package/lib/info.js +21 -27
- package/lib/info.js.map +1 -1
- package/lib/input.udp-ts/runtime.js +1 -13
- package/lib/input.udp-ts/runtime.js.map +1 -1
- package/lib/output.autoCmaf/runtime.js +29 -4
- package/lib/output.autoCmaf/runtime.js.map +1 -1
- package/lib/output.preview/runtime.d.ts +19 -3
- package/lib/output.preview/runtime.js +51 -25
- package/lib/output.preview/runtime.js.map +1 -1
- package/lib/processor.actionReplay/info.d.ts +5 -0
- package/lib/processor.actionReplay/info.js +100 -0
- package/lib/processor.actionReplay/info.js.map +1 -0
- package/lib/processor.actionReplay/runtime.d.ts +59 -0
- package/lib/processor.actionReplay/runtime.js +224 -0
- package/lib/processor.actionReplay/runtime.js.map +1 -0
- package/lib/processor.actionReplay/summary.d.ts +7 -0
- package/lib/processor.actionReplay/summary.js +76 -0
- package/lib/processor.actionReplay/summary.js.map +1 -0
- package/lib/processor.audioLevel/info.d.ts +3 -0
- package/lib/processor.audioLevel/info.js +83 -0
- package/lib/processor.audioLevel/info.js.map +1 -0
- package/lib/processor.audioLevel/inline-view.d.ts +6 -0
- package/lib/processor.audioLevel/inline-view.js +23 -0
- package/lib/processor.audioLevel/inline-view.js.map +1 -0
- package/lib/processor.audioLevel/runtime.d.ts +49 -0
- package/lib/processor.audioLevel/runtime.js +82 -0
- package/lib/processor.audioLevel/runtime.js.map +1 -0
- package/lib/processor.audioLevel/summary-view.d.ts +7 -0
- package/lib/processor.audioLevel/summary-view.js +36 -0
- package/lib/processor.audioLevel/summary-view.js.map +1 -0
- package/lib/processor.audioMixer/fullscreen-view.d.ts +8 -0
- package/lib/processor.audioMixer/fullscreen-view.js +121 -0
- package/lib/processor.audioMixer/fullscreen-view.js.map +1 -0
- package/lib/processor.audioMixer/info.d.ts +4 -0
- package/lib/processor.audioMixer/info.js +148 -0
- package/lib/processor.audioMixer/info.js.map +1 -0
- package/lib/processor.audioMixer/inline-view.d.ts +7 -0
- package/lib/processor.audioMixer/inline-view.js +43 -0
- package/lib/processor.audioMixer/inline-view.js.map +1 -0
- package/lib/processor.audioMixer/runtime.d.ts +119 -0
- package/lib/processor.audioMixer/runtime.js +142 -0
- package/lib/processor.audioMixer/runtime.js.map +1 -0
- package/lib/processor.audioMixer/summary-view.d.ts +7 -0
- package/lib/processor.audioMixer/summary-view.js +11 -0
- package/lib/processor.audioMixer/summary-view.js.map +1 -0
- package/lib/processor.browserOverlay/runtime.d.ts +11 -7
- package/lib/processor.browserOverlay/runtime.js +83 -78
- package/lib/processor.browserOverlay/runtime.js.map +1 -1
- package/lib/processor.dynamicBug/runtime.d.ts +7 -3
- package/lib/processor.dynamicBug/runtime.js +94 -64
- package/lib/processor.dynamicBug/runtime.js.map +1 -1
- package/lib/processor.dynamicBug/summary-view.d.ts +2 -6
- package/lib/processor.dynamicBug/summary-view.js.map +1 -1
- package/lib/processor.fixedLadder/info.d.ts +6 -1
- package/lib/processor.fixedLadder/info.js +6 -1
- package/lib/processor.fixedLadder/info.js.map +1 -1
- package/lib/processor.fixedLadder/newFile.d.ts +3 -0
- package/lib/processor.fixedLadder/newFile.js +145 -0
- package/lib/processor.fixedLadder/newFile.js.map +1 -0
- package/lib/processor.monetise/info.d.ts +3 -0
- package/lib/processor.monetise/info.js +90 -0
- package/lib/processor.monetise/info.js.map +1 -0
- package/lib/processor.monetise/runtime.d.ts +57 -0
- package/lib/processor.monetise/runtime.js +141 -0
- package/lib/processor.monetise/runtime.js.map +1 -0
- package/lib/processor.monetise/summary.d.ts +7 -0
- package/lib/processor.monetise/summary.js +39 -0
- package/lib/processor.monetise/summary.js.map +1 -0
- package/lib/test/audio-mixer.d.ts +0 -0
- package/lib/test/audio-mixer.js +2 -0
- package/lib/test/audio-mixer.js.map +1 -0
- package/lib/test/auto-cmaf.js +198 -6
- package/lib/test/auto-cmaf.js.map +1 -1
- package/lib/test/browser-overlay.js +53 -0
- package/lib/test/browser-overlay.js.map +1 -1
- package/lib/test/dynamic-bug.d.ts +1 -0
- package/lib/test/dynamic-bug.js +313 -0
- package/lib/test/dynamic-bug.js.map +1 -0
- package/lib/test/fixed-ladder.d.ts +1 -0
- package/lib/test/fixed-ladder.js +125 -0
- package/lib/test/fixed-ladder.js.map +1 -1
- package/lib/test/preview.d.ts +1 -0
- package/lib/test/preview.js +112 -0
- package/lib/test/preview.js.map +1 -0
- package/lib/test/rtmp-input.js +62 -31
- package/lib/test/rtmp-input.js.map +1 -1
- package/lib/test/rtmp-output.js +18 -4
- package/lib/test/rtmp-output.js.map +1 -1
- package/lib/test/srt-input-caller.js +50 -0
- package/lib/test/srt-input-caller.js.map +1 -1
- package/lib/test/whep-output.js +52 -5
- package/lib/test/whep-output.js.map +1 -1
- package/package.json +3 -7
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../src/processor.audioMixer/info.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,7 @@
|
|
1
|
+
import type { AudioMixerState, AudioMixerSettings } from "./runtime";
|
2
|
+
export declare function mkSourceKey(sourceId: string, key?: string): string;
|
3
|
+
declare function InlineView({ state }: {
|
4
|
+
state: AudioMixerState;
|
5
|
+
config: AudioMixerSettings;
|
6
|
+
}): import("react/jsx-runtime").JSX.Element;
|
7
|
+
export default InlineView;
|
@@ -0,0 +1,43 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.mkSourceKey = void 0;
|
4
|
+
const jsx_runtime_1 = require("react/jsx-runtime");
|
5
|
+
function mkSourceKey(sourceId, key) {
|
6
|
+
return key ? sourceId + "-" + key : sourceId;
|
7
|
+
}
|
8
|
+
exports.mkSourceKey = mkSourceKey;
|
9
|
+
function InlineView({ state }) {
|
10
|
+
function percentage(levels) {
|
11
|
+
if (!levels) {
|
12
|
+
return 0;
|
13
|
+
}
|
14
|
+
if (levels.peak == 0 && levels.rms == 0) {
|
15
|
+
return 0;
|
16
|
+
}
|
17
|
+
const rebase = levels.rms - 12.0;
|
18
|
+
const capped = 0 - (rebase / 112);
|
19
|
+
const snapped = Math.floor(capped * 10.0) * 10;
|
20
|
+
return Math.max(0, 100 - snapped);
|
21
|
+
}
|
22
|
+
const sourcesOrdered = state.knownSources.filter(({ id }) => id !== "mixer-output");
|
23
|
+
const mixerOutput = state.knownSources.find(({ id }) => id === "mixer-output");
|
24
|
+
if (mixerOutput) {
|
25
|
+
sourcesOrdered.push(mixerOutput);
|
26
|
+
}
|
27
|
+
function mkGridColumns() {
|
28
|
+
const gridRows = Array(Math.ceil((sourcesOrdered.length - 1) / 3)).fill("108px");
|
29
|
+
return {
|
30
|
+
["gridTemplateRows"]: gridRows.join(" ")
|
31
|
+
};
|
32
|
+
}
|
33
|
+
return !state.displayInlineChannels ? (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {}) : (0, jsx_runtime_1.jsx)("div", { id: "mixer-level-container-inline", className: "grid mt-4", style: mkGridColumns(), children: sourcesOrdered.map((s, i) => {
|
34
|
+
const source = state.sources[mkSourceKey(s.id, s.key)];
|
35
|
+
const isMasterOutput = i == sourcesOrdered.length - 1;
|
36
|
+
if (source) {
|
37
|
+
return (0, jsx_runtime_1.jsx)("div", { className: `grid justify-start w-full ${isMasterOutput ? "inline-master-channel" : ""}`, children: (0, jsx_runtime_1.jsxs)("div", { title: s.key ?? s.id, className: `preview-levels dark:text-slate-100 text-black relative ${isMasterOutput ? "inline-master-border" : ""}`, children: [(0, jsx_runtime_1.jsx)("div", { className: 'inline-channel-name absolute', children: isMasterOutput ? "Master" : s.key ?? s.id }), (0, jsx_runtime_1.jsx)("div", { className: `preview-level clip-${percentage(source.levels)}` })] }) }, mkSourceKey(s.id, s.key));
|
38
|
+
}
|
39
|
+
return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
|
40
|
+
}) });
|
41
|
+
}
|
42
|
+
exports.default = InlineView;
|
43
|
+
//# sourceMappingURL=inline-view.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"inline-view.js","sourceRoot":"","sources":["../../src/processor.audioMixer/inline-view.tsx"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,119 @@
|
|
1
|
+
import { AudioGainNode, AudioMeasureLevelsNode, AudioMixNode, ChannelLayout, Db, MediaNodeId, Norsk, StreamKey, SubscriptionError } from '@norskvideo/norsk-sdk';
|
2
|
+
import { OnCreated, RuntimeUpdates, ServerComponentDefinition, StudioNodeSubscriptionSource, StudioRuntime } from '@norskvideo/norsk-studio/lib/extension/runtime-types';
|
3
|
+
import { CustomAutoDuplexNode } from '@norskvideo/norsk-studio/lib/extension/base-nodes';
|
4
|
+
export type AudioMixerSettings = {
|
5
|
+
id: string;
|
6
|
+
displayName: string;
|
7
|
+
defaultGain: number;
|
8
|
+
channelLayout: ChannelLayout;
|
9
|
+
};
|
10
|
+
export type AudioMixerLevels = {
|
11
|
+
levels?: {
|
12
|
+
peak: number;
|
13
|
+
rms: number;
|
14
|
+
};
|
15
|
+
sliderGain: number;
|
16
|
+
preMuteSliderGain?: number;
|
17
|
+
nodeGain?: Db;
|
18
|
+
key?: string;
|
19
|
+
isMuted: boolean;
|
20
|
+
};
|
21
|
+
export type AudioMixerState = {
|
22
|
+
knownSources: AudioMixerSource[];
|
23
|
+
sources: {
|
24
|
+
[sourceIdAndKey: string]: AudioMixerLevels;
|
25
|
+
};
|
26
|
+
gainRange: GainRange;
|
27
|
+
displayInlineChannels: boolean;
|
28
|
+
};
|
29
|
+
export declare function mkSourceKey(sourceId: string, key?: string): string;
|
30
|
+
export type AudioMixerEvent = {
|
31
|
+
type: 'audio-levels';
|
32
|
+
sourceId: string;
|
33
|
+
key?: string;
|
34
|
+
levels: {
|
35
|
+
peak: number;
|
36
|
+
rms: number;
|
37
|
+
};
|
38
|
+
} | {
|
39
|
+
type: "set-gain";
|
40
|
+
sourceId: string;
|
41
|
+
key?: string;
|
42
|
+
sliderGain: number;
|
43
|
+
nodeGain: Db;
|
44
|
+
} | {
|
45
|
+
type: "sources-discovered";
|
46
|
+
sources: AudioMixerSource[];
|
47
|
+
} | {
|
48
|
+
type: "switch-mute";
|
49
|
+
sourceId: string;
|
50
|
+
muted: boolean;
|
51
|
+
preMuteSliderValue: number;
|
52
|
+
key?: string;
|
53
|
+
} | {
|
54
|
+
type: "source-dropped";
|
55
|
+
sourceId: string;
|
56
|
+
key?: string;
|
57
|
+
} | {
|
58
|
+
type: "display-inline-channels";
|
59
|
+
display: boolean;
|
60
|
+
};
|
61
|
+
export type AudioMixerCommand = {
|
62
|
+
type: "set-gain-cmd";
|
63
|
+
sourceId: string;
|
64
|
+
key?: string;
|
65
|
+
value: number;
|
66
|
+
} | {
|
67
|
+
type: "switch-mute-cmd";
|
68
|
+
sourceId: string;
|
69
|
+
key?: string;
|
70
|
+
preMuteSliderValue: number;
|
71
|
+
muted: boolean;
|
72
|
+
} | {
|
73
|
+
type: "display-inline-channels-cmd";
|
74
|
+
display: boolean;
|
75
|
+
};
|
76
|
+
export type AudioMixerSource = {
|
77
|
+
id: string;
|
78
|
+
key?: string;
|
79
|
+
};
|
80
|
+
type AudioMixerSubscription = {
|
81
|
+
id: string;
|
82
|
+
key?: string;
|
83
|
+
gain: AudioGainNode;
|
84
|
+
};
|
85
|
+
export type GainRange = {
|
86
|
+
minGain: number;
|
87
|
+
maxGain: number;
|
88
|
+
};
|
89
|
+
export declare const defaultGainRange: GainRange;
|
90
|
+
export default class AudioMixerDefinition implements ServerComponentDefinition<AudioMixerSettings, AudioMixer, AudioMixerState, AudioMixerCommand, AudioMixerEvent> {
|
91
|
+
create(norsk: Norsk, cfg: AudioMixerSettings, cb: OnCreated<AudioMixer>, { updates }: StudioRuntime<AudioMixerState, AudioMixerEvent>): Promise<void>;
|
92
|
+
handleCommand(node: AudioMixer, command: AudioMixerCommand): void;
|
93
|
+
}
|
94
|
+
export declare class AudioMixer extends CustomAutoDuplexNode {
|
95
|
+
initialised: Promise<void>;
|
96
|
+
norsk: Norsk;
|
97
|
+
updates: RuntimeUpdates<AudioMixerState, AudioMixerEvent>;
|
98
|
+
cfg: AudioMixerSettings;
|
99
|
+
audioGainOutput?: AudioGainNode;
|
100
|
+
audioLevelsOutput?: AudioMeasureLevelsNode;
|
101
|
+
audioMixer?: AudioMixNode<string>;
|
102
|
+
sendSetGainEvent: (sourceId: string, sliderGain: number, actualGain: Db, key?: string) => void;
|
103
|
+
sendSwitchMuteEvent: (sourceId: string, muted: boolean, preMuteSliderValue: number, key?: string) => void;
|
104
|
+
sendDisplayInlineChannelsEvent: (display: boolean) => void;
|
105
|
+
knownSources: AudioMixerSource[];
|
106
|
+
gainNodes: {
|
107
|
+
[sourceIdWithKey: string]: AudioGainNode;
|
108
|
+
};
|
109
|
+
sourceSubscriptions: StudioNodeSubscriptionSource[];
|
110
|
+
sourcesSubscribedTo: {
|
111
|
+
[id: MediaNodeId]: [AudioMixerSource, StreamKey][];
|
112
|
+
};
|
113
|
+
audioMixerSubscriptions: AudioMixerSubscription[];
|
114
|
+
constructor(norsk: Norsk, updates: RuntimeUpdates<AudioMixerState, AudioMixerEvent>, cfg: AudioMixerSettings);
|
115
|
+
initialise(): Promise<void>;
|
116
|
+
subscribe(subs: StudioNodeSubscriptionSource[]): void;
|
117
|
+
sourceContextChange(_responseCallback: (error?: SubscriptionError) => void): Promise<boolean>;
|
118
|
+
}
|
119
|
+
export {};
|
@@ -0,0 +1,142 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.AudioMixer = exports.defaultGainRange = exports.mkSourceKey = void 0;
|
4
|
+
const norsk_sdk_1 = require("@norskvideo/norsk-sdk");
|
5
|
+
const base_nodes_1 = require("@norskvideo/norsk-studio/lib/extension/base-nodes");
|
6
|
+
const util_1 = require("@norskvideo/norsk-studio/lib/shared/util");
|
7
|
+
function mkSourceKey(sourceId, key) {
|
8
|
+
return key ? sourceId + "-" + key : sourceId;
|
9
|
+
}
|
10
|
+
exports.mkSourceKey = mkSourceKey;
|
11
|
+
exports.defaultGainRange = {
|
12
|
+
minGain: -40,
|
13
|
+
maxGain: 40,
|
14
|
+
};
|
15
|
+
class AudioMixerDefinition {
|
16
|
+
async create(norsk, cfg, cb, { updates }) {
|
17
|
+
const node = new AudioMixer(norsk, updates, cfg);
|
18
|
+
await node.initialised;
|
19
|
+
cb(node);
|
20
|
+
}
|
21
|
+
handleCommand(node, command) {
|
22
|
+
const commandType = command.type;
|
23
|
+
switch (commandType) {
|
24
|
+
case "set-gain-cmd": {
|
25
|
+
const gainNode = node.gainNodes[mkSourceKey(command.sourceId, command.key)];
|
26
|
+
if (gainNode) {
|
27
|
+
let newGain = command.sourceId === "mixer-output" ? command.value : mkNodeGain(command.value);
|
28
|
+
if (command.value && command.value < exports.defaultGainRange.minGain) {
|
29
|
+
newGain = null;
|
30
|
+
}
|
31
|
+
gainNode.updateConfig({ channelGains: [newGain, newGain] });
|
32
|
+
node.sendSetGainEvent(command.sourceId, command.value, newGain, command.key);
|
33
|
+
}
|
34
|
+
break;
|
35
|
+
}
|
36
|
+
case "switch-mute-cmd": {
|
37
|
+
const gainNode = node.gainNodes[mkSourceKey(command.sourceId, command.key)];
|
38
|
+
if (gainNode) {
|
39
|
+
if (command.muted) {
|
40
|
+
gainNode.updateConfig({ channelGains: [null, null] });
|
41
|
+
}
|
42
|
+
else {
|
43
|
+
gainNode.updateConfig({ channelGains: [mkNodeGain(command.preMuteSliderValue), mkNodeGain(command.preMuteSliderValue)] });
|
44
|
+
}
|
45
|
+
node.sendSwitchMuteEvent(command.sourceId, command.muted, command.preMuteSliderValue, command.key);
|
46
|
+
}
|
47
|
+
break;
|
48
|
+
}
|
49
|
+
case "display-inline-channels-cmd": {
|
50
|
+
node.sendDisplayInlineChannelsEvent(command.display);
|
51
|
+
break;
|
52
|
+
}
|
53
|
+
default:
|
54
|
+
(0, util_1.assertUnreachable)(commandType);
|
55
|
+
}
|
56
|
+
}
|
57
|
+
}
|
58
|
+
exports.default = AudioMixerDefinition;
|
59
|
+
function mkNodeGain(sliderGain) {
|
60
|
+
return sliderGain < exports.defaultGainRange.minGain ? null : sliderGain - 40;
|
61
|
+
}
|
62
|
+
class AudioMixer extends base_nodes_1.CustomAutoDuplexNode {
|
63
|
+
initialised;
|
64
|
+
norsk;
|
65
|
+
updates;
|
66
|
+
cfg;
|
67
|
+
audioGainOutput;
|
68
|
+
audioLevelsOutput;
|
69
|
+
audioMixer;
|
70
|
+
sendSetGainEvent;
|
71
|
+
sendSwitchMuteEvent;
|
72
|
+
sendDisplayInlineChannelsEvent;
|
73
|
+
knownSources = [];
|
74
|
+
gainNodes = {};
|
75
|
+
sourceSubscriptions = [];
|
76
|
+
sourcesSubscribedTo = {};
|
77
|
+
audioMixerSubscriptions = [];
|
78
|
+
constructor(norsk, updates, cfg) {
|
79
|
+
super(cfg.id);
|
80
|
+
this.cfg = cfg;
|
81
|
+
this.norsk = norsk;
|
82
|
+
this.updates = updates;
|
83
|
+
this.initialised = this.initialise();
|
84
|
+
this.knownSources = [];
|
85
|
+
this.sendSetGainEvent = (sourceId, sliderGain, nodeGain, key) => { updates.raiseEvent({ type: "set-gain", sourceId, key, sliderGain, nodeGain }); };
|
86
|
+
this.sendSwitchMuteEvent = (sourceId, muted, preMuteSliderValue, key) => { updates.raiseEvent({ type: "switch-mute", sourceId, muted, preMuteSliderValue, key }); };
|
87
|
+
this.sendDisplayInlineChannelsEvent = (display) => { updates.raiseEvent({ type: "display-inline-channels", display }); };
|
88
|
+
}
|
89
|
+
async initialise() {
|
90
|
+
const mixerSettings = {
|
91
|
+
id: `audio-mixer-${this.cfg.id}`,
|
92
|
+
sampleRate: 48000,
|
93
|
+
sources: [],
|
94
|
+
outputSource: "mixer-source",
|
95
|
+
channelLayout: this.cfg.channelLayout,
|
96
|
+
};
|
97
|
+
const audioMixer = await this.norsk.processor.transform.audioMix(mixerSettings);
|
98
|
+
this.audioMixer = audioMixer;
|
99
|
+
const gainId = "mixer-output";
|
100
|
+
const audioGain = await this.norsk.processor.transform.audioGain({
|
101
|
+
id: gainId,
|
102
|
+
channelGains: new Array((0, norsk_sdk_1.getAmountOfChannels)(this.cfg.channelLayout)).fill(0)
|
103
|
+
});
|
104
|
+
audioGain.subscribe([{ source: audioMixer, sourceSelector: norsk_sdk_1.selectAudio }]);
|
105
|
+
this.audioGainOutput = audioGain;
|
106
|
+
this.audioLevelsOutput = await this.norsk.processor.control.audioMeasureLevels({
|
107
|
+
id: "mixer-output-levels",
|
108
|
+
onData: (levels) => {
|
109
|
+
const total = levels.channelLevels.reduce((acc, l) => {
|
110
|
+
acc.peak += l.peak ?? 0;
|
111
|
+
acc.rms += l.rms ?? 0;
|
112
|
+
return acc;
|
113
|
+
}, { rms: 0, peak: 0 });
|
114
|
+
this.updates.raiseEvent({
|
115
|
+
type: 'audio-levels',
|
116
|
+
sourceId: gainId,
|
117
|
+
levels: {
|
118
|
+
peak: levels.channelLevels.length == 0 ? 0 : total.peak / levels.channelLevels.length,
|
119
|
+
rms: levels.channelLevels.length == 0 ? 0 : total.rms / levels.channelLevels.length
|
120
|
+
}
|
121
|
+
});
|
122
|
+
}
|
123
|
+
});
|
124
|
+
this.audioLevelsOutput?.subscribe([{ source: audioGain, sourceSelector: norsk_sdk_1.selectAudio }]);
|
125
|
+
this.knownSources.push({ id: gainId });
|
126
|
+
this.gainNodes[gainId] = audioGain;
|
127
|
+
this.updates.raiseEvent({ type: "set-gain", sourceId: "mixer-output", sliderGain: this.cfg.defaultGain, nodeGain: 0 });
|
128
|
+
this.setup({ input: audioGain, output: [audioGain] });
|
129
|
+
}
|
130
|
+
subscribe(subs) {
|
131
|
+
subs.forEach((sub) => {
|
132
|
+
sub.registerForContextChange(this);
|
133
|
+
this.sourceSubscriptions.push(sub);
|
134
|
+
});
|
135
|
+
void this.sourceContextChange(() => { });
|
136
|
+
}
|
137
|
+
async sourceContextChange(_responseCallback) {
|
138
|
+
return false;
|
139
|
+
}
|
140
|
+
}
|
141
|
+
exports.AudioMixer = AudioMixer;
|
142
|
+
//# sourceMappingURL=runtime.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/processor.audioMixer/runtime.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,7 @@
|
|
1
|
+
import { AudioMixerCommand, AudioMixerSettings, AudioMixerState } from "./runtime";
|
2
|
+
declare function SummaryView({ state, sendCommand }: {
|
3
|
+
state: AudioMixerState;
|
4
|
+
config: AudioMixerSettings;
|
5
|
+
sendCommand: (cmd: AudioMixerCommand) => void;
|
6
|
+
}): import("react/jsx-runtime").JSX.Element;
|
7
|
+
export default SummaryView;
|
@@ -0,0 +1,11 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
const jsx_runtime_1 = require("react/jsx-runtime");
|
4
|
+
function SummaryView({ state, sendCommand }) {
|
5
|
+
return (0, jsx_runtime_1.jsxs)("div", { className: "mb-8", children: [(0, jsx_runtime_1.jsx)("label", { className: "mr-2.5", htmlFor: "disable-inline", children: "Display inline channels" }), (0, jsx_runtime_1.jsx)("input", { checked: state.displayInlineChannels, type: "checkbox", id: "disable-inline", onChange: (e) => {
|
6
|
+
const display = e.target.checked;
|
7
|
+
sendCommand({ type: "display-inline-channels-cmd", display });
|
8
|
+
} })] });
|
9
|
+
}
|
10
|
+
exports.default = SummaryView;
|
11
|
+
//# sourceMappingURL=summary-view.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"summary-view.js","sourceRoot":"","sources":["../../src/processor.audioMixer/summary-view.tsx"],"names":[],"mappings":";;;AAEA,SAAS,WAAW,CAAC,EAAE,KAAK,EAAE,WAAW,EAAyG;IAChJ,OAAO,iCAAK,SAAS,EAAC,MAAM,aAC1B,kCAAO,SAAS,EAAC,QAAQ,EAAC,OAAO,EAAC,gBAAgB,wCAAgC,EAClF,kCACE,OAAO,EAAE,KAAK,CAAC,qBAAqB,EACpC,IAAI,EAAC,UAAU,EACf,EAAE,EAAC,gBAAgB,EACnB,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE;oBACd,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAA;oBAChC,WAAW,CAAC,EAAE,IAAI,EAAE,6BAA6B,EAAE,OAAO,EAAE,CAAC,CAAA;gBAC/D,CAAC,GACS,IACR,CAAA;AAER,CAAC;AAED,kBAAe,WAAW,CAAA"}
|
@@ -1,7 +1,7 @@
|
|
1
|
-
import { BrowserInputNode, Norsk,
|
2
|
-
import { OnCreated, ServerComponentDefinition, StudioNodeSubscriptionSource } from '@norskvideo/norsk-studio/lib/extension/runtime-types';
|
3
|
-
import { CustomAutoDuplexNode } from "@norskvideo/norsk-studio/lib/extension/base-nodes";
|
1
|
+
import { BrowserInputNode, Norsk, VideoComposeNode, VideoStreamMetadata } from '@norskvideo/norsk-sdk';
|
2
|
+
import { CreatedMediaNode, OnCreated, RelatedMediaNodes, ServerComponentDefinition, StudioNodeSubscriptionSource } from '@norskvideo/norsk-studio/lib/extension/runtime-types';
|
4
3
|
import { HardwareAccelerationType } from '@norskvideo/norsk-studio/lib/shared/config';
|
4
|
+
import { ContextPromiseControl } from '@norskvideo/norsk-studio/lib/runtime/util';
|
5
5
|
export type BrowserOverlayConfig = {
|
6
6
|
__global: {
|
7
7
|
hardware?: HardwareAccelerationType;
|
@@ -13,17 +13,21 @@ export type BrowserOverlayConfig = {
|
|
13
13
|
export default class BrowserOverlayDefinition implements ServerComponentDefinition<BrowserOverlayConfig, BrowserOverlay> {
|
14
14
|
create(norsk: Norsk, cfg: BrowserOverlayConfig, cb: OnCreated<BrowserOverlay>): Promise<void>;
|
15
15
|
}
|
16
|
-
export declare class BrowserOverlay
|
16
|
+
export declare class BrowserOverlay implements CreatedMediaNode {
|
17
|
+
compose?: VideoComposeNode<"video" | "overlay">;
|
17
18
|
browser?: BrowserInputNode;
|
19
|
+
currentVideo?: VideoStreamMetadata;
|
18
20
|
norsk: Norsk;
|
19
|
-
|
21
|
+
control: ContextPromiseControl;
|
20
22
|
videoSource?: StudioNodeSubscriptionSource;
|
23
|
+
cfg: BrowserOverlayConfig;
|
21
24
|
initialised: Promise<void>;
|
25
|
+
id: string;
|
26
|
+
relatedMediaNodes: RelatedMediaNodes;
|
22
27
|
static create(norsk: Norsk, cfg: BrowserOverlayConfig): Promise<BrowserOverlay>;
|
23
28
|
constructor(norsk: Norsk, cfg: BrowserOverlayConfig);
|
24
29
|
initialise(): Promise<void>;
|
25
30
|
subscribe(sources: StudioNodeSubscriptionSource[]): void;
|
26
|
-
|
31
|
+
handleContext(): Promise<void>;
|
27
32
|
close(): Promise<void>;
|
28
|
-
stopBrowserSource(): Promise<void>;
|
29
33
|
}
|
@@ -2,9 +2,10 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.BrowserOverlay = void 0;
|
4
4
|
const norsk_sdk_1 = require("@norskvideo/norsk-sdk");
|
5
|
-
const
|
5
|
+
const runtime_types_1 = require("@norskvideo/norsk-studio/lib/extension/runtime-types");
|
6
6
|
const logging_1 = require("@norskvideo/norsk-studio/lib/server/logging");
|
7
7
|
const config_1 = require("@norskvideo/norsk-studio/lib/shared/config");
|
8
|
+
const util_1 = require("@norskvideo/norsk-studio/lib/runtime/util");
|
8
9
|
class BrowserOverlayDefinition {
|
9
10
|
async create(norsk, cfg, cb) {
|
10
11
|
const node = await BrowserOverlay.create(norsk, cfg);
|
@@ -12,109 +13,113 @@ class BrowserOverlayDefinition {
|
|
12
13
|
}
|
13
14
|
}
|
14
15
|
exports.default = BrowserOverlayDefinition;
|
15
|
-
class BrowserOverlay
|
16
|
+
class BrowserOverlay {
|
17
|
+
compose;
|
16
18
|
browser;
|
19
|
+
currentVideo;
|
17
20
|
norsk;
|
18
|
-
|
21
|
+
control = new util_1.ContextPromiseControl(this.handleContext.bind(this));
|
19
22
|
videoSource;
|
23
|
+
cfg;
|
20
24
|
initialised;
|
25
|
+
id;
|
26
|
+
relatedMediaNodes = new runtime_types_1.RelatedMediaNodes();
|
21
27
|
static async create(norsk, cfg) {
|
22
28
|
const node = new BrowserOverlay(norsk, cfg);
|
23
29
|
await node.initialised;
|
24
30
|
return node;
|
25
31
|
}
|
26
32
|
constructor(norsk, cfg) {
|
27
|
-
|
33
|
+
this.id = cfg.id;
|
28
34
|
this.cfg = cfg;
|
29
35
|
this.norsk = norsk;
|
30
36
|
this.initialised = this.initialise();
|
31
37
|
}
|
32
38
|
async initialise() {
|
33
|
-
const compose = await this.norsk.processor.transform.videoCompose((streams) => {
|
34
|
-
if (streams.length != 1) {
|
35
|
-
return undefined;
|
36
|
-
}
|
37
|
-
if (streams[0].message.case != "video") {
|
38
|
-
return undefined;
|
39
|
-
}
|
40
|
-
(0, logging_1.debuglog)("Setting up compose for overlay node", { stream: streams[0] });
|
41
|
-
return {
|
42
|
-
id: `${this.cfg.id}-compose`,
|
43
|
-
referenceStream: 'source',
|
44
|
-
referenceResolution: { width: 100, height: 100 },
|
45
|
-
hardwareAcceleration: (0, config_1.contractHardwareAcceleration)(this.cfg.__global.hardware, ["quadra", "nvidia"]),
|
46
|
-
parts: [
|
47
|
-
{
|
48
|
-
pin: "source",
|
49
|
-
opacity: 1.0,
|
50
|
-
zIndex: 0,
|
51
|
-
sourceRect: { x: 0, y: 0, width: 100, height: 100 },
|
52
|
-
destRect: { x: 0, y: 0, width: 100, height: 100 }
|
53
|
-
}, {
|
54
|
-
pin: "overlay",
|
55
|
-
opacity: 1.0,
|
56
|
-
zIndex: 1,
|
57
|
-
sourceRect: { x: 0, y: 0, width: 100, height: 100 },
|
58
|
-
destRect: { x: 0, y: 0, width: 100, height: 100 }
|
59
|
-
}
|
60
|
-
],
|
61
|
-
outputResolution: { width: streams[0].message.value.width, height: streams[0].message.value.height }
|
62
|
-
};
|
63
|
-
});
|
64
|
-
this.setup({ input: compose, output: [compose] });
|
65
39
|
}
|
66
40
|
subscribe(sources) {
|
67
41
|
this.videoSource = sources[0];
|
68
|
-
this.
|
69
|
-
if (ctx.streams.length == 1) {
|
70
|
-
void this.startBrowserSource(ctx.streams[0]);
|
71
|
-
return "accept";
|
72
|
-
}
|
73
|
-
else {
|
74
|
-
return "accept";
|
75
|
-
}
|
76
|
-
});
|
42
|
+
this.control.setSources(sources);
|
77
43
|
}
|
78
|
-
async
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
44
|
+
async handleContext() {
|
45
|
+
const video = this.videoSource?.latestStreams()[0]?.metadata;
|
46
|
+
if (!video || !this.videoSource || video.message.case !== 'video') {
|
47
|
+
await this.compose?.close();
|
48
|
+
await this.browser?.close();
|
49
|
+
this.compose = undefined;
|
50
|
+
this.browser = undefined;
|
51
|
+
return;
|
52
|
+
}
|
53
|
+
else {
|
54
|
+
const nextVideo = video.message.value;
|
55
|
+
(0, logging_1.debuglog)("Creating nodes for browser overlay", { id: this.id, metadata: nextVideo });
|
56
|
+
if (this.currentVideo) {
|
57
|
+
if (nextVideo.height !== this.currentVideo.height || nextVideo.width !== this.currentVideo.width) {
|
58
|
+
(0, logging_1.debuglog)("Closing nodes for browser overlay because of metadata change", { id: this.id, old: this.currentVideo, new: nextVideo });
|
59
|
+
await this.compose?.close();
|
60
|
+
await this.browser?.close();
|
61
|
+
this.currentVideo = undefined;
|
62
|
+
}
|
95
63
|
}
|
96
|
-
|
97
|
-
if (
|
98
|
-
|
64
|
+
this.currentVideo = nextVideo;
|
65
|
+
if (!this.compose) {
|
66
|
+
const thisCompose = this.compose = await this.norsk.processor.transform.videoCompose({
|
67
|
+
id: `${this.cfg.id}-compose`,
|
68
|
+
onCreate: (n) => {
|
69
|
+
this.relatedMediaNodes.addInput(n);
|
70
|
+
this.relatedMediaNodes.addOutput(n);
|
71
|
+
},
|
72
|
+
onClose: () => {
|
73
|
+
this.relatedMediaNodes.removeInput(thisCompose);
|
74
|
+
this.relatedMediaNodes.removeOutput(thisCompose);
|
75
|
+
},
|
76
|
+
referenceStream: 'video',
|
77
|
+
referenceResolution: { width: 100, height: 100 },
|
78
|
+
hardwareAcceleration: (0, config_1.contractHardwareAcceleration)(this.cfg.__global.hardware, ["quadra", "nvidia"]),
|
79
|
+
parts: [
|
80
|
+
{
|
81
|
+
pin: "video",
|
82
|
+
opacity: 1.0,
|
83
|
+
zIndex: 0,
|
84
|
+
sourceRect: { x: 0, y: 0, width: 100, height: 100 },
|
85
|
+
destRect: { x: 0, y: 0, width: 100, height: 100 }
|
86
|
+
}, {
|
87
|
+
pin: "overlay",
|
88
|
+
opacity: 1.0,
|
89
|
+
zIndex: 1,
|
90
|
+
sourceRect: { x: 0, y: 0, width: 100, height: 100 },
|
91
|
+
destRect: { x: 0, y: 0, width: 100, height: 100 }
|
92
|
+
}
|
93
|
+
],
|
94
|
+
outputResolution: { width: nextVideo.width, height: nextVideo.height }
|
95
|
+
});
|
99
96
|
}
|
100
|
-
if (
|
101
|
-
|
97
|
+
if (!this.browser) {
|
98
|
+
const thisBrowser = this.browser = await this.norsk.input.browser({
|
99
|
+
onCreate: (n) => {
|
100
|
+
this.relatedMediaNodes.addInput(n);
|
101
|
+
},
|
102
|
+
onClose: () => {
|
103
|
+
this.relatedMediaNodes.removeInput(thisBrowser);
|
104
|
+
},
|
105
|
+
id: `${this.cfg.id}-browser`,
|
106
|
+
url: this.cfg.url,
|
107
|
+
resolution: { width: nextVideo.width, height: nextVideo.height },
|
108
|
+
sourceName: `${this.id}-browser`,
|
109
|
+
frameRate: nextVideo.frameRate ?? { frames: 25, seconds: 1 }
|
110
|
+
});
|
102
111
|
}
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
});
|
112
|
+
this.compose.subscribeToPins([
|
113
|
+
{ source: this.browser, sourceSelector: (0, norsk_sdk_1.videoToPin)("overlay") },
|
114
|
+
this.videoSource.selectVideoToPin("video")[0]
|
115
|
+
]);
|
116
|
+
}
|
109
117
|
}
|
110
118
|
async close() {
|
111
|
-
await this.stopBrowserSource();
|
112
|
-
await super.close();
|
113
|
-
}
|
114
|
-
async stopBrowserSource() {
|
115
|
-
(0, logging_1.debuglog)("Stopping browser source", { id: this.id });
|
116
119
|
await this.browser?.close();
|
120
|
+
await this.compose?.close();
|
117
121
|
this.browser = undefined;
|
122
|
+
this.compose = undefined;
|
118
123
|
}
|
119
124
|
}
|
120
125
|
exports.BrowserOverlay = BrowserOverlay;
|