Skip to content
Merged
Changes from 3 commits
Commits
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: 14 additions & 11 deletions src/dash-adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
*/
protected static _logger = BaseMediaSourceAdapter.getLogger(DashAdapter.id);

public static textContainerClass = "shaka-text-container";

Check warning on line 98 in src/dash-adapter.ts

View workflow job for this annotation

GitHub Actions / lint / running-tests (ubuntu-latest)

Strings must use singlequote
Comment thread
roeedean marked this conversation as resolved.
Outdated

/**
* The supported mime type by the dash adapter
Expand Down Expand Up @@ -1021,23 +1021,26 @@
/**
* Get the original audio tracks
* @function _getAudioTracks
* @returns {Array<Object>} - Array of objects with unique language and label.
* @returns {Array<Object>} - Array of audio track objects.
* @private
*/
private _getAudioTracks(): ShakaAudioTrack[] {
const variantTracks = this._shaka.getVariantTracks();
const audioTracks = this._shaka.getAudioLanguagesAndRoles();
audioTracks.forEach(track => {
const sameLangAudioVariants = variantTracks.filter(vt => vt.language === track.language && (!track.role || !vt.audioRoles || vt.audioRoles.includes(track.role)));
const id = sameLangAudioVariants.map(variant => variant.id).join('_');
const active = sameLangAudioVariants.some(variant => variant.active);
const audioTracks = this._shaka.getAudioTracks();
Comment thread
SivanA-Kaltura marked this conversation as resolved.

audioTracks.forEach((track, index) => {
track['id'] = index;

Comment thread
SivanA-Kaltura marked this conversation as resolved.
const sameLangAudioVariants = variantTracks.filter(
vt => vt.language === track.language && (!(track as any).role || !vt.audioRoles || vt.audioRoles.includes((track as any).role))
Comment thread
SivanA-Kaltura marked this conversation as resolved.
);

// TODO when upgrading to shaka v5, where the getVariantTracks API is removed, we will need to find another way to compute isAccessible
Comment thread
SivanA-Kaltura marked this conversation as resolved.
const isAccessible = sameLangAudioVariants.some(variant => variant.accessibilityPurpose);
Comment thread
SivanA-Kaltura marked this conversation as resolved.
track['id'] = id;
track.label = sameLangAudioVariants[0].label;
track['active'] = active;
track['kind'] = isAccessible ? AudioTrackKind.DESCRIPTION : AudioTrackKind.MAIN;
track['kind'] = isAccessible ? AudioTrackKind.DESCRIPTION : AudioTrackKind.MAIN;
Comment thread
SivanA-Kaltura marked this conversation as resolved.
});
return audioTracks as ShakaAudioTrack[];

return audioTracks as unknown as ShakaAudioTrack[];
Comment thread
SivanA-Kaltura marked this conversation as resolved.
}

/**
Expand Down
Loading