From a35da16e58b2a5c1bf9daf44184cf655dd16ed62 Mon Sep 17 00:00:00 2001 From: gmena Date: Fri, 24 Dec 2021 10:10:23 -0600 Subject: [PATCH 01/32] feat: allow change resolutions --- src/main/core/hls/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/core/hls/index.js b/src/main/core/hls/index.js index 71ca632e8..4759dc996 100644 --- a/src/main/core/hls/index.js +++ b/src/main/core/hls/index.js @@ -59,7 +59,7 @@ module.exports = class HLSStreamer extends EventEmitter { log.info('m3u8 manifest loaded') // Add new qualities to option this.setup(videoRef, { - // ...this.quality(n), + ...this.quality(n), // ...this.subs(n) }) }) From ee00d546a677403258466f7fc4d53bd167325d82 Mon Sep 17 00:00:00 2001 From: gmena Date: Fri, 24 Dec 2021 10:25:47 -0600 Subject: [PATCH 02/32] refactor: remove select best quality not needed since HLS builtin quality resolutions --- src/render/core/app/components/Details/menu.jsx | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/render/core/app/components/Details/menu.jsx b/src/render/core/app/components/Details/menu.jsx index bfffa5aed..6eb3b43ce 100755 --- a/src/render/core/app/components/Details/menu.jsx +++ b/src/render/core/app/components/Details/menu.jsx @@ -99,16 +99,6 @@ export default class DetailsMenu extends React.PureComponent { }) } - selectBestQuality (resources) { - const groupedQualities = util.groupBy(resources, 'quality') - return Object.keys(groupedQualities).map((key) => { - return groupedQualities[key].reduce((old, curr) => { - const bestOne = (old.health || 0) > curr.health - return bestOne ? old : curr - }) - }) - } - render () { return ( ) diff --git a/src/render/core/app/components/Player/player.jsx b/src/render/core/app/components/Player/player.jsx index 5c00d6df2..ccd62060f 100755 --- a/src/render/core/app/components/Player/player.jsx +++ b/src/render/core/app/components/Player/player.jsx @@ -2,9 +2,7 @@ import React from 'react' import PropTypes from 'prop-types' import setting from '@settings' -import PlayerShare from './share' import PlayerVideo from './video' - import HLS from '@main/core/hls' import log from '@logger' @@ -104,7 +102,6 @@ export default class Player extends React.Component { render () { return (
-
) diff --git a/src/render/core/app/components/Player/share.jsx b/src/render/core/app/components/Player/share.jsx deleted file mode 100755 index 0c568bac3..000000000 --- a/src/render/core/app/components/Player/share.jsx +++ /dev/null @@ -1,32 +0,0 @@ -import React from 'react' -import NavBarMenu from '@components/NavBarMenu/' - -export default class PlayerShare extends React.Component { - getOptions = () => { - return this.props.devices.map((e, i) => { - return { - default: false, - label: e, - action: i - } - }) - } - - handleChange = (index) => { - this.props.onChange && - this.props.onChange(index) - } - - render () { - return ( - <> -
- -
- - ) - } -} diff --git a/src/render/core/app/components/Player/video.jsx b/src/render/core/app/components/Player/video.jsx index 599987a55..ca3b9546b 100755 --- a/src/render/core/app/components/Player/video.jsx +++ b/src/render/core/app/components/Player/video.jsx @@ -19,7 +19,7 @@ export default class PlayerVideo extends React.PureComponent { render () { return (