Skip to content

Commit

Permalink
Remove IE11 unsupported ES6 features from ref player (#3543)
Browse files Browse the repository at this point in the history
  • Loading branch information
@davemevans
davemevans committed Feb 18, 2021
1 parent 9cadfc2 commit 7917102
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 39 deletions.
4 changes: 2 additions & 2 deletions samples/dash-if-reference-player/app/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1133,7 +1133,7 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
receiverApplicationId: CAST_APP_ID,
autoJoinPolicy: chrome.cast.AutoJoinPolicy.ORIGIN_SCOPED
});
castContext.addEventListener(cast.framework.CastContextEventType.CAST_STATE_CHANGED, e => {
castContext.addEventListener(cast.framework.CastContextEventType.CAST_STATE_CHANGED, function (e) {
console.log('[Cast]', e);
if (e.castState === cast.framework.CastState.CONNECTED) {
onCastReady();
Expand All @@ -1143,7 +1143,7 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
});
remotePlayer = new cast.framework.RemotePlayer();
remotePlayerController = new cast.framework.RemotePlayerController(remotePlayer);
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.PLAYER_STATE_CHANGED, () => {
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.PLAYER_STATE_CHANGED, function () {
if (remotePlayer) {
$scope.castPlayerState = remotePlayer.playerState;
$scope.safeApply();
Expand Down
4 changes: 3 additions & 1 deletion samples/dash-if-reference-player/app/rules/DownloadRatioRule.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ function DownloadRatioRuleClass() {
}

function getBytesLength(request) {
return request.trace.reduce((a, b) => a + b.b[0], 0);
return request.trace.reduce(function (a, b) {
return a + b.b[0];
}, 0);
}

function getMaxIndex(rulesContext) {
Expand Down
72 changes: 36 additions & 36 deletions samples/dash-if-reference-player/app/src/cast.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ let CastPlayer = function (player, playerController) {

payload.type = type;

handlers[type] = handlers[type].filter((item) => item);
handlers[type].forEach( handler => handler && handler.callback.call(handler.scope, payload) );
handlers[type] = handlers[type].filter(function (item) { return item });
handlers[type].forEach(function (handler) { handler && handler.callback.call(handler.scope, payload) });
}

function getHandlerIdx(type, listener, scope) {
Expand All @@ -58,7 +58,7 @@ let CastPlayer = function (player, playerController) {

if (!handlers[type]) return idx;

handlers[type].some( (item, index) => {
handlers[type].some(function (item, index) {
if (item && item.callback === listener && (!scope || scope === item.scope)) {
idx = index;
return true;
Expand All @@ -72,34 +72,34 @@ let CastPlayer = function (player, playerController) {
}

(function () {
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.CURRENT_TIME_CHANGED, e => {
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.CURRENT_TIME_CHANGED, function (e) {
if (remotePlayer && remotePlayer.isMediaLoaded) {
trigger(dashjs.MediaPlayer.events.PLAYBACK_TIME_UPDATED);
}
});
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.DURATION_CHANGED, () => {
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.DURATION_CHANGED, function () {
if (remotePlayer && remotePlayer.duration) {
duration = remotePlayer.duration;
}
});
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.MEDIA_INFO_CHANGED, () => {
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.MEDIA_INFO_CHANGED, function () {
if (remotePlayer && remotePlayer.mediaInfo) {
if (!tracksAdded && remotePlayer.mediaInfo.tracks) {
let tracks = remotePlayer.mediaInfo.tracks.map(track => {
let tracks = remotePlayer.mediaInfo.tracks.map(function (track) {
track.labels = [];
track.lang = track.language;
track.kind = track.roles && track.roles[0];
return track;
});
trigger(dashjs.MediaPlayer.events.STREAM_INITIALIZED);
let textTracks = tracks.filter(track => track.type === 'TEXT');
let textTracks = tracks.filter(function (track) { return track.type === 'TEXT' });
if (textTracks.length > 0) {
trigger(dashjs.MediaPlayer.events.TEXT_TRACKS_ADDED, { tracks: textTracks });
}
}
}
});
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.PLAYER_STATE_CHANGED, () => {
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.PLAYER_STATE_CHANGED, function () {
if (remotePlayer) {
// trigger same events than dashjs MediaPlayer in order to update ControlBar
switch (remotePlayer.playerState) {
Expand All @@ -115,12 +115,12 @@ let CastPlayer = function (player, playerController) {
}
}
});
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.IS_MUTED_CHANGED, () => {
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.IS_MUTED_CHANGED, function () {
if (remotePlayer) {
console.info(remotePlayer.isMuted);
}
});
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.VOLUME_LEVEL_CHANGED, () => {
remotePlayerController.addEventListener(cast.framework.RemotePlayerEventType.VOLUME_LEVEL_CHANGED, function () {
if (remotePlayer) {
console.info(remotePlayer.volumeLevel);
}
Expand All @@ -134,74 +134,74 @@ let CastPlayer = function (player, playerController) {
reset: reset,
setCastSession: setCastSession,
/// PLAYBACK FUNCTIONS
play () {
play: function () {
if (remotePlayer.isPaused) {
remotePlayerController.playOrPause();
}
},
pause () {
pause: function () {
if (!remotePlayer.isPaused) {
remotePlayerController.playOrPause();
}
},
seek (time) {
seek: function (time) {
remotePlayer.currentTime = time;
remotePlayerController.seek();
},
isDynamic () {
isDynamic: function () {
return remotePlayer && remotePlayer.mediaInfo && remotePlayer.mediaInfo.streamType === chrome.cast.media.StreamType.LIVE;
},
isPaused () {
isPaused: function () {
return remotePlayer.isPaused;
},
duration () {
duration: function () {
return remotePlayer.duration;
},
time () {
time: function () {
return remotePlayer.currentTime;
},
/// VOLUME FUNCTIONS
getVolume () {
getVolume: function () {
return remotePlayer.volumeLevel;
},
setVolume (value) {
setVolume: function (value) {
remotePlayer.volumeLevel = value;
remotePlayerController.setVolumeLevel();
},
isMuted () {
isMuted: function () {
return remotePlayer.isMuted;
},
setMute (value) {
setMute: function (value) {
if (remotePlayer.isMuted && value === false || !remotePlayer.isMuted && value === true) {
remotePlayerController.muteOrUnmute();
}
},
convertToTimeCode (value) {
convertToTimeCode: function (value) {
return fakePlayer.convertToTimeCode(value);
},
//TRACK MANAGEMENT
getActiveTrackIds() {
getActiveTrackIds: function () {
let mediaSession = castSession.getMediaSession();
if (mediaSession && mediaSession.activeTrackIds && mediaSession.activeTrackIds.length > 1) {
return mediaSession.activeTrackIds;
}
return [];
},
getTracksFor (type) {
getTracksFor: function (type) {
let mediaSession = castSession.getMediaSession();
if (mediaSession && mediaSession.media && mediaSession.media.tracks) {
let tracks = mediaSession.media.tracks.filter(track => track.type.toLowerCase() === type);
let tracks = mediaSession.media.tracks.filter(function (track) { return track.type.toLowerCase() === type });
return tracks;
}
},
getCurrentTextTrackIndex () {
getCurrentTextTrackIndex: function () {
let mediaSession = castSession.getMediaSession();
if (mediaSession && mediaSession.activeTrackIds && mediaSession.activeTrackIds.length > 1) {
return this.getTracksFor('text').findIndex(track => track.trackId === mediaSession.activeTrackIds[1]);
return this.getTracksFor('text').findIndex(function (track) { return track.trackId === mediaSession.activeTrackIds[1] });
}
return -1;
},
setTextTrack (index) {
setTextTrack: function (index) {
let activeTrackIds = this.getActiveTrackIds();
if (index === -1 && activeTrackIds.length === 2) {
activeTrackIds.pop();
Expand All @@ -215,26 +215,26 @@ let CastPlayer = function (player, playerController) {
}
let tracksInfoRequest = new chrome.cast.media.EditTracksInfoRequest(activeTrackIds);
let mediaSession = castSession.getMediaSession();
mediaSession.editTracksInfo(tracksInfoRequest, () => {
mediaSession.editTracksInfo(tracksInfoRequest, function () {
console.log('track changed');
}, () => {
}, function () {
console.error('error track changed');
});
},
getCurrentTrackFor (type) {
getCurrentTrackFor: function (type) {
let mediaSession = castSession.getMediaSession();
if (mediaSession && mediaSession.activeTrackIds && mediaSession.media && mediaSession.media.tracks) {
return mediaSession.media.tracks.find(track => track.trackId === mediaSession.activeTrackIds[0]);
return mediaSession.media.tracks.find(function (track) { track.trackId === mediaSession.activeTrackIds[0] });
}
},
setCurrentTrack (track) {
setCurrentTrack: function (track) {
let activeTrackIds = this.getActiveTrackIds();
activeTrackIds[0] = track.trackId;
let tracksInfoRequest = new chrome.cast.media.EditTracksInfoRequest(activeTrackIds);
let mediaSession = castSession.getMediaSession();
mediaSession.editTracksInfo(tracksInfoRequest, () => {
mediaSession.editTracksInfo(tracksInfoRequest, function () {
console.log('track changed');
}, () => {
}, function () {
console.error('error track changed');
});
}
Expand Down

0 comments on commit 7917102

Please sign in to comment.