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

Jump to bottom

FactoryMaker exports #2081

Merged
merged 2 commits into from
Aug 10, 2017
Merged

FactoryMaker exports #2081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
813fbee
Fix export of FactoryMaker.
jeremco Jul 12, 2017
9ffbc00
Fix DownloadRatioRule sample
jeremco Jul 12, 2017
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
38 changes: 3 additions & 35 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,6 @@ module.exports = function (grunt) {
}
},

build_factorymaker: {
options: {
sourceMapIn: 'build/temp/dash.factorymaker.debug.js.map'
},
files: {
'build/temp/dash.factorymaker.min.js': 'build/temp/dash.factorymaker.debug.js'
}
},

build_reporting: {
options: {
sourceMapIn: 'build/temp/dash.reporting.debug.js.map'
Expand Down Expand Up @@ -112,7 +103,6 @@ module.exports = function (grunt) {
'dash.mss.min.js', 'dash.mss.min.js.map',
'dash.mediaplayer.debug.js', 'dash.mediaplayer.debug.js.map',
'dash.protection.debug.js', 'dash.protection.debug.js.map',
'dash.factorymaker.debug.js', 'dash.factorymaker.debug.js.map',
'dash.reporting.debug.js', 'dash.reporting.debug.js.map',
'dash.mss.debug.js', 'dash.mss.debug.js.map'
],
Expand Down Expand Up @@ -159,12 +149,6 @@ module.exports = function (grunt) {
'build/temp/dash.reporting.debug.js.map': ['build/temp/dash.reporting.debug.js']
}
},
factorymaker: {
options: {},
files: {
'build/temp/dash.factorymaker.debug.js.map': ['build/temp/dash.factorymaker.debug.js']
}
},
mss: {
options: {},
files: {
Expand All @@ -189,12 +173,11 @@ module.exports = function (grunt) {
browserify: {
mediaplayer: {
files: {
'build/temp/dash.mediaplayer.debug.js': ['src/streaming/MediaPlayer.js']
'build/temp/dash.mediaplayer.debug.js': ['index_mediaplayerOnly.js']
},
options: {
browserifyOptions: {
debug: true,
standalone: 'dashjs.MediaPlayer'
debug: true
},
plugin: [
'browserify-derequire', 'bundle-collapser/plugin'
Expand Down Expand Up @@ -232,21 +215,6 @@ module.exports = function (grunt) {
transform: ['babelify']
}
},
factorymaker: {
files: {
'build/temp/dash.factorymaker.debug.js': ['src/core/FactoryMaker.js']
},
options: {
browserifyOptions: {
debug: true,
standalone: 'dashjs.FactoryMaker'
},
plugin: [
'browserify-derequire', 'bundle-collapser/plugin'
],
transform: ['babelify']
}
},
all: {
files: {
'build/temp/dash.all.debug.js': ['index.js']
Expand Down Expand Up @@ -330,7 +298,7 @@ module.exports = function (grunt) {

require('load-grunt-tasks')(grunt);
grunt.registerTask('default', ['dist', 'test']);
grunt.registerTask('dist', ['clean', 'jshint', 'jscs', 'browserify:mediaplayer', 'browserify:factorymaker', 'browserify:protection', 'browserify:reporting', 'browserify:mss', 'browserify:all', 'babel:es5', 'minimize', 'copy:dist']);
grunt.registerTask('dist', ['clean', 'jshint', 'jscs', 'browserify:mediaplayer', 'browserify:protection', 'browserify:reporting', 'browserify:mss', 'browserify:all', 'babel:es5', 'minimize', 'copy:dist']);
grunt.registerTask('minimize', ['exorcise', 'githash', 'uglify']);
grunt.registerTask('test', ['mocha_istanbul:test']);
grunt.registerTask('watch', ['browserify:watch']);
Expand Down
49 changes: 49 additions & 0 deletions index_mediaplayerOnly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/**
* The copyright in this software is being made available under the BSD License,
* included below. This software may be subject to other third party and contributor
* rights, including patent rights, and no such rights are granted under this license.
*
* Copyright (c) 2013, Dash Industry Forum.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation and/or
* other materials provided with the distribution.
* * Neither the name of Dash Industry Forum nor the names of its
* contributors may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/

import MediaPlayer from './src/streaming/MediaPlayer';
import FactoryMaker from './src/core/FactoryMaker';
import {getVersionString} from './src/core/Version';

// Shove both of these into the global scope
var context = (typeof window !== 'undefined' && window) || global;

var dashjs = context.dashjs;
if (!dashjs) {
dashjs = context.dashjs = {};
}

dashjs.MediaPlayer = MediaPlayer;
dashjs.FactoryMaker = FactoryMaker;
dashjs.Version = getVersionString();

export default dashjs;
export { MediaPlayer, FactoryMaker};
17 changes: 10 additions & 7 deletions samples/dash-if-reference-player/app/rules/DownloadRatioRule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

/*global dashjs*/

var DownloadRatioRule;
let DownloadRatioRule;

function DownloadRatioRuleClass() {

Expand All @@ -40,6 +40,7 @@ function DownloadRatioRuleClass() {
let MetricsModel = factory.getSingletonFactoryByName('MetricsModel');
let DashMetrics = factory.getSingletonFactoryByName('DashMetrics');
let DashManifestModel = factory.getSingletonFactoryByName('DashManifestModel');
let StreamController = factory.getSingletonFactoryByName('StreamController');
let Debug = factory.getSingletonFactoryByName('Debug');

let context = this.context;
Expand All @@ -51,15 +52,17 @@ function DownloadRatioRuleClass() {

function getMaxIndex(rulesContext) {

var mediaType = rulesContext.getMediaInfo().type;
var current = rulesContext.getCurrentValue();
let mediaType = rulesContext.getMediaInfo().type;

let metricsModel = MetricsModel(context).getInstance();
let dashMetrics = DashMetrics(context).getInstance();
let dashManifest = DashManifestModel(context).getInstance();
var metrics = metricsModel.getReadOnlyMetricsFor(mediaType);
let metrics = metricsModel.getReadOnlyMetricsFor(mediaType);
let streamController = StreamController(context).getInstance();
let abrController = rulesContext.getAbrController();
let current = abrController.getQualityFor(mediaType, streamController.getActiveStreamInfo());

var requests = dashMetrics.getHttpRequests(metrics),
let requests = dashMetrics.getHttpRequests(metrics),
lastRequest = null,
currentRequest = null,
downloadTime,
Expand Down Expand Up @@ -125,8 +128,8 @@ function DownloadRatioRuleClass() {

if (currentRequest.type !== 'MediaSegment' && currentRequest._tfinish && currentRequest.trequest && currentRequest.tresponse && currentRequest.trace && currentRequest.trace.length > 0) {

var _totalTime = (currentRequest._tfinish.getTime() - currentRequest.trequest.getTime()) / 1000;
var _downloadTime = (currentRequest._tfinish.getTime() - currentRequest.tresponse.getTime()) / 1000;
let _totalTime = (currentRequest._tfinish.getTime() - currentRequest.trequest.getTime()) / 1000;
let _downloadTime = (currentRequest._tfinish.getTime() - currentRequest.tresponse.getTime()) / 1000;
debug.log("[CustomRules][" + mediaType + "][DownloadRatioRule] DL: " + Number(_downloadTime.toFixed(3)) + "s, Total: " + Number(_totalTime.toFixed(3)) + "s, Length: " + getBytesLength(currentRequest));

totalTime += _totalTime;
Expand Down