Merge remote-tracking branch 'origin/development'

.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-    browser-tools: circleci/[email protected].1
+    browser-tools: circleci/[email protected].4
 
 executors:
     dashjs-executor:
@@ -49,7 +49,8 @@ commands:
 
     build_unit_test_steps:
         steps:
-            - browser-tools/install-browser-tools
+            - browser-tools/install-browser-tools:
+                chrome-version: 116.0.5845.96 # TODO remove this when google updates the chrome driver
             -   run:
                     name: Build and run unit tests
                     command: |

.gitignore

@@ -188,3 +188,7 @@ build/typings/
 
 # Vim
 .vimrc
+
+#Karma Functional tests
+test/functional-karma/coverage
+test/functional-karma/results

AUTHORS.md

@@ -48,3 +48,4 @@
 * @epiclabsDASH [Jesus Oliva, Epic Labs]
 * @adripanico [Adrian Caballero, Epic Labs]
 * @ahfarmer [Andrew Farmer, Rhombus Systems]
+* @matvp91 [Matthias Van Parijs]

build/webpack.base.js

@@ -5,6 +5,7 @@ const out_dir = '../dist';
 
 const config = {
     devtool: 'source-map',
+    target: ['web', 'es5'],
     output: {
         path: path.resolve(__dirname, out_dir),
         publicPath: '/dist/',

index.d.ts

@@ -758,8 +758,6 @@ declare namespace dashjs {
         addHttpRequest(request: HTTPRequest, responseURL: string, responseStatus: number, responseHeaders: object, traces: object): void;
 
         addManifestUpdateRepresentationInfo(representation: Representation, mediaType: MediaType): void;
-
-        updateSource(urlOrManifest: string | object): void;
 
         getCurrentLiveLatency(): number;
 
@@ -989,6 +987,8 @@ declare namespace dashjs {
                 setStallState?: boolean
                 avoidCurrentTimeRangePruning?: boolean
                 useChangeTypeForTrackSwitch?: boolean
+                mediaSourceDurationInfinity?: boolean
+                resetSourceBuffersForTrackSwitch?: boolean
             },
             gaps?: {
                 jumpGaps?: boolean,
@@ -1044,6 +1044,7 @@ declare namespace dashjs {
                 enabled?: boolean;
                 ttl?: number;
             };
+            saveLastMediaSettingsForCurrentStreamingSession?: boolean;
             cacheLoadThresholds?: {
                 video?: number;
                 audio?: number;
@@ -1288,6 +1289,8 @@ declare namespace dashjs {
 
         getDVRSeekOffset(value: number): number;
 
+        getTargetLiveDelay(): number;
+
         convertToTimeCode(value: number): string;
 
         formatUTC(time: number, locales: string, hour12: boolean, withDate?: boolean): string;
@@ -1306,6 +1309,8 @@ declare namespace dashjs {
 
         getSource(): string | object;
 
+        updateSource(urlOrManifest: string | object): void;
+
         getCurrentLiveLatency(): number;
 
         getTopBitrateInfoFor(type: MediaType): BitrateInfo;
@@ -1344,7 +1349,7 @@ declare namespace dashjs {
 
         getInitialMediaSettingsFor(type: MediaType): MediaSettings;
 
-        setCurrentTrack(track: MediaInfo): void;
+        setCurrentTrack(track: MediaInfo, noSettingsSave?: boolean): void;
 
         addABRCustomRule(type: string, rulename: string, rule: object): void;
 
@@ -4067,7 +4072,7 @@ declare namespace dashjs {
         startTime: number;
         timescale: number;
         type: 'InitializationSegment' | 'MediaSegment' | null;
-        url: string;
+        url: string | null;
         wallStartTime: number | null;
     }
 

karma.functional.conf.js

@@ -0,0 +1,124 @@
+module.exports = function (config) {
+    config.set({
+
+        // base path that will be used to resolve all patterns (eg. files, exclude)
+        basePath: 'test/functional-karma',
+
+
+        // frameworks to use
+        // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+        frameworks: ['mocha', 'chai', 'webpack'],
+
+        plugins: [
+            'karma-webpack',
+            'karma-mocha',
+            'karma-chai',
+            'karma-coverage',
+            'karma-mocha-reporter',
+            'karma-junit-reporter',
+            'karma-chrome-launcher',
+            'karma-firefox-launcher',
+            'karma-htmlfile-reporter'
+        ],
+
+        // list of files / patterns to load in the browser
+        // https://github.com/webpack-contrib/karma-webpack#alternative-usage
+        files: [
+            { pattern: 'https://imasdk.googleapis.com/js/sdkloader/ima3_dai.js', watched: false, nocache: true },
+            { pattern: '../../dist/dash.all.debug.js', watched: false, nocache: true },
+            { pattern: '../../dist/dash.mss.min.js', watched: false, nocache: true },
+            { pattern: 'test/**/*.js', watched: false },
+            { pattern: 'content/**/*.mpd', watched: false, included: false, served: true }
+        ],
+
+        // list of files / patterns to exclude
+        // exclude: ['test/vendor/*.js'],
+
+        customContextFile: 'view/index.html',
+
+        // test results reporter to use
+        // possible values: 'dots', 'progress'
+        // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+        reporters: ['mocha', 'html', 'progress', 'junit'],
+
+        // preprocess matching files before serving them to the browser
+        // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+        preprocessors: {
+            // add webpack as preprocessor
+            'test/**/*.js': ['webpack']
+        },
+
+        junitReporter: {
+            outputDir: 'results/karma/junit', // results will be saved as $outputDir/$browserName.xml
+            outputFile: undefined, // if included, results will be saved as $outputDir/$browserName/$outputFile
+            suite: '', // suite will become the package name attribute in xml testsuite element
+            useBrowserName: true, // add browser name to report and classes names
+            nameFormatter: undefined, // function (browser, result) to customize the name attribute in xml testcase element
+            classNameFormatter: undefined, // function (browser, result) to customize the classname attribute in xml testcase element
+            properties: {}, // key value pair of properties to add to the <properties> section of the report
+            xmlVersion: null // use '1' if reporting to be per SonarQube 6.2 XML format
+        },
+
+        htmlReporter: {
+            outputFile: 'results/karma/htmlreporter/out.html',
+
+            // Optional
+            pageTitle: 'dash.js',
+            subPageTitle: 'Functional Tests',
+            groupSuites: true,
+            useCompactStyle: true,
+            useLegacyStyle: true,
+            showOnlyFailed: false
+        },
+
+        webpack: {},
+
+        client: {
+            useIframe: false,
+            mocha: {
+                timeout: 180000
+            }
+        },
+
+        // web server port
+        port: 9876,
+
+
+        // enable / disable colors in the output (reporters and logs)
+        colors: true,
+
+
+        // level of logging
+        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+        logLevel: config.LOG_INFO,
+
+
+        // enable / disable watching file and executing tests whenever any file changes
+        autoWatch: false,
+
+        browserNoActivityTimeout: 180000,
+
+        // start these browsers
+        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+        browsers: ['chrome_custom'],
+
+        customLaunchers: {
+            chrome_custom: {
+                base: 'Chrome',
+                flags: ['--disable-web-security', '--autoplay-policy=no-user-gesture-required', '--disable-popup-blocking']
+            },
+            firefox_custom: {
+                base: 'Firefox',
+                prefs: {}
+            }
+        },
+
+        // Continuous Integration mode
+        // if true, Karma captures browsers, runs the tests and exits
+        singleRun: true,
+
+        // Concurrency level
+        // how many browser should be started simultaneous
+        concurrency: 2
+    })
+}