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

fix: source type update #41

Merged
merged 2 commits into from
Jan 28, 2018
+4 −4
Merged

fix: source type update #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b518a
source type update
odedhutzler Jan 15, 2018
ab8933a
Update dash-adapter.js
Jan 16, 2018
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
8 changes: 4 additions & 4 deletions src/dash-adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
* Factory method to create media source adapter.
* @function createAdapter
* @param {HTMLVideoElement} videoElement - The video element that the media source adapter work with.
* @param {Object} source - The source Object.
* @param {PKMediaSourceObject} source - The source Object.
* @param {Object} config - The player configuration.
* @returns {IMediaSourceAdapter} - New instance of the run time media source adapter.
* @static
*/
static createAdapter(videoElement: HTMLVideoElement, source: Source, config: Object): IMediaSourceAdapter {
static createAdapter(videoElement: HTMLVideoElement, source: PKMediaSourceObject, config: Object): IMediaSourceAdapter {
let dashConfig = {};
if (Utils.Object.hasPropertyPath(config, 'playback.options.html5.dash')) {
dashConfig = config.playback.options.html5.dash;
Expand Down Expand Up @@ -195,10 +195,10 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
/**
* @constructor
* @param {HTMLVideoElement} videoElement - The video element which bind to the dash adapter
* @param {Object} source - The source object
* @param {PKMediaSourceObject} source - The source object
* @param {Object} config - The media source adapter configuration
*/
constructor(videoElement: HTMLVideoElement, source: Object, config: Object = {}) {
constructor(videoElement: HTMLVideoElement, source: PKMediaSourceObject, config: Object = {}) {
DashAdapter._logger.debug('Creating adapter. Shaka version: ' + shaka.Player.version);
super(videoElement, source, config);
this._config = Utils.Object.mergeDeep({}, this._config, DefaultConfig);
Expand Down