ckplayer-plus 1.1.8 → 1.1.9
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 +45 -30
- package/dist/ckplayer.min.js +2 -2
- package/dist/index.cjs +33 -28
- package/dist/index.js +33 -28
- package/dist/react.cjs +33 -28
- package/dist/react.js +33 -28
- package/dist/vue.cjs +33 -28
- package/dist/vue.js +33 -28
- 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.9/dist/";
|
|
208
208
|
function ckplayerEmbed(videoObj) {
|
|
209
209
|
var rightMenu = [
|
|
210
210
|
{
|
|
@@ -429,7 +429,7 @@ var require_ckplayer = __commonJS({
|
|
|
429
429
|
}
|
|
430
430
|
var allowCdn = !vars || vars["cdnFallback"] !== false;
|
|
431
431
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
432
|
-
if (!allowCdn || !cdn || cdn.indexOf("1.1.
|
|
432
|
+
if (!allowCdn || !cdn || cdn.indexOf("1.1.9") > -1) {
|
|
433
433
|
return folder + "/" + file;
|
|
434
434
|
}
|
|
435
435
|
if (cdn.slice(-1) !== "/") {
|
|
@@ -665,7 +665,7 @@ var require_ckplayer = __commonJS({
|
|
|
665
665
|
return true;
|
|
666
666
|
}
|
|
667
667
|
}
|
|
668
|
-
var loadAt =
|
|
668
|
+
var loadAt = hlsFragStartTime(target);
|
|
669
669
|
if (!force) {
|
|
670
670
|
if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
|
|
671
671
|
return true;
|
|
@@ -820,7 +820,7 @@ var require_ckplayer = __commonJS({
|
|
|
820
820
|
} });
|
|
821
821
|
return;
|
|
822
822
|
} else {
|
|
823
|
-
if (vars["plug"] && !canPlay(vstr)) {
|
|
823
|
+
if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr))) {
|
|
824
824
|
plugPlayer(vstr);
|
|
825
825
|
} else {
|
|
826
826
|
if (!existenceObj) {
|
|
@@ -832,7 +832,7 @@ var require_ckplayer = __commonJS({
|
|
|
832
832
|
} else if (valType(vstr) == "array") {
|
|
833
833
|
for (i = 0; i < vstr.length; i++) {
|
|
834
834
|
if (valType(vstr[i]) == "array") {
|
|
835
|
-
if (vars["plug"] && !canPlay(vstr[i][0])) {
|
|
835
|
+
if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr[i][0]))) {
|
|
836
836
|
plugPlayer(vstr[i][0]);
|
|
837
837
|
} else {
|
|
838
838
|
var type = ' type="' + vstr[i][1] + '"';
|
|
@@ -935,14 +935,13 @@ var require_ckplayer = __commonJS({
|
|
|
935
935
|
C["buffer"].show();
|
|
936
936
|
}
|
|
937
937
|
setTimeout(function() {
|
|
938
|
-
if (
|
|
939
|
-
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
|
|
943
|
-
finishResumeSeek(t);
|
|
938
|
+
if (hlsResumeSettling) {
|
|
939
|
+
var t = seekTime > 0 ? seekTime : hlsResumeTarget;
|
|
940
|
+
if (t > 0) {
|
|
941
|
+
finishResumeSeek(t);
|
|
942
|
+
}
|
|
944
943
|
}
|
|
945
|
-
},
|
|
944
|
+
}, 1e4);
|
|
946
945
|
return;
|
|
947
946
|
}
|
|
948
947
|
if (!hlsStartPositionUsed) {
|
|
@@ -1798,19 +1797,7 @@ var require_ckplayer = __commonJS({
|
|
|
1798
1797
|
if (!timeInBuffered(t)) {
|
|
1799
1798
|
return false;
|
|
1800
1799
|
}
|
|
1801
|
-
|
|
1802
|
-
try {
|
|
1803
|
-
var buf = video.buffered;
|
|
1804
|
-
for (var i = 0; i < buf.length; i++) {
|
|
1805
|
-
var start = buf.start(i);
|
|
1806
|
-
var end = buf.end(i);
|
|
1807
|
-
if (loadStart >= start - 0.35 && t <= end + 0.15) {
|
|
1808
|
-
return true;
|
|
1809
|
-
}
|
|
1810
|
-
}
|
|
1811
|
-
} catch (event2) {
|
|
1812
|
-
}
|
|
1813
|
-
return false;
|
|
1800
|
+
return true;
|
|
1814
1801
|
}, tryCompleteResumeSeek = function(t) {
|
|
1815
1802
|
if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
|
|
1816
1803
|
return false;
|
|
@@ -2218,10 +2205,28 @@ var require_ckplayer = __commonJS({
|
|
|
2218
2205
|
seekApplyLock = false;
|
|
2219
2206
|
decodeRecoverCount = 0;
|
|
2220
2207
|
hlsScrubbing = false;
|
|
2221
|
-
|
|
2208
|
+
var resumePending = false;
|
|
2209
|
+
if (hlsResumeSettling && hlsResumeTarget > 0) {
|
|
2210
|
+
if (!timeInBuffered(hlsResumeTarget)) {
|
|
2211
|
+
resumePending = true;
|
|
2212
|
+
} else if (Math.abs(this.currentTime - hlsResumeTarget) > 0.5) {
|
|
2213
|
+
resumePending = true;
|
|
2214
|
+
var resumeTarget = hlsResumeTarget;
|
|
2215
|
+
setTimeout(function() {
|
|
2216
|
+
if (hlsResumeSettling && timeInBuffered(resumeTarget)) {
|
|
2217
|
+
finishResumeSeek(resumeTarget);
|
|
2218
|
+
}
|
|
2219
|
+
}, 0);
|
|
2220
|
+
}
|
|
2221
|
+
}
|
|
2222
|
+
if (!resumePending) {
|
|
2223
|
+
hlsResumeSettling = false;
|
|
2224
|
+
}
|
|
2222
2225
|
startPendingAutoplay();
|
|
2223
2226
|
pSliderMouseDown = false;
|
|
2224
|
-
|
|
2227
|
+
if (!resumePending) {
|
|
2228
|
+
hidePlaybackBuffer();
|
|
2229
|
+
}
|
|
2225
2230
|
if (hlsScrubResumePlay) {
|
|
2226
2231
|
hlsScrubResumePlay = false;
|
|
2227
2232
|
try {
|
|
@@ -6436,7 +6441,7 @@ var require_ckplayer = __commonJS({
|
|
|
6436
6441
|
if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
|
|
6437
6442
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
6438
6443
|
var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
|
|
6439
|
-
if (cdn && cdn.indexOf("1.1.
|
|
6444
|
+
if (cdn && cdn.indexOf("1.1.9") === -1 && m) {
|
|
6440
6445
|
if (cdn.slice(-1) !== "/") {
|
|
6441
6446
|
cdn += "/";
|
|
6442
6447
|
}
|