Skip to content

Commit a36cb1b

Browse files
committed
Merge remote-tracking branch 'origin/development' into fix/#4416
2 parents 14228be + 51cb1f1 commit a36cb1b

File tree

19 files changed

+177
-111
lines changed

19 files changed

+177
-111
lines changed

CONTRIBUTING.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# How to contribute #
2+
3+
> **Note:** For the most up-to-date contribution guidelines, please refer to our official documentation at [https://dashif.org/dash.js/pages/developers/how-to-contribute.html](https://dashif.org/dash.js/pages/developers/how-to-contribute.html)
4+
25
As an open source project, operating under a [meritocratic governance model](https://github.com/Dash-Industry-Forum/dash.js/wiki/governance-model), we welcome contributions of any kind. Naturally this includes software contributions, but we also welcome help on documentation, testing, project coordination, marketing, [release preparation](https://github.com/Dash-Industry-Forum/dash.js/wiki/Release-Management) and more.
36

47
For any kind of contribution your first port of call should be to join our [mailing list]( https://groups.google.com/d/forum/dashjs). We welcome all contributions to the mailing list (including asking questions which demonstrate our documentation needs to be improved).
@@ -38,12 +41,12 @@ If you find a low priority issues is affecting your use case then the only way t
3841
## Process for contributing code
3942

4043
1. Before starting work on a new feature, enhancement or fix, ask the group if anyone else is already working on the same task. This will avoid duplication of effort.
41-
1. Read and understand the wiki sections on [Developer Getting Started Guide](https://github.com/Dash-Industry-Forum/dash.js/wiki/Developer-Getting-Started-Guide) and [JSLint compliance](https://github.com/Dash-Industry-Forum/dash.js/wiki/JSLint-Compliance).
44+
1. Read and understand the developer documentation at [https://dashif.org/dash.js/pages/developers/](https://dashif.org/dash.js/pages/developers/), including information about code quality and ESLint compliance.
4245
1. Read and understand the project's [Branching Strategy](http://nvie.com/posts/a-successful-git-branching-model/).
4346
1. Fork the repository and setup a new branch to work in.
4447
1. In each of your files, include the required BSD-3 header available [here](https://dashif.org/docs/dash.js.license-header.May2013.txt). Be sure to replace the placeholder text "YOUR_COMPANY_NAME_HERE" with the name of your company before adding it to the header.
4548
1. Add or modify unit tests for any new or modified functionality in your patch.
46-
1. Run `grunt` before you commit so that you may catch test failures, lint issues, or syntax errors. Pull requests that do not compile or pass linter checks or pass all unit tests will not be accepted.
49+
1. Run `npm run build` before you commit so that you may catch test failures, lint issues, or syntax errors. Pull requests that do not compile or pass linter checks or pass all unit tests will not be accepted.
4750
1. If you are submitting code as an individual or on behalf of a company who is _not a member_ of the DASH [Industry Forum](http://dashif.org/members), then download, sign, scan and email back to the email list the [Feedback Agreement](https://dashif.org/docs/DASH-IF-Feedback-Agreement-3-7-2014.pdf). Your code will not be reviewed and accepted by the Admins until this has been received. DASH IF members do not need to take this step, as the Forum's By-Laws already cover your submission to this open source project.
4851
1. Issue a Pull Request.
4952
1. The Admins will review your code and may optionally request conformance, functional or other changes. Work with them to resolve any issues.

index.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,8 @@ export class MediaPlayerSettingClass {
17541754
defaultTimingSource?: {
17551755
scheme?: string,
17561756
value?: string
1757-
}
1757+
},
1758+
artificialTimeOffsetToApply?: number
17581759
},
17591760
scheduling?: {
17601761
defaultTimeout?: number,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dashjs",
3-
"version": "5.1.0",
3+
"version": "5.1.1",
44
"description": "A reference client implementation for the playback of MPEG DASH via Javascript and compliant browsers.",
55
"author": "Dash Industry Forum",
66
"license": "BSD-3-Clause",

samples/dash-if-reference-player/app/main.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,16 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
759759
});
760760
};
761761

762+
$scope.updateUtcTimeSyncOffset = function () {
763+
$scope.player.updateSettings({
764+
streaming: {
765+
utcSynchronization: {
766+
artificialTimeOffsetToApply: parseInt($scope.utcTimeSyncOffset)
767+
}
768+
}
769+
});
770+
};
771+
762772
$scope.updateInitialBitrateVideo = function () {
763773
$scope.player.updateSettings({
764774
streaming: {
@@ -2511,6 +2521,11 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
25112521
$scope.useSuggestedPresentationDelay = currentConfig.streaming.delay.useSuggestedPresentationDelay;
25122522
}
25132523

2524+
function setUtcTimeSyncOptions() {
2525+
var currentConfig = $scope.player.getSettings();;
2526+
$scope.utcTimeSyncOffset = currentConfig.streaming.utcSynchronization.artificialTimeOffsetToApply;
2527+
}
2528+
25142529
function setStallThresholdOptions() {
25152530
var currentConfig = $scope.player.getSettings();
25162531
$scope.stallThreshold = currentConfig.streaming.buffer.stallThreshold;
@@ -2677,6 +2692,7 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
26772692
setDrmOptions();
26782693
setTextOptions();
26792694
setLiveDelayOptions();
2695+
setUtcTimeSyncOptions();
26802696
setStallThresholdOptions()
26812697
setInitialSettings();
26822698
setTrackSwitchModeSettings();

0 commit comments

Comments
 (0)