Skip to content

Commit

Permalink
feat(FEC-9314): update Shaka version
Browse files Browse the repository at this point in the history
remove patches and fixes that wrote for Shaka previous version and update the current method to work with new Shaka api
  • Loading branch information
Yuvalke committed Sep 12, 2019
1 parent fb6d44b commit 04aa3e4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 19 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"mocha": "^3.2.0",
"mocha-cli": "^1.0.1",
"prettier": "^1.13.7",
"shaka-player": "https://github.com/kaltura/shaka-player.git#v2.3.3-k-3",
"shaka-player": "^2.5.5",
"sinon": "^2.0.0",
"sinon-chai": "^2.8.0",
"standard-version": "^4.0.0",
Expand All @@ -77,8 +77,8 @@
"webpack-dev-server": "latest"
},
"peerDependencies": {
"@playkit-js/playkit-js": "0.52.0",
"shaka-player": "https://github.com/kaltura/shaka-player.git#v2.3.3-k-3"
"@playkit-js/playkit-js": "^0.52.0",
"shaka-player": "^2.5.5"
},
"keywords": [
"kaltura",
Expand Down
19 changes: 6 additions & 13 deletions src/dash-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,6 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
* @private
*/
_shaka: any;
/**
* attached the media events after attachMediaSource
* @member {boolean} _isMediaAttached
* @private
*/
_isMediaAttached: boolean = false;
/**
* an object containing all the events we bind and unbind to.
* @member {Object} - _adapterEventsBindings
Expand Down Expand Up @@ -302,6 +296,7 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
DashAdapter._logger.debug('Creating adapter. Shaka version: ' + shaka.Player.version);
super(videoElement, source, config);
this._setShakaConfig();
this._init();
}

/**
Expand All @@ -328,11 +323,10 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
_init(): void {
//Need to call this again cause we are uninstalling the VTTCue polyfill to avoid collisions with other libs
shaka.polyfill.installAll();
this._shaka = new shaka.Player(this._videoElement);
this._shaka = new shaka.Player();
this._maybeSetFilters();
this._maybeSetDrmConfig();
this._shaka.configure(this._config.shakaConfig);
this._isMediaAttached = true;
this._addBindings();
}

Expand Down Expand Up @@ -452,11 +446,12 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
* @returns {void}
*/
attachMediaSource(): void {
if (!this._isMediaAttached) {
if (!this._shaka) {
if (this._videoElement && this._videoElement.src) {
Utils.Dom.setAttribute(this._videoElement, 'src', '');
Utils.Dom.removeAttribute(this._videoElement, 'src');
}
this._init();
const _seekAfterDetach = () => {
if (parseInt(this._lastTimeDetach) === parseInt(this.duration)) {
this.currentTime = 0;
Expand All @@ -468,7 +463,6 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
if (!isNaN(this._lastTimeDetach)) {
this._eventManager.listenOnce(this._videoElement, EventType.LOADED_DATA, () => _seekAfterDetach());
}
this._isMediaAttached = true;
}
}
/**
Expand All @@ -477,7 +471,7 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
* @returns {void}
*/
detachMediaSource(): void {
if (this._isMediaAttached) {
if (this._shaka) {
this._lastTimeDetach = this.currentTime;
this._reset().then(() => {
this._shaka = null;
Expand Down Expand Up @@ -560,7 +554,7 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
*/
load(startTime: ?number): Promise<Object> {
if (!this._loadPromise) {
this._init();
this._shaka.attach(this._videoElement);
this._loadPromise = new Promise((resolve, reject) => {
if (this._sourceObj && this._sourceObj.url) {
this._trigger(EventType.ABR_MODE_CHANGED, {mode: this.isAdaptiveBitrateEnabled() ? 'auto' : 'manual'});
Expand Down Expand Up @@ -609,7 +603,6 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
this._waitingSent = false;
this._playingSent = false;
this._requestFilterError = false;
this._isMediaAttached = false;
this._clearVideoUpdateTimer();
if (this._eventManager) {
this._eventManager.removeAll();
Expand Down
7 changes: 4 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5056,9 +5056,10 @@ sha.js@^2.4.0, sha.js@^2.4.8:
dependencies:
inherits "^2.0.1"

"shaka-player@https://github.com/kaltura/shaka-player.git#v2.3.3-k-3":
version "2.3.3"
resolved "https://github.com/kaltura/shaka-player.git#cec56a7e777bfbd969260aa3602cfa4c1c5d9e93"
shaka-player@^2.5.5:
version "2.5.5"
resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-2.5.5.tgz#81e7265f28f631afd3837c06ec6637824bda71e4"
integrity sha512-YEWBFapWKjwy2+wIgH9NqoFW9A14LIYNAoJ9cQr3c9BGS7qjqxeiYM/H1BJ8so1FQexpsWUdyjwHvcspdc7/nw==

shebang-command@^1.2.0:
version "1.2.0"
Expand Down

0 comments on commit 04aa3e4

Please sign in to comment.