From d92f6d3e18e5dc08f15e83769e05efb9a90ca65a Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Wed, 6 Jan 2021 16:22:08 -0700 Subject: [PATCH] comment out redirect handling for transcoded streams --- .../viewers/videoViewer/internal/videojs.jsx | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/ui/component/viewers/videoViewer/internal/videojs.jsx b/ui/component/viewers/videoViewer/internal/videojs.jsx index 457ca59cd..4f7a50e08 100644 --- a/ui/component/viewers/videoViewer/internal/videojs.jsx +++ b/ui/component/viewers/videoViewer/internal/videojs.jsx @@ -311,34 +311,34 @@ export default React.memo(function VideoJs(props: Props) { // $FlowFixMe containerRef.current.appendChild(wrapper); - fetch(source).then(response => { - if (response && response.redirected && response.url && response.url.endsWith('m3u8')) { - videoJsOptions.sources[0].type = 'application/x-mpegURL'; + // fetch(source).then(response => { + // if (response && response.redirected && response.url && response.url.endsWith('m3u8')) { + // videoJsOptions.sources[0].type = 'application/x-mpegURL'; + // } + + player = videojs(el, videoJsOptions, () => { + if (player) { + player.one('play', onInitialPlay); + player.on('volumechange', onVolumeChange); + player.on('error', onError); + player.on('ended', onEnded); + LbryVolumeBarClass.replaceExisting(player); + player.mobileUi(); // Inits mobile version. No-op if Desktop. + + onPlayerReady(player); } - - player = videojs(el, videoJsOptions, () => { - if (player) { - player.one('play', onInitialPlay); - player.on('volumechange', onVolumeChange); - player.on('error', onError); - player.on('ended', onEnded); - LbryVolumeBarClass.replaceExisting(player); - player.mobileUi(); // Inits mobile version. No-op if Desktop. - - onPlayerReady(player); - } - }); - - window.player = player; - - // fixes #3498 (https://github.com/lbryio/lbry-desktop/issues/3498) - // summary: on firefox the focus would stick to the fullscreen button which caused buggy behavior with spacebar - // $FlowFixMe - player.on('fullscreenchange', () => document.activeElement && document.activeElement.blur()); - - window.addEventListener('keydown', handleKeyDown); }); + window.player = player; + + // fixes #3498 (https://github.com/lbryio/lbry-desktop/issues/3498) + // summary: on firefox the focus would stick to the fullscreen button which caused buggy behavior with spacebar + // $FlowFixMe + player.on('fullscreenchange', () => document.activeElement && document.activeElement.blur()); + + window.addEventListener('keydown', handleKeyDown); + // }); + return () => { window.removeEventListener('keydown', handleKeyDown);