ckplayer-plus 1.1.5 → 1.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ckplayer.js +35 -32
- package/dist/ckplayer.min.js +2 -2
- package/dist/index.cjs +31 -33
- package/dist/index.js +31 -33
- package/dist/react.cjs +31 -33
- package/dist/react.js +31 -33
- package/dist/vue.cjs +31 -33
- package/dist/vue.js +31 -33
- package/package.json +1 -1
package/dist/vue.js
CHANGED
|
@@ -204,7 +204,7 @@ var require_ckplayer = __commonJS({
|
|
|
204
204
|
cdnFallback: true
|
|
205
205
|
// getPath 失败时是否回退到 jsDelivr(内网可设 false,并配置 pluginPath)
|
|
206
206
|
};
|
|
207
|
-
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.
|
|
207
|
+
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.6/dist/";
|
|
208
208
|
function ckplayerEmbed(videoObj) {
|
|
209
209
|
var rightMenu = [
|
|
210
210
|
{
|
|
@@ -239,6 +239,7 @@ var require_ckplayer = __commonJS({
|
|
|
239
239
|
var hlsResumeWarmup = false;
|
|
240
240
|
var hlsLoadAt = -1;
|
|
241
241
|
var hlsLoadTs = 0;
|
|
242
|
+
var hlsScrubResumePlay = false;
|
|
242
243
|
var oldTime = 0, playTime = 0, firstSeekTime = -1, maxSeeTime = 0;
|
|
243
244
|
var isChangeDef = true;
|
|
244
245
|
var playType = "";
|
|
@@ -426,7 +427,7 @@ var require_ckplayer = __commonJS({
|
|
|
426
427
|
}
|
|
427
428
|
var allowCdn = !vars || vars["cdnFallback"] !== false;
|
|
428
429
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
429
|
-
if (!allowCdn || !cdn || cdn.indexOf("1.1.
|
|
430
|
+
if (!allowCdn || !cdn || cdn.indexOf("1.1.6") > -1) {
|
|
430
431
|
return folder + "/" + file;
|
|
431
432
|
}
|
|
432
433
|
if (cdn.slice(-1) !== "/") {
|
|
@@ -678,49 +679,31 @@ var require_ckplayer = __commonJS({
|
|
|
678
679
|
}
|
|
679
680
|
return true;
|
|
680
681
|
}, hlsInteractiveSeek = function(target) {
|
|
681
|
-
if (!hls || !video
|
|
682
|
+
if (!hls || !video) {
|
|
682
683
|
return false;
|
|
683
684
|
}
|
|
684
685
|
if (isNaN(target) || target < 0) {
|
|
685
686
|
target = 0;
|
|
686
687
|
}
|
|
687
|
-
var
|
|
688
|
+
var dur = duration || video.duration || 0;
|
|
689
|
+
if (dur && isFinite(dur) && dur > 0 && target >= dur) {
|
|
690
|
+
target = Math.max(0, dur - 0.3);
|
|
691
|
+
}
|
|
692
|
+
hlsScrubResumePlay = !paused;
|
|
688
693
|
clearSeekRetry();
|
|
689
694
|
hlsResumeWarmup = false;
|
|
690
|
-
hlsResumeTarget =
|
|
695
|
+
hlsResumeTarget = -1;
|
|
691
696
|
seekTime = 0;
|
|
692
697
|
seekApplyLock = true;
|
|
693
|
-
var loadAt = hlsFragStartTime(target);
|
|
694
|
-
if (loadAt <= 0 && target > 0) {
|
|
695
|
-
loadAt = Math.max(0, target);
|
|
696
|
-
}
|
|
697
|
-
hlsLoadAt = loadAt;
|
|
698
|
-
hlsLoadTs = Date.now();
|
|
699
|
-
try {
|
|
700
|
-
hls.startLoad(loadAt);
|
|
701
|
-
} catch (event2) {
|
|
702
|
-
}
|
|
703
698
|
try {
|
|
704
699
|
video.currentTime = target;
|
|
705
700
|
} catch (event2) {
|
|
706
|
-
|
|
701
|
+
seekApplyLock = false;
|
|
702
|
+
return false;
|
|
707
703
|
}
|
|
708
704
|
setTimeout(function() {
|
|
709
705
|
seekApplyLock = false;
|
|
710
|
-
|
|
711
|
-
return;
|
|
712
|
-
}
|
|
713
|
-
if (C["buffer"]) {
|
|
714
|
-
C["buffer"].hide();
|
|
715
|
-
}
|
|
716
|
-
waited = true;
|
|
717
|
-
if (wasPlaying && paused) {
|
|
718
|
-
try {
|
|
719
|
-
player.play();
|
|
720
|
-
} catch (errPlay) {
|
|
721
|
-
}
|
|
722
|
-
}
|
|
723
|
-
}, 200);
|
|
706
|
+
}, 120);
|
|
724
707
|
return true;
|
|
725
708
|
}, destroyStreamPlayers = function() {
|
|
726
709
|
clearSeekRetry();
|
|
@@ -730,6 +713,7 @@ var require_ckplayer = __commonJS({
|
|
|
730
713
|
hlsResumeWarmup = false;
|
|
731
714
|
hlsLoadAt = -1;
|
|
732
715
|
hlsLoadTs = 0;
|
|
716
|
+
hlsScrubResumePlay = false;
|
|
733
717
|
decodeRecoverCount = 0;
|
|
734
718
|
if (hls) {
|
|
735
719
|
try {
|
|
@@ -874,9 +858,12 @@ var require_ckplayer = __commonJS({
|
|
|
874
858
|
hls = null;
|
|
875
859
|
}
|
|
876
860
|
var hlsConf = {
|
|
877
|
-
//
|
|
861
|
+
// 对齐常见在线 M3U8 播放器:更大前向/后向缓冲,拖动更易命中已缓存区间
|
|
862
|
+
enableWorker: false,
|
|
878
863
|
maxBufferLength: 30,
|
|
879
|
-
maxMaxBufferLength:
|
|
864
|
+
maxMaxBufferLength: 600,
|
|
865
|
+
maxBufferSize: 60 * 1e3 * 1e3,
|
|
866
|
+
backBufferLength: 90
|
|
880
867
|
};
|
|
881
868
|
var resumeAt = seekTime;
|
|
882
869
|
if (!resumeAt) {
|
|
@@ -2184,6 +2171,17 @@ var require_ckplayer = __commonJS({
|
|
|
2184
2171
|
decodeRecoverCount = 0;
|
|
2185
2172
|
startPendingAutoplay();
|
|
2186
2173
|
pSliderMouseDown = false;
|
|
2174
|
+
waited = true;
|
|
2175
|
+
if (C["buffer"]) {
|
|
2176
|
+
C["buffer"].hide();
|
|
2177
|
+
}
|
|
2178
|
+
if (hlsScrubResumePlay) {
|
|
2179
|
+
hlsScrubResumePlay = false;
|
|
2180
|
+
try {
|
|
2181
|
+
player.play();
|
|
2182
|
+
} catch (event2) {
|
|
2183
|
+
}
|
|
2184
|
+
}
|
|
2187
2185
|
eventTarget("seek", { time: this.currentTime, state: "seeked" });
|
|
2188
2186
|
eventTarget("seeked");
|
|
2189
2187
|
},
|
|
@@ -6377,7 +6375,7 @@ var require_ckplayer = __commonJS({
|
|
|
6377
6375
|
if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
|
|
6378
6376
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
6379
6377
|
var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
|
|
6380
|
-
if (cdn && cdn.indexOf("1.1.
|
|
6378
|
+
if (cdn && cdn.indexOf("1.1.6") === -1 && m) {
|
|
6381
6379
|
if (cdn.slice(-1) !== "/") {
|
|
6382
6380
|
cdn += "/";
|
|
6383
6381
|
}
|