Add forceDisableHls option for FilePlayer

README.md

@@ -151,7 +151,7 @@ Key | Options
 `mixcloud` | `options`: Override the [default player options](https://www.mixcloud.com/developers/widget/#methods)
 `dailymotion` | `params`: Override the [default player vars](https://developer.dailymotion.com/player#player-parameters)
 `twitch` | `options`: Override the [default player options](https://dev.twitch.tv/docs/embed)<br />`playerId`: Override player ID for consistent server-side rendering (use with [`react-uid`](https://github.com/thearnica/react-uid))
-`file` | `attributes`: Apply [element attributes](https://developer.mozilla.org/en/docs/Web/HTML/Element/video#Attributes)<br />`forceVideo`: Always render a `<video>` element<br />`forceAudio`: Always render an `<audio>` element<br />`forceHLS`: Use [hls.js](https://github.com/video-dev/hls.js) for HLS streams<br />`forceSafariHLS`: Use [hls.js](https://github.com/video-dev/hls.js) for HLS streams, [even on Safari](https://github.com/cookpete/react-player/pull/1560)<br />`forceDASH`: Always use [dash.js](https://github.com/Dash-Industry-Forum/dash.js) for DASH streams<br />`forceFLV`: Always use [flv.js](https://github.com/Bilibili/flv.js)<br />`hlsOptions`: Override the [default `hls.js` options](https://github.com/video-dev/hls.js/blob/master/docs/API.md#fine-tuning)<br />`hlsVersion`: Override the [`hls.js`](https://github.com/video-dev/hls.js) version loaded from [`jsdelivr`](https://www.jsdelivr.com/package/npm/hls.js), default: `0.13.1`<br />`dashVersion`: Override the [`dash.js`](https://github.com/Dash-Industry-Forum/dash.js) version loaded from [`cdnjs`](https://cdnjs.com/libraries/dashjs), default: `2.9.2`<br />`flvVersion`: Override the [`flv.js`](https://github.com/Bilibili/flv.js) version loaded from [`jsdelivr`](https://www.jsdelivr.com/package/npm/flv.js), default: `1.5.0`
+`file` | `attributes`: Apply [element attributes](https://developer.mozilla.org/en/docs/Web/HTML/Element/video#Attributes)<br />`forceVideo`: Always render a `<video>` element<br />`forceAudio`: Always render an `<audio>` element<br />`forceHLS`: Use [hls.js](https://github.com/video-dev/hls.js) for HLS streams<br />`forceSafariHLS`: Use [hls.js](https://github.com/video-dev/hls.js) for HLS streams, [even on Safari](https://github.com/cookpete/react-player/pull/1560)<br />`forceDisableHLS`: Disable usage [hls.js](https://github.com/video-dev/hls.js) for HLS streams<br />`forceDASH`: Always use [dash.js](https://github.com/Dash-Industry-Forum/dash.js) for DASH streams<br />`forceFLV`: Always use [flv.js](https://github.com/Bilibili/flv.js)<br />`hlsOptions`: Override the [default `hls.js` options](https://github.com/video-dev/hls.js/blob/master/docs/API.md#fine-tuning)<br />`hlsVersion`: Override the [`hls.js`](https://github.com/video-dev/hls.js) version loaded from [`jsdelivr`](https://www.jsdelivr.com/package/npm/hls.js), default: `0.13.1`<br />`dashVersion`: Override the [`dash.js`](https://github.com/Dash-Industry-Forum/dash.js) version loaded from [`cdnjs`](https://cdnjs.com/libraries/dashjs), default: `2.9.2`<br />`flvVersion`: Override the [`flv.js`](https://github.com/Bilibili/flv.js) version loaded from [`jsdelivr`](https://www.jsdelivr.com/package/npm/flv.js), default: `1.5.0`
 
 ### Methods
 

src/players/FilePlayer.js

@@ -25,7 +25,7 @@ export default class FilePlayer extends Component {
     this.props.onMount && this.props.onMount(this)
     this.addListeners(this.player)
     this.player.src = this.getSource(this.props.url) // Ensure src is set in strict mode
-    if (IS_IOS) {
+    if (IS_IOS || this.props.config.forceDisableHls) {
       this.player.load()
     }
   }
@@ -138,13 +138,10 @@ export default class FilePlayer extends Component {
   }
 
   shouldUseHLS (url) {
-    if (this.props.config.forceHLS) {
+    if ((IS_SAFARI && this.props.config.forceSafariHLS) || this.props.config.forceHLS) {
       return true
     }
-    if (IS_SAFARI && this.props.config.forceSafariHLS) {
-      return true
-    }
-    if (IS_IOS) {
+    if (IS_IOS || this.props.config.forceDisableHls) {
       return false
     }
     return HLS_EXTENSIONS.test(url) || MATCH_CLOUDFLARE_STREAM.test(url)

src/props.js

@@ -56,6 +56,7 @@ export const propTypes = {
       forceAudio: bool,
       forceHLS: bool,
       forceSafariHLS: bool,
+      forceDisableHls: bool,
       forceDASH: bool,
       forceFLV: bool,
       hlsOptions: object,
@@ -172,7 +173,8 @@ export const defaultProps = {
       hlsOptions: {},
       hlsVersion: '1.1.4',
       dashVersion: '3.1.3',
-      flvVersion: '1.5.0'
+      flvVersion: '1.5.0',
+      forceDisableHls: false
     },
     wistia: {
       options: {},

types/file.d.ts

@@ -15,6 +15,7 @@ export interface FileConfig {
   forceAudio?: boolean
   forceHLS?: boolean
   forceSafariHLS?: boolean
+  forceDisableHls?: boolean
   forceDASH?: boolean
   forceFLV?: boolean
   hlsOptions?: Record<string, any>