mirror of
https://github.com/jech/galene.git
synced 2024-12-22 15:25:48 +01:00
Handle errors in filter init.
We used to ignore errors in filter init, which could cause us to send unblurred videos to the server.
This commit is contained in:
parent
2c72a27453
commit
3fbe274785
1 changed files with 22 additions and 9 deletions
|
@ -1369,12 +1369,7 @@ async function setUpStream(c, stream) {
|
||||||
|
|
||||||
c.setStream(stream);
|
c.setStream(stream);
|
||||||
|
|
||||||
try {
|
// set up the handler early, in case setFilter fails.
|
||||||
await setFilter(c);
|
|
||||||
} catch(e) {
|
|
||||||
displayWarning("Couldn't set filter: " + e);
|
|
||||||
}
|
|
||||||
|
|
||||||
c.onclose = async replace => {
|
c.onclose = async replace => {
|
||||||
await removeFilter(c);
|
await removeFilter(c);
|
||||||
if(!replace) {
|
if(!replace) {
|
||||||
|
@ -1385,6 +1380,8 @@ async function setUpStream(c, stream) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await setFilter(c);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {MediaStreamTrack} t
|
* @param {MediaStreamTrack} t
|
||||||
*/
|
*/
|
||||||
|
@ -1507,10 +1504,20 @@ async function replaceUpStream(c) {
|
||||||
cn.userdata.onclose = c.userdata.onclose;
|
cn.userdata.onclose = c.userdata.onclose;
|
||||||
let media = /** @type{HTMLVideoElement} */
|
let media = /** @type{HTMLVideoElement} */
|
||||||
(document.getElementById('media-' + c.localId));
|
(document.getElementById('media-' + c.localId));
|
||||||
|
try {
|
||||||
await setUpStream(cn, c.stream);
|
await setUpStream(cn, c.stream);
|
||||||
|
} catch(e) {
|
||||||
|
console.error(e);
|
||||||
|
displayError(e);
|
||||||
|
cn.close();
|
||||||
|
c.close();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
await setMedia(cn,
|
await setMedia(cn,
|
||||||
cn.label == 'camera' && getSettings().mirrorView,
|
cn.label == 'camera' && getSettings().mirrorView,
|
||||||
cn.label == 'video' && media);
|
cn.label == 'video' && media);
|
||||||
|
|
||||||
return cn;
|
return cn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1611,8 +1618,14 @@ async function addLocalMedia(localId) {
|
||||||
displayWarning(`Unknown filter ${settings.filter}`);
|
displayWarning(`Unknown filter ${settings.filter}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
await setUpStream(c, stream);
|
await setUpStream(c, stream);
|
||||||
await setMedia(c, settings.mirrorView);
|
await setMedia(c, settings.mirrorView);
|
||||||
|
} catch(e) {
|
||||||
|
console.error(e);
|
||||||
|
displayError(e);
|
||||||
|
c.close();
|
||||||
|
}
|
||||||
setButtonsVisibility();
|
setButtonsVisibility();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue