Skip to content
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

Improve codec unsupported detection #1711

Merged
merged 8 commits into from
Oct 13, 2019
Merged

Improve codec unsupported detection #1711

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5023651
Improve codec unsupported detection
hicom150 Sep 25, 2019
d4a8d9a
Apply review changes
hicom150 Oct 7, 2019
5280fc7
Merge branch 'master' into fix_codec_unsupported_detection
hicom150 Oct 7, 2019
3d85803
Improve codec unsupported detection
hicom150 Sep 25, 2019
f5e186d
Apply review changes
hicom150 Oct 7, 2019
b47d335
Merge branch 'fix_codec_unsupported_detection' of github.com:hicom150…
hicom150 Oct 7, 2019
287bcfd
Merge branch 'master' into fix_codec_unsupported_detection
hicom150 Oct 11, 2019
f2c531b
use videoTracks and audioTracks to check unsupported codecs
hicom150 Oct 12, 2019
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
25 changes: 7 additions & 18 deletions src/renderer/pages/player-page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* global HTMLMediaElement */

const React = require('react')
const Bitfield = require('bitfield')
const prettyBytes = require('prettier-bytes')
Expand Down Expand Up @@ -56,6 +54,13 @@ function renderMedia (state) {
mediaElement.pause()
} else if (!state.playing.isPaused && mediaElement.paused) {
mediaElement.play()
.then(
() => dispatch('mediaSuccess'),
(err) => {
console.error(`Error playing mediaElement: ${err.name}`)
dispatch('mediaError', 'Codec unsupported')
}
)
}
// When the user clicks or drags on the progress bar, jump to that position
if (state.playing.jumpToTime != null) {
Expand Down Expand Up @@ -127,10 +132,8 @@ function renderMedia (state) {
onLoadedMetadata={onLoadedMetadata}
onEnded={onEnded}
onStalled={dispatcher('mediaStalled')}
onError={dispatcher('mediaError')}
onTimeUpdate={dispatcher('mediaTimeUpdate')}
onEncrypted={dispatcher('mediaEncrypted')}
onCanPlay={onCanPlay}
>
{trackTags}
</MediaTagName>
Expand Down Expand Up @@ -168,20 +171,6 @@ function renderMedia (state) {
if (state.window.isFullScreen) dispatch('toggleFullScreen')
}
}

function onCanPlay (e) {
const elem = e.target
if (elem.readyState < HTMLMediaElement.HAVE_FUTURE_DATA) return
if (state.playing.type === 'video' &&
elem.webkitVideoDecodedByteCount === 0) {
dispatch('mediaError', 'Video codec unsupported')
} else if (elem.webkitAudioDecodedByteCount === 0) {
dispatch('mediaError', 'Audio codec unsupported')
} else {
dispatch('mediaSuccess')
elem.play()
}
}
}

function renderOverlay (state) {
Expand Down