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

Jump to bottom

fix(setup-audio-tracks): undefined property kind in dashTrack #381

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(setup-audio-tracks): undefined property kind in dashTrack #381

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 32 additions & 1 deletion src/js/setup-audio-tracks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,37 @@ function handlePlaybackMetadataLoaded(player, tech) {
);
}

/**
* Determines the audio track type
*
* Specification reference:
*
* Dash @see https://dashif-documents.azurewebsites.net/DASH-IF-IOP/master/DASH-IF-IOP.html#ref-for-audio-adaptation-set%E2%91%A1
* Media Element @see https://html.spec.whatwg.org/multipage/media.html#dom-audiotrack-kind
*
* @param {Object} dashAudioTrack
*
* @return {string}
*/
function determineAudioTrackKind(dashAudioTrack) {
const hasMain = dashAudioTrack.roles.includes('main');
const hasDescription = dashAudioTrack.accessibility.includes('description');

if (hasMain && !hasDescription) {
return 'main';
}

if (hasMain && hasDescription) {
return 'main-desc';
}

if (hasDescription) {
return 'descriptions';
}

return 'alternative';
}

// Safari creates a single native `AudioTrack` (not `videojs.AudioTrack`) when loading. Clear all
// automatically generated audio tracks so we can create them all ourself.
if (videojsAudioTracks.length) {
Expand Down Expand Up @@ -69,7 +100,7 @@ function handlePlaybackMetadataLoaded(player, tech) {
new videojs.AudioTrack({
enabled: dashTrack === currentAudioTrack,
id: generateIdFromTrackIndex(dashTrack.index),
kind: dashTrack.kind || 'main',
kind: determineAudioTrackKind(dashTrack),
label,
language: dashTrack.lang
})
Expand Down