Skip to content

Commit cf28b2a

Browse files
committed
v2.5.03 - Set default to auto mode.
1 parent cb66d2b commit cf28b2a

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

example/player/js/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ui.setup(player, {
4747
lowlatency: true, // ll-dash, ll-hls, ll-flv/fmp4 (auto reduce latency due to cumulative ack of tcp)
4848
maxBufferLength: 1.5, // sec.
4949
maxRetries: 0, // maximum number of retries while some types of error occurs. -1 means always
50-
mode: 'live', // live, vod
50+
mode: 'auto', // auto, live, vod
5151
module: 'FLV', // SRC, FLV, FMP4, DASH*, HLS*, RTC
5252
objectfit: 'contain', // fill, contain, cover, none, scale-down
5353
retrying: 0, // ms. retrying interval

src/odd.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
odd = function () {
22
return {
3-
version: '2.5.02',
3+
version: '2.5.03',
44
};
55
};
66

src/player/player.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
maxBufferLength: 1.5, // sec.
2020
maxPlaybackLength: 10, // sec. for live mode only, set NaN to disable
2121
maxRetries: 0, // maximum number of retries while some types of error occurs. -1 means always
22-
mode: 'live', // live, vod
22+
mode: 'auto', // auto, live, vod
2323
module: '', // SRC, FLV, FMP4, DASH*, HLS*, RTC
2424
muted: false,
2525
objectfit: 'contain', // fill, contain, cover, none, scale-down

src/player/player.model.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,30 @@
5858
};
5959

6060
_this.duration = function (duration) {
61-
if (utils.typeOf(duration) === 'number') {
62-
if (duration !== _duration && !(isNaN(_duration) && isNaN(duration))) {
63-
_logger.log('Model duration change: ' + duration);
61+
if (utils.typeOf(duration) === 'number' && duration !== _duration && !(isNaN(_duration) && isNaN(duration))) {
62+
_logger.log('Model duration change: ' + duration);
63+
if (_usermode === 'auto') {
6464
// NaN -> Infinity: live
6565
// NaN -> Number: vod
6666
// Infinity -> NaN: live
6767
// Infinity -> Number: live
6868
// Number -> NaN: user config
6969
// Number -> Infinity: live (should not happen)
7070
// Number -> Number: live (Mac Safari)
71+
var mode;
7172
if (isNaN(_duration) && duration !== Infinity) {
72-
_this.config.mode = 'vod';
73+
mode = 'vod';
7374
} else if (_duration !== Infinity && isNaN(duration)) {
74-
_this.config.mode = _usermode;
75+
mode = _usermode;
7576
} else {
76-
_this.config.mode = 'live';
77+
mode = 'live';
78+
}
79+
if (_this.config.mode !== mode) {
80+
_this.config.mode = mode;
81+
_logger.log('Model mode change: ' + _this.config.mode);
7782
}
78-
_duration = duration;
7983
}
84+
_duration = duration;
8085
}
8186
return _duration;
8287
};

0 commit comments

Comments
 (0)