Skip to content

Add audio to proctoring #33 #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrekk-hub wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add audio to proctoring #33 #155

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3823173
Add tabs sound support (first version)
mrekk-hub May 21, 2025
3ef5b8f
Merge branch 'main' into add_audio_to_proctoring_33
proitshnik May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions client/scripts/media.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ async function getMediaDevices() {
"Не отключайте эти разрешения до окончания записи. " +
"Это необходимо для корректной работы системы прокторинга."],
"Разрешения для прокторинга");
chrome.desktopCapture.chooseDesktopMedia(['screen'], async (streamId) => {
chrome.desktopCapture.chooseDesktopMedia(['screen', 'audio'], async (streamId) => {
if (!streamId) {
logClientAction({ action: "User cancels screen selection" });
console.error('Пользователь отменил выбор экрана');
Expand All @@ -235,6 +235,12 @@ async function getMediaDevices() {
logClientAction({ action: "User grants screen access" });

streams.screen = await navigator.mediaDevices.getUserMedia({
audio: {
mandatory: {
chromeMediaSource: 'desktop',
chromeMediaSourceId: streamId
}
},
video: {
mandatory: {
chromeMediaSource: 'desktop',
Expand All @@ -254,6 +260,8 @@ async function getMediaDevices() {
},
});

console.log('Audio tracks from screen:', streams.screen.getAudioTracks());

if (!streams.screen || streams.screen.getVideoTracks().length === 0) {
logClientAction({ action: "Screen stream not available" });
throw new Error('Не удалось получить видеопоток с экрана');
Expand Down Expand Up @@ -424,9 +432,26 @@ async function getMediaDevices() {
}
};

// Объединяем аудио (экран + микрофон)
const audioContext = new AudioContext();
const destination = audioContext.createMediaStreamDestination();

const screenAudioTrack = streams.screen.getAudioTracks()[0];
if (screenAudioTrack) {
const screenSource = audioContext.createMediaStreamSource(new MediaStream([screenAudioTrack]));
screenSource.connect(destination);
}

const micAudioTrack = streams.microphone.getAudioTracks()[0];
if (micAudioTrack) {
const micSource = audioContext.createMediaStreamSource(new MediaStream([micAudioTrack]));
micSource.connect(destination);
}

streams.combined = new MediaStream([
streams.screen.getVideoTracks()[0],
streams.microphone.getAudioTracks()[0]
...destination.stream.getAudioTracks()
// streams.microphone.getAudioTracks()[0]
]);

combinedPreview.srcObject = streams.combined;
Expand Down