Skip to content

Commit

Permalink
fix(FEC-8685): when disconnecting from cast player state is wrong - l…
Browse files Browse the repository at this point in the history
…ocal and cast mode is not in sync (#170)

Update playback started event enum => first playing.
In addition, set the initial tracks on tracks changed event and not on playback start event.
  • Loading branch information
Dan Ziv authored Nov 13, 2018
1 parent 462c111 commit 263f915
Show file tree
Hide file tree
Showing 9 changed files with 397 additions and 356 deletions.
722 changes: 369 additions & 353 deletions docs/api.md

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
"playkit-dev-ott:start": "playkit-dev start ott",
"playkit-dev:stop": "playkit-dev stop",
"playkit-rel": "playkit-rel start",
"precommit": "lint-staged"
"precommit": "lint-staged",
"docs:generate": "documentation build flow-typed/** src/** -f md -o docs/api.md",
"docs:serve": "documentation serve flow-typed/** src/** --watch"
},
"lint-staged": {
"*.{js,jsx}": [
Expand Down
14 changes: 14 additions & 0 deletions src/common/cast/player-snapshot.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,26 @@ class PlayerSnapshot {
* @memberof PlayerSnapshot
*/
advertising: ?Object;
/**
* @type {number}
* @instance
* @memberof PlayerSnapshot
*/
volume: number;
/**
* @type {boolean}
* @instance
* @memberof PlayerSnapshot
*/
muted: boolean;

constructor(player: KalturaPlayer) {
this.startTime = getStartTime(player);
this.autoplay = player.currentTime === 0 ? true : !player.paused;
this.textStyle = player.textStyle;
this.mediaInfo = player.getMediaInfo();
this.volume = player.volume;
this.muted = player.muted;
this.audioLanguage = getLanguage(TrackType.AUDIO, player);
this.textLanguage = getLanguage(TrackType.TEXT, player);
this.advertising = player.config.plugins && player.config.plugins.ima;
Expand Down
6 changes: 4 additions & 2 deletions src/common/cast/remote-control.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ function onRemoteDeviceDisconnected(payload: RemoteDisconnectedPayload): void {
const mediaInfo = snapshot.mediaInfo;
if (mediaInfo) {
this.loadMedia(mediaInfo).then(() => {
this._eventManager.listenOnce(this, this.Event.Core.PLAYBACK_STARTED, () => {
this._eventManager.listenOnce(this, this.Event.Core.FIRST_PLAYING, () => {
setInitialAttributes.call(this, snapshot);
setInitialTracks.call(this, snapshot);
configurePlayback.call(this, originPlaybackConfig);
setInitialTracks.call(this, snapshot);
});
});
}
Expand Down Expand Up @@ -219,6 +219,8 @@ function configurePlayback(snapshot: PlayerSnapshot): void {

function setInitialAttributes(snapshot: PlayerSnapshot): void {
this.textStyle = snapshot.textStyle;
this.volume = snapshot.volume;
this.muted = snapshot.muted;
}

function setInitialTracks(snapshot: PlayerSnapshot): void {
Expand Down
1 change: 1 addition & 0 deletions src/ott/player-defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {Utils} from '@playkit-js/playkit-js';
/**
* Sets the default analytics plugin for the ott player.
* @param {KPOptionsObject} options - The player config.
* @private
* @returns {void}
*/
export function setDefaultAnalyticsPlugin(options: KPOptionsObject): void {
Expand Down
3 changes: 3 additions & 0 deletions src/ott/poster.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* @param {PKSourcesConfigObject} playerSources - player sources container
* @param {ProviderMediaConfigSourcesObject} mediaSources - media config sources container
* @param {Object} dimensions - player dimensions object
* @private
* @returns {void}
*/
function addKalturaPoster(playerSources: PKSourcesConfigObject, mediaSources: ProviderMediaConfigSourcesObject, dimensions: Object): void {
Expand All @@ -28,6 +29,7 @@ function addKalturaPoster(playerSources: PKSourcesConfigObject, mediaSources: Pr
* @param {string} poster - Player url.
* @param {number} playerWidth - Player width.
* @param {height} playerHeight - Player height.
* @private
* @return {string} - The new poster url including the player dimensions.
*/
function setPlayerDimensionsOnPoster(poster: string, playerWidth: number, playerHeight: number): string {
Expand All @@ -47,6 +49,7 @@ function setPlayerDimensionsOnPoster(poster: string, playerWidth: number, player
* @param {string} posters - Array of posters candidates.
* @param {number} playerWidth - Player width.
* @param {height} playerHeight - Player height.
* @private
* @return {string} - The poster url.
*/
function selectPosterByPlayerDimensions(posters: Array<Object>, playerWidth: number, playerHeight: number): string {
Expand Down
1 change: 1 addition & 0 deletions src/ovp/player-defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {Utils} from '@playkit-js/playkit-js';
/**
* Sets the default analytics plugin for the ovp player.
* @param {KPOptionsObject} options - The player config.
* @private
* @returns {void}
*/
export function setDefaultAnalyticsPlugin(options: KPOptionsObject): void {
Expand Down
1 change: 1 addition & 0 deletions src/ovp/poster.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @param {PKSourcesConfigObject} playerSources - player sources container
* @param {ProviderMediaConfigSourcesObject} mediaSources - media config sources container
* @param {Object} dimensions - player dimensions object
* @private
* @returns {void}
*/
function addKalturaPoster(playerSources: PKSourcesConfigObject, mediaSources: ProviderMediaConfigSourcesObject, dimensions: Object): void {
Expand Down
1 change: 1 addition & 0 deletions src/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
/**
* Setup the Kaltura Player.
* @param {PartialKPOptionsObject|LegacyPartialKPOptionsObject} options - partial kaltura player options
* @private
* @returns {KalturaPlayer} - The Kaltura Player.
*/
function setup(options: PartialKPOptionsObject | LegacyPartialKPOptionsObject): KalturaPlayer {
Expand Down

0 comments on commit 263f915

Please sign in to comment.