ckplayer-plus 1.1.7 → 1.1.8
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 +48 -30
- package/dist/ckplayer.min.js +2 -2
- package/dist/index.cjs +40 -25
- package/dist/index.js +40 -25
- package/dist/react.cjs +40 -25
- package/dist/react.js +40 -25
- package/dist/vue.cjs +40 -25
- package/dist/vue.js +40 -25
- 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.8/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.8") > -1) {
|
|
433
433
|
return folder + "/" + file;
|
|
434
434
|
}
|
|
435
435
|
if (cdn.slice(-1) !== "/") {
|
|
@@ -913,6 +913,7 @@ var require_ckplayer = __commonJS({
|
|
|
913
913
|
resumeAt = parseResumeSeekFromVars();
|
|
914
914
|
}
|
|
915
915
|
if (resumeAt && resumeAt > 0 && (isUndefined(vars["live"]) || !vars["live"])) {
|
|
916
|
+
hlsConf.autoStartLoad = false;
|
|
916
917
|
maxSeeTime = Math.max(maxSeeTime, resumeAt);
|
|
917
918
|
if (firstSeekTime < 0) {
|
|
918
919
|
firstSeekTime = resumeAt;
|
|
@@ -921,6 +922,7 @@ var require_ckplayer = __commonJS({
|
|
|
921
922
|
hlsResumeTarget = resumeAt;
|
|
922
923
|
hlsResumeSettling = true;
|
|
923
924
|
hlsResumeWarmup = false;
|
|
925
|
+
autoplayPending = false;
|
|
924
926
|
}
|
|
925
927
|
hls = new Hls(hlsConf);
|
|
926
928
|
hls.loadSource(url);
|
|
@@ -928,31 +930,19 @@ var require_ckplayer = __commonJS({
|
|
|
928
930
|
hls.on(Hls.Events.MANIFEST_PARSED, function() {
|
|
929
931
|
if (seekTime > 0 && hlsResumeSettling) {
|
|
930
932
|
hlsStartPositionUsed = true;
|
|
931
|
-
|
|
932
|
-
|
|
933
|
-
|
|
934
|
-
|
|
935
|
-
|
|
936
|
-
if (
|
|
937
|
-
finishResumeSeek(t);
|
|
933
|
+
hlsSeekTo(seekTime, true);
|
|
934
|
+
if (C["buffer"]) {
|
|
935
|
+
C["buffer"].show();
|
|
936
|
+
}
|
|
937
|
+
setTimeout(function() {
|
|
938
|
+
if (!hlsResumeSettling) {
|
|
938
939
|
return;
|
|
939
940
|
}
|
|
940
|
-
|
|
941
|
-
if (
|
|
942
|
-
if (seekRetryTimer) {
|
|
943
|
-
clearTimeout(seekRetryTimer);
|
|
944
|
-
}
|
|
945
|
-
seekRetryTimer = setTimeout(tryResume, 120);
|
|
946
|
-
} else {
|
|
941
|
+
var t = seekTime > 0 ? seekTime : hlsResumeTarget;
|
|
942
|
+
if (t > 0 && !tryCompleteResumeSeek(t) && hlsResumeSettling) {
|
|
947
943
|
finishResumeSeek(t);
|
|
948
944
|
}
|
|
949
|
-
};
|
|
950
|
-
tryResume();
|
|
951
|
-
setTimeout(function() {
|
|
952
|
-
if (hlsResumeSettling && seekTime > 0) {
|
|
953
|
-
finishResumeSeek(seekTime);
|
|
954
|
-
}
|
|
955
|
-
}, 4e3);
|
|
945
|
+
}, 8e3);
|
|
956
946
|
return;
|
|
957
947
|
}
|
|
958
948
|
if (!hlsStartPositionUsed) {
|
|
@@ -960,7 +950,9 @@ var require_ckplayer = __commonJS({
|
|
|
960
950
|
}
|
|
961
951
|
});
|
|
962
952
|
hls.on(Hls.Events.FRAG_BUFFERED, function(event2, data) {
|
|
963
|
-
if (hlsResumeSettling && seekTime > 0) {
|
|
953
|
+
if (hlsResumeSettling && (seekTime > 0 || hlsResumeTarget > 0)) {
|
|
954
|
+
var resumeT = seekTime > 0 ? seekTime : hlsResumeTarget;
|
|
955
|
+
tryCompleteResumeSeek(resumeT);
|
|
964
956
|
return;
|
|
965
957
|
}
|
|
966
958
|
if (hlsResumeTarget <= 0 || !data || !data.frag) {
|
|
@@ -1819,6 +1811,15 @@ var require_ckplayer = __commonJS({
|
|
|
1819
1811
|
} catch (event2) {
|
|
1820
1812
|
}
|
|
1821
1813
|
return false;
|
|
1814
|
+
}, tryCompleteResumeSeek = function(t) {
|
|
1815
|
+
if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
|
|
1816
|
+
return false;
|
|
1817
|
+
}
|
|
1818
|
+
if (hlsCanSafelySeekTo(t)) {
|
|
1819
|
+
finishResumeSeek(t);
|
|
1820
|
+
return true;
|
|
1821
|
+
}
|
|
1822
|
+
return false;
|
|
1822
1823
|
}, finishResumeSeek = function(t) {
|
|
1823
1824
|
hlsResumeWarmup = false;
|
|
1824
1825
|
hlsResumeSettling = false;
|
|
@@ -1894,6 +1895,20 @@ var require_ckplayer = __commonJS({
|
|
|
1894
1895
|
}
|
|
1895
1896
|
if (hls) {
|
|
1896
1897
|
hlsResumeSettling = true;
|
|
1898
|
+
hlsResumeTarget = t;
|
|
1899
|
+
autoplayPending = false;
|
|
1900
|
+
if (hlsResumeWarmup) {
|
|
1901
|
+
return;
|
|
1902
|
+
}
|
|
1903
|
+
if (tryCompleteResumeSeek(t)) {
|
|
1904
|
+
return;
|
|
1905
|
+
}
|
|
1906
|
+
if (hlsSeekTo(t, force)) {
|
|
1907
|
+
if (C["buffer"]) {
|
|
1908
|
+
C["buffer"].show();
|
|
1909
|
+
}
|
|
1910
|
+
return;
|
|
1911
|
+
}
|
|
1897
1912
|
if (!force && (!isUndefined(video.readyState) && video.readyState < 1) && !(dur && isFinite(dur) && dur > 0)) {
|
|
1898
1913
|
seekRetryCount++;
|
|
1899
1914
|
if (seekRetryCount <= 40) {
|
|
@@ -6421,7 +6436,7 @@ var require_ckplayer = __commonJS({
|
|
|
6421
6436
|
if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
|
|
6422
6437
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
6423
6438
|
var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
|
|
6424
|
-
if (cdn && cdn.indexOf("1.1.
|
|
6439
|
+
if (cdn && cdn.indexOf("1.1.8") === -1 && m) {
|
|
6425
6440
|
if (cdn.slice(-1) !== "/") {
|
|
6426
6441
|
cdn += "/";
|
|
6427
6442
|
}
|