ckplayer-plus 1.0.6 → 1.0.7
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 +147 -70
- package/dist/ckplayer.min.js +2 -2
- package/dist/index.cjs +128 -62
- package/dist/index.js +128 -62
- package/dist/react.cjs +128 -62
- package/dist/react.js +128 -62
- package/dist/vue.cjs +128 -62
- package/dist/vue.js +128 -62
- package/package.json +1 -1
package/dist/index.cjs
CHANGED
|
@@ -212,7 +212,7 @@ var require_ckplayer = __commonJS({
|
|
|
212
212
|
cdnFallback: true
|
|
213
213
|
// getPath 失败时是否回退到 jsDelivr(内网可设 false,并配置 pluginPath)
|
|
214
214
|
};
|
|
215
|
-
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.
|
|
215
|
+
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.7/dist/";
|
|
216
216
|
function ckplayerEmbed(videoObj) {
|
|
217
217
|
var rightMenu = [
|
|
218
218
|
{
|
|
@@ -407,7 +407,7 @@ var require_ckplayer = __commonJS({
|
|
|
407
407
|
}
|
|
408
408
|
var allowCdn = !vars || vars["cdnFallback"] !== false;
|
|
409
409
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
410
|
-
if (!allowCdn || !cdn || cdn.indexOf("1.0.
|
|
410
|
+
if (!allowCdn || !cdn || cdn.indexOf("1.0.7") > -1) {
|
|
411
411
|
return folder + "/" + file;
|
|
412
412
|
}
|
|
413
413
|
if (cdn.slice(-1) !== "/") {
|
|
@@ -565,9 +565,86 @@ var require_ckplayer = __commonJS({
|
|
|
565
565
|
changeVideo(video.attr("src"));
|
|
566
566
|
}
|
|
567
567
|
return player;
|
|
568
|
+
}, parseResumeSeekFromVars = function() {
|
|
569
|
+
if (isUndefined(vars["seek"])) {
|
|
570
|
+
return 0;
|
|
571
|
+
}
|
|
572
|
+
if (valType(vars["seek"]) == "number" && vars["seek"] > 0) {
|
|
573
|
+
return vars["seek"];
|
|
574
|
+
}
|
|
575
|
+
if (valType(vars["seek"]) == "string" && vars["seek"] == "cookie" && cookieName) {
|
|
576
|
+
var cke = player.cookie(cookieName);
|
|
577
|
+
if (cke && cke["time"]) {
|
|
578
|
+
return cke["time"];
|
|
579
|
+
}
|
|
580
|
+
return 0;
|
|
581
|
+
}
|
|
582
|
+
if (valType(vars["seek"]) == "string" && vars["seek"] !== "" && !isNaN(parseFloat(vars["seek"]))) {
|
|
583
|
+
return parseFloat(vars["seek"]);
|
|
584
|
+
}
|
|
585
|
+
return 0;
|
|
586
|
+
}, applyResumeSeekState = function(t) {
|
|
587
|
+
if (!t || t <= 0) {
|
|
588
|
+
return;
|
|
589
|
+
}
|
|
590
|
+
seekTime = t;
|
|
591
|
+
maxSeeTime = Math.max(maxSeeTime, t);
|
|
592
|
+
if (firstSeekTime < 0) {
|
|
593
|
+
firstSeekTime = t;
|
|
594
|
+
}
|
|
595
|
+
}, prepareCookieAndSeek = function() {
|
|
596
|
+
if (vars["cookie"]) {
|
|
597
|
+
if (valType(vars["cookie"]) == "array" && vars["cookie"].length >= 2) {
|
|
598
|
+
if (vars["cookie"][0] && valType(vars["cookie"][0]) == "string") {
|
|
599
|
+
cookieName = vars["cookie"][0];
|
|
600
|
+
}
|
|
601
|
+
if (vars["cookie"][1] && valType(vars["cookie"][1]) == "number") {
|
|
602
|
+
cookieTime = vars["cookie"][1];
|
|
603
|
+
}
|
|
604
|
+
}
|
|
605
|
+
if (valType(vars["cookie"]) == "object" && !isUndefined(vars["cookie"]["name"])) {
|
|
606
|
+
cookieName = vars["cookie"]["name"];
|
|
607
|
+
if (!isUndefined(vars["cookie"]["hour"]) && valType(vars["cookie"]["hour"]) == "number") {
|
|
608
|
+
cookieTime = vars["cookie"]["hour"];
|
|
609
|
+
}
|
|
610
|
+
}
|
|
611
|
+
if (valType(vars["cookie"]) == "string") {
|
|
612
|
+
cookieName = vars["cookie"];
|
|
613
|
+
}
|
|
614
|
+
if (cookieName) {
|
|
615
|
+
cookieName = cookieName.replace(/[ ]*,[ ]*|[ ]+/g, "").replace(/[ ]*;[ ]*|[ ]+/g, "");
|
|
616
|
+
}
|
|
617
|
+
}
|
|
618
|
+
if (!seekTime) {
|
|
619
|
+
applyResumeSeekState(parseResumeSeekFromVars());
|
|
620
|
+
}
|
|
621
|
+
}, destroyStreamPlayers = function() {
|
|
622
|
+
clearSeekRetry();
|
|
623
|
+
seekApplyLock = false;
|
|
624
|
+
hlsStartPositionUsed = false;
|
|
625
|
+
decodeRecoverCount = 0;
|
|
626
|
+
if (hls) {
|
|
627
|
+
try {
|
|
628
|
+
hls.destroy();
|
|
629
|
+
} catch (event2) {
|
|
630
|
+
}
|
|
631
|
+
hls = null;
|
|
632
|
+
}
|
|
633
|
+
if (pugPlayer) {
|
|
634
|
+
try {
|
|
635
|
+
pugPlayer.pause();
|
|
636
|
+
pugPlayer.unload();
|
|
637
|
+
pugPlayer.detachMediaElement();
|
|
638
|
+
pugPlayer.destroy();
|
|
639
|
+
} catch (event2) {
|
|
640
|
+
}
|
|
641
|
+
pugPlayer = null;
|
|
642
|
+
}
|
|
568
643
|
}, changeVideo = function(vstr) {
|
|
569
644
|
var i2 = 0;
|
|
570
645
|
ensureAutoPlug(vstr);
|
|
646
|
+
prepareCookieAndSeek();
|
|
647
|
+
destroyStreamPlayers();
|
|
571
648
|
if (video.attr("src") || video.htm()) {
|
|
572
649
|
player.pause();
|
|
573
650
|
}
|
|
@@ -652,46 +729,6 @@ var require_ckplayer = __commonJS({
|
|
|
652
729
|
if (isChangeDef) {
|
|
653
730
|
checkDefinition();
|
|
654
731
|
}
|
|
655
|
-
if (vars["cookie"]) {
|
|
656
|
-
if (valType(vars["cookie"]) == "array" && vars["cookie"].length >= 2) {
|
|
657
|
-
if (vars["cookie"][0] && valType(vars["cookie"][0]) == "string") {
|
|
658
|
-
cookieName = vars["cookie"][0];
|
|
659
|
-
}
|
|
660
|
-
if (vars["cookie"][1] && valType(vars["cookie"][1]) == "number") {
|
|
661
|
-
cookieTime = vars["cookie"][1];
|
|
662
|
-
}
|
|
663
|
-
}
|
|
664
|
-
if (valType(vars["cookie"]) == "object" && !isUndefined(vars["cookie"]["name"])) {
|
|
665
|
-
cookieName = vars["cookie"]["name"];
|
|
666
|
-
if (!isUndefined(vars["cookie"]["hour"]) && valType(vars["cookie"]["hour"]) == "number") {
|
|
667
|
-
cookieTime = vars["cookie"]["hour"];
|
|
668
|
-
}
|
|
669
|
-
}
|
|
670
|
-
if (valType(vars["cookie"]) == "string") {
|
|
671
|
-
cookieName = vars["cookie"];
|
|
672
|
-
}
|
|
673
|
-
if (cookieName) {
|
|
674
|
-
cookieName = cookieName.replace(/[ ]*,[ ]*|[ ]+/g, "").replace(/[ ]*;[ ]*|[ ]+/g, "");
|
|
675
|
-
}
|
|
676
|
-
}
|
|
677
|
-
if (!isUndefined(vars["seek"]) && !seekTime) {
|
|
678
|
-
if (valType(vars["seek"]) == "number" && vars["seek"] > 0) {
|
|
679
|
-
seekTime = vars["seek"];
|
|
680
|
-
} else if (valType(vars["seek"]) == "string" && vars["seek"] == "cookie" && cookieName) {
|
|
681
|
-
var cke = player.cookie(cookieName);
|
|
682
|
-
if (cke) {
|
|
683
|
-
seekTime = cke["time"];
|
|
684
|
-
}
|
|
685
|
-
} else if (valType(vars["seek"]) == "string" && vars["seek"] !== "" && !isNaN(parseFloat(vars["seek"]))) {
|
|
686
|
-
seekTime = parseFloat(vars["seek"]);
|
|
687
|
-
}
|
|
688
|
-
if (seekTime && seekTime > 0) {
|
|
689
|
-
maxSeeTime = Math.max(maxSeeTime, seekTime);
|
|
690
|
-
if (firstSeekTime < 0) {
|
|
691
|
-
firstSeekTime = seekTime;
|
|
692
|
-
}
|
|
693
|
-
}
|
|
694
|
-
}
|
|
695
732
|
}, plugPlayer = function(url) {
|
|
696
733
|
switch (vars["plug"]) {
|
|
697
734
|
case "hls.js":
|
|
@@ -721,12 +758,27 @@ var require_ckplayer = __commonJS({
|
|
|
721
758
|
}, hlsPlayer = function(url) {
|
|
722
759
|
var startHls = function() {
|
|
723
760
|
if (typeof Hls !== "undefined" && !isUndefined(Hls) && Hls.isSupported()) {
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
761
|
+
if (hls) {
|
|
762
|
+
try {
|
|
763
|
+
hls.destroy();
|
|
764
|
+
} catch (event2) {
|
|
765
|
+
}
|
|
766
|
+
hls = null;
|
|
767
|
+
}
|
|
768
|
+
var hlsConf = {
|
|
769
|
+
// 10s 分片流在续播点附近需要略大缓冲,减少卡住转圈
|
|
770
|
+
maxBufferLength: 30,
|
|
771
|
+
maxMaxBufferLength: 60
|
|
772
|
+
};
|
|
773
|
+
var resumeAt = seekTime;
|
|
774
|
+
if (!resumeAt) {
|
|
775
|
+
resumeAt = parseResumeSeekFromVars();
|
|
776
|
+
}
|
|
777
|
+
if (resumeAt && resumeAt > 0 && (isUndefined(vars["live"]) || !vars["live"])) {
|
|
778
|
+
hlsConf.startPosition = resumeAt;
|
|
779
|
+
maxSeeTime = Math.max(maxSeeTime, resumeAt);
|
|
728
780
|
if (firstSeekTime < 0) {
|
|
729
|
-
firstSeekTime =
|
|
781
|
+
firstSeekTime = resumeAt;
|
|
730
782
|
}
|
|
731
783
|
seekTime = 0;
|
|
732
784
|
hlsStartPositionUsed = true;
|
|
@@ -1481,17 +1533,27 @@ var require_ckplayer = __commonJS({
|
|
|
1481
1533
|
clearSeekRetry();
|
|
1482
1534
|
return;
|
|
1483
1535
|
}
|
|
1536
|
+
if (t > 0) {
|
|
1537
|
+
maxSeeTime = Math.max(maxSeeTime, t);
|
|
1538
|
+
if (firstSeekTime < 0) {
|
|
1539
|
+
firstSeekTime = t;
|
|
1540
|
+
}
|
|
1541
|
+
}
|
|
1542
|
+
if (hls && typeof hls.startLoad === "function") {
|
|
1543
|
+
clearSeekRetry();
|
|
1544
|
+
seekTime = 0;
|
|
1545
|
+
try {
|
|
1546
|
+
hls.startLoad(t);
|
|
1547
|
+
} catch (event2) {
|
|
1548
|
+
seekTime = t;
|
|
1549
|
+
}
|
|
1550
|
+
return;
|
|
1551
|
+
}
|
|
1484
1552
|
var readyEnough = !isUndefined(video.readyState) && video.readyState >= 2;
|
|
1485
1553
|
var bufferedOk = timeInBuffered(t);
|
|
1486
1554
|
if (!force && !bufferedOk && (!readyEnough || video.readyState < 3)) {
|
|
1487
1555
|
seekRetryCount++;
|
|
1488
1556
|
if (seekRetryCount <= 50) {
|
|
1489
|
-
try {
|
|
1490
|
-
if (hls && typeof hls.startLoad === "function") {
|
|
1491
|
-
hls.startLoad(t);
|
|
1492
|
-
}
|
|
1493
|
-
} catch (event2) {
|
|
1494
|
-
}
|
|
1495
1557
|
if (seekRetryTimer) {
|
|
1496
1558
|
clearTimeout(seekRetryTimer);
|
|
1497
1559
|
}
|
|
@@ -1502,12 +1564,6 @@ var require_ckplayer = __commonJS({
|
|
|
1502
1564
|
}
|
|
1503
1565
|
}
|
|
1504
1566
|
clearSeekRetry();
|
|
1505
|
-
if (t > 0) {
|
|
1506
|
-
maxSeeTime = Math.max(maxSeeTime, t);
|
|
1507
|
-
if (firstSeekTime < 0) {
|
|
1508
|
-
firstSeekTime = t;
|
|
1509
|
-
}
|
|
1510
|
-
}
|
|
1511
1567
|
seekApplyLock = true;
|
|
1512
1568
|
seekTime = 0;
|
|
1513
1569
|
try {
|
|
@@ -2171,7 +2227,8 @@ var require_ckplayer = __commonJS({
|
|
|
2171
2227
|
ad["frontPlay"] = false;
|
|
2172
2228
|
C["ad"].hide();
|
|
2173
2229
|
allBarShow();
|
|
2174
|
-
seekTime =
|
|
2230
|
+
seekTime = 0;
|
|
2231
|
+
applyResumeSeekState(parseResumeSeekFromVars());
|
|
2175
2232
|
if (ad["front"]["video"]) {
|
|
2176
2233
|
changeVideo(vars["video"]);
|
|
2177
2234
|
} else {
|
|
@@ -2756,11 +2813,20 @@ var require_ckplayer = __commonJS({
|
|
|
2756
2813
|
if (vars["timeScheduleAdjust"] == 5 && target > maxSeeTime && seekTime && Math.abs(seekTime - target) < 0.5) {
|
|
2757
2814
|
maxSeeTime = Math.max(maxSeeTime, target);
|
|
2758
2815
|
}
|
|
2759
|
-
if (target > 0.5 && !timeInBuffered(target) && video.readyState < 3) {
|
|
2816
|
+
if (target > 0.5 && !timeInBuffered(target) && video.readyState < 3 && !hls) {
|
|
2760
2817
|
seekTime = target;
|
|
2761
2818
|
applyPendingSeek(false);
|
|
2762
2819
|
return player;
|
|
2763
2820
|
}
|
|
2821
|
+
if (hls && typeof hls.startLoad === "function") {
|
|
2822
|
+
seekTime = 0;
|
|
2823
|
+
try {
|
|
2824
|
+
hls.startLoad(target);
|
|
2825
|
+
} catch (event2) {
|
|
2826
|
+
seekTime = target;
|
|
2827
|
+
}
|
|
2828
|
+
return player;
|
|
2829
|
+
}
|
|
2764
2830
|
try {
|
|
2765
2831
|
video.currentTime = target;
|
|
2766
2832
|
seekTime = 0;
|
|
@@ -5975,7 +6041,7 @@ var require_ckplayer = __commonJS({
|
|
|
5975
6041
|
if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
|
|
5976
6042
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
5977
6043
|
var m2 = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
|
|
5978
|
-
if (cdn && cdn.indexOf("1.0.
|
|
6044
|
+
if (cdn && cdn.indexOf("1.0.7") === -1 && m2) {
|
|
5979
6045
|
if (cdn.slice(-1) !== "/") {
|
|
5980
6046
|
cdn += "/";
|
|
5981
6047
|
}
|
package/dist/index.js
CHANGED
|
@@ -207,7 +207,7 @@ var require_ckplayer = __commonJS({
|
|
|
207
207
|
cdnFallback: true
|
|
208
208
|
// getPath 失败时是否回退到 jsDelivr(内网可设 false,并配置 pluginPath)
|
|
209
209
|
};
|
|
210
|
-
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.
|
|
210
|
+
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.7/dist/";
|
|
211
211
|
function ckplayerEmbed(videoObj) {
|
|
212
212
|
var rightMenu = [
|
|
213
213
|
{
|
|
@@ -402,7 +402,7 @@ var require_ckplayer = __commonJS({
|
|
|
402
402
|
}
|
|
403
403
|
var allowCdn = !vars || vars["cdnFallback"] !== false;
|
|
404
404
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
405
|
-
if (!allowCdn || !cdn || cdn.indexOf("1.0.
|
|
405
|
+
if (!allowCdn || !cdn || cdn.indexOf("1.0.7") > -1) {
|
|
406
406
|
return folder + "/" + file;
|
|
407
407
|
}
|
|
408
408
|
if (cdn.slice(-1) !== "/") {
|
|
@@ -560,9 +560,86 @@ var require_ckplayer = __commonJS({
|
|
|
560
560
|
changeVideo(video.attr("src"));
|
|
561
561
|
}
|
|
562
562
|
return player;
|
|
563
|
+
}, parseResumeSeekFromVars = function() {
|
|
564
|
+
if (isUndefined(vars["seek"])) {
|
|
565
|
+
return 0;
|
|
566
|
+
}
|
|
567
|
+
if (valType(vars["seek"]) == "number" && vars["seek"] > 0) {
|
|
568
|
+
return vars["seek"];
|
|
569
|
+
}
|
|
570
|
+
if (valType(vars["seek"]) == "string" && vars["seek"] == "cookie" && cookieName) {
|
|
571
|
+
var cke = player.cookie(cookieName);
|
|
572
|
+
if (cke && cke["time"]) {
|
|
573
|
+
return cke["time"];
|
|
574
|
+
}
|
|
575
|
+
return 0;
|
|
576
|
+
}
|
|
577
|
+
if (valType(vars["seek"]) == "string" && vars["seek"] !== "" && !isNaN(parseFloat(vars["seek"]))) {
|
|
578
|
+
return parseFloat(vars["seek"]);
|
|
579
|
+
}
|
|
580
|
+
return 0;
|
|
581
|
+
}, applyResumeSeekState = function(t) {
|
|
582
|
+
if (!t || t <= 0) {
|
|
583
|
+
return;
|
|
584
|
+
}
|
|
585
|
+
seekTime = t;
|
|
586
|
+
maxSeeTime = Math.max(maxSeeTime, t);
|
|
587
|
+
if (firstSeekTime < 0) {
|
|
588
|
+
firstSeekTime = t;
|
|
589
|
+
}
|
|
590
|
+
}, prepareCookieAndSeek = function() {
|
|
591
|
+
if (vars["cookie"]) {
|
|
592
|
+
if (valType(vars["cookie"]) == "array" && vars["cookie"].length >= 2) {
|
|
593
|
+
if (vars["cookie"][0] && valType(vars["cookie"][0]) == "string") {
|
|
594
|
+
cookieName = vars["cookie"][0];
|
|
595
|
+
}
|
|
596
|
+
if (vars["cookie"][1] && valType(vars["cookie"][1]) == "number") {
|
|
597
|
+
cookieTime = vars["cookie"][1];
|
|
598
|
+
}
|
|
599
|
+
}
|
|
600
|
+
if (valType(vars["cookie"]) == "object" && !isUndefined(vars["cookie"]["name"])) {
|
|
601
|
+
cookieName = vars["cookie"]["name"];
|
|
602
|
+
if (!isUndefined(vars["cookie"]["hour"]) && valType(vars["cookie"]["hour"]) == "number") {
|
|
603
|
+
cookieTime = vars["cookie"]["hour"];
|
|
604
|
+
}
|
|
605
|
+
}
|
|
606
|
+
if (valType(vars["cookie"]) == "string") {
|
|
607
|
+
cookieName = vars["cookie"];
|
|
608
|
+
}
|
|
609
|
+
if (cookieName) {
|
|
610
|
+
cookieName = cookieName.replace(/[ ]*,[ ]*|[ ]+/g, "").replace(/[ ]*;[ ]*|[ ]+/g, "");
|
|
611
|
+
}
|
|
612
|
+
}
|
|
613
|
+
if (!seekTime) {
|
|
614
|
+
applyResumeSeekState(parseResumeSeekFromVars());
|
|
615
|
+
}
|
|
616
|
+
}, destroyStreamPlayers = function() {
|
|
617
|
+
clearSeekRetry();
|
|
618
|
+
seekApplyLock = false;
|
|
619
|
+
hlsStartPositionUsed = false;
|
|
620
|
+
decodeRecoverCount = 0;
|
|
621
|
+
if (hls) {
|
|
622
|
+
try {
|
|
623
|
+
hls.destroy();
|
|
624
|
+
} catch (event2) {
|
|
625
|
+
}
|
|
626
|
+
hls = null;
|
|
627
|
+
}
|
|
628
|
+
if (pugPlayer) {
|
|
629
|
+
try {
|
|
630
|
+
pugPlayer.pause();
|
|
631
|
+
pugPlayer.unload();
|
|
632
|
+
pugPlayer.detachMediaElement();
|
|
633
|
+
pugPlayer.destroy();
|
|
634
|
+
} catch (event2) {
|
|
635
|
+
}
|
|
636
|
+
pugPlayer = null;
|
|
637
|
+
}
|
|
563
638
|
}, changeVideo = function(vstr) {
|
|
564
639
|
var i2 = 0;
|
|
565
640
|
ensureAutoPlug(vstr);
|
|
641
|
+
prepareCookieAndSeek();
|
|
642
|
+
destroyStreamPlayers();
|
|
566
643
|
if (video.attr("src") || video.htm()) {
|
|
567
644
|
player.pause();
|
|
568
645
|
}
|
|
@@ -647,46 +724,6 @@ var require_ckplayer = __commonJS({
|
|
|
647
724
|
if (isChangeDef) {
|
|
648
725
|
checkDefinition();
|
|
649
726
|
}
|
|
650
|
-
if (vars["cookie"]) {
|
|
651
|
-
if (valType(vars["cookie"]) == "array" && vars["cookie"].length >= 2) {
|
|
652
|
-
if (vars["cookie"][0] && valType(vars["cookie"][0]) == "string") {
|
|
653
|
-
cookieName = vars["cookie"][0];
|
|
654
|
-
}
|
|
655
|
-
if (vars["cookie"][1] && valType(vars["cookie"][1]) == "number") {
|
|
656
|
-
cookieTime = vars["cookie"][1];
|
|
657
|
-
}
|
|
658
|
-
}
|
|
659
|
-
if (valType(vars["cookie"]) == "object" && !isUndefined(vars["cookie"]["name"])) {
|
|
660
|
-
cookieName = vars["cookie"]["name"];
|
|
661
|
-
if (!isUndefined(vars["cookie"]["hour"]) && valType(vars["cookie"]["hour"]) == "number") {
|
|
662
|
-
cookieTime = vars["cookie"]["hour"];
|
|
663
|
-
}
|
|
664
|
-
}
|
|
665
|
-
if (valType(vars["cookie"]) == "string") {
|
|
666
|
-
cookieName = vars["cookie"];
|
|
667
|
-
}
|
|
668
|
-
if (cookieName) {
|
|
669
|
-
cookieName = cookieName.replace(/[ ]*,[ ]*|[ ]+/g, "").replace(/[ ]*;[ ]*|[ ]+/g, "");
|
|
670
|
-
}
|
|
671
|
-
}
|
|
672
|
-
if (!isUndefined(vars["seek"]) && !seekTime) {
|
|
673
|
-
if (valType(vars["seek"]) == "number" && vars["seek"] > 0) {
|
|
674
|
-
seekTime = vars["seek"];
|
|
675
|
-
} else if (valType(vars["seek"]) == "string" && vars["seek"] == "cookie" && cookieName) {
|
|
676
|
-
var cke = player.cookie(cookieName);
|
|
677
|
-
if (cke) {
|
|
678
|
-
seekTime = cke["time"];
|
|
679
|
-
}
|
|
680
|
-
} else if (valType(vars["seek"]) == "string" && vars["seek"] !== "" && !isNaN(parseFloat(vars["seek"]))) {
|
|
681
|
-
seekTime = parseFloat(vars["seek"]);
|
|
682
|
-
}
|
|
683
|
-
if (seekTime && seekTime > 0) {
|
|
684
|
-
maxSeeTime = Math.max(maxSeeTime, seekTime);
|
|
685
|
-
if (firstSeekTime < 0) {
|
|
686
|
-
firstSeekTime = seekTime;
|
|
687
|
-
}
|
|
688
|
-
}
|
|
689
|
-
}
|
|
690
727
|
}, plugPlayer = function(url) {
|
|
691
728
|
switch (vars["plug"]) {
|
|
692
729
|
case "hls.js":
|
|
@@ -716,12 +753,27 @@ var require_ckplayer = __commonJS({
|
|
|
716
753
|
}, hlsPlayer = function(url) {
|
|
717
754
|
var startHls = function() {
|
|
718
755
|
if (typeof Hls !== "undefined" && !isUndefined(Hls) && Hls.isSupported()) {
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
756
|
+
if (hls) {
|
|
757
|
+
try {
|
|
758
|
+
hls.destroy();
|
|
759
|
+
} catch (event2) {
|
|
760
|
+
}
|
|
761
|
+
hls = null;
|
|
762
|
+
}
|
|
763
|
+
var hlsConf = {
|
|
764
|
+
// 10s 分片流在续播点附近需要略大缓冲,减少卡住转圈
|
|
765
|
+
maxBufferLength: 30,
|
|
766
|
+
maxMaxBufferLength: 60
|
|
767
|
+
};
|
|
768
|
+
var resumeAt = seekTime;
|
|
769
|
+
if (!resumeAt) {
|
|
770
|
+
resumeAt = parseResumeSeekFromVars();
|
|
771
|
+
}
|
|
772
|
+
if (resumeAt && resumeAt > 0 && (isUndefined(vars["live"]) || !vars["live"])) {
|
|
773
|
+
hlsConf.startPosition = resumeAt;
|
|
774
|
+
maxSeeTime = Math.max(maxSeeTime, resumeAt);
|
|
723
775
|
if (firstSeekTime < 0) {
|
|
724
|
-
firstSeekTime =
|
|
776
|
+
firstSeekTime = resumeAt;
|
|
725
777
|
}
|
|
726
778
|
seekTime = 0;
|
|
727
779
|
hlsStartPositionUsed = true;
|
|
@@ -1476,17 +1528,27 @@ var require_ckplayer = __commonJS({
|
|
|
1476
1528
|
clearSeekRetry();
|
|
1477
1529
|
return;
|
|
1478
1530
|
}
|
|
1531
|
+
if (t > 0) {
|
|
1532
|
+
maxSeeTime = Math.max(maxSeeTime, t);
|
|
1533
|
+
if (firstSeekTime < 0) {
|
|
1534
|
+
firstSeekTime = t;
|
|
1535
|
+
}
|
|
1536
|
+
}
|
|
1537
|
+
if (hls && typeof hls.startLoad === "function") {
|
|
1538
|
+
clearSeekRetry();
|
|
1539
|
+
seekTime = 0;
|
|
1540
|
+
try {
|
|
1541
|
+
hls.startLoad(t);
|
|
1542
|
+
} catch (event2) {
|
|
1543
|
+
seekTime = t;
|
|
1544
|
+
}
|
|
1545
|
+
return;
|
|
1546
|
+
}
|
|
1479
1547
|
var readyEnough = !isUndefined(video.readyState) && video.readyState >= 2;
|
|
1480
1548
|
var bufferedOk = timeInBuffered(t);
|
|
1481
1549
|
if (!force && !bufferedOk && (!readyEnough || video.readyState < 3)) {
|
|
1482
1550
|
seekRetryCount++;
|
|
1483
1551
|
if (seekRetryCount <= 50) {
|
|
1484
|
-
try {
|
|
1485
|
-
if (hls && typeof hls.startLoad === "function") {
|
|
1486
|
-
hls.startLoad(t);
|
|
1487
|
-
}
|
|
1488
|
-
} catch (event2) {
|
|
1489
|
-
}
|
|
1490
1552
|
if (seekRetryTimer) {
|
|
1491
1553
|
clearTimeout(seekRetryTimer);
|
|
1492
1554
|
}
|
|
@@ -1497,12 +1559,6 @@ var require_ckplayer = __commonJS({
|
|
|
1497
1559
|
}
|
|
1498
1560
|
}
|
|
1499
1561
|
clearSeekRetry();
|
|
1500
|
-
if (t > 0) {
|
|
1501
|
-
maxSeeTime = Math.max(maxSeeTime, t);
|
|
1502
|
-
if (firstSeekTime < 0) {
|
|
1503
|
-
firstSeekTime = t;
|
|
1504
|
-
}
|
|
1505
|
-
}
|
|
1506
1562
|
seekApplyLock = true;
|
|
1507
1563
|
seekTime = 0;
|
|
1508
1564
|
try {
|
|
@@ -2166,7 +2222,8 @@ var require_ckplayer = __commonJS({
|
|
|
2166
2222
|
ad["frontPlay"] = false;
|
|
2167
2223
|
C["ad"].hide();
|
|
2168
2224
|
allBarShow();
|
|
2169
|
-
seekTime =
|
|
2225
|
+
seekTime = 0;
|
|
2226
|
+
applyResumeSeekState(parseResumeSeekFromVars());
|
|
2170
2227
|
if (ad["front"]["video"]) {
|
|
2171
2228
|
changeVideo(vars["video"]);
|
|
2172
2229
|
} else {
|
|
@@ -2751,11 +2808,20 @@ var require_ckplayer = __commonJS({
|
|
|
2751
2808
|
if (vars["timeScheduleAdjust"] == 5 && target > maxSeeTime && seekTime && Math.abs(seekTime - target) < 0.5) {
|
|
2752
2809
|
maxSeeTime = Math.max(maxSeeTime, target);
|
|
2753
2810
|
}
|
|
2754
|
-
if (target > 0.5 && !timeInBuffered(target) && video.readyState < 3) {
|
|
2811
|
+
if (target > 0.5 && !timeInBuffered(target) && video.readyState < 3 && !hls) {
|
|
2755
2812
|
seekTime = target;
|
|
2756
2813
|
applyPendingSeek(false);
|
|
2757
2814
|
return player;
|
|
2758
2815
|
}
|
|
2816
|
+
if (hls && typeof hls.startLoad === "function") {
|
|
2817
|
+
seekTime = 0;
|
|
2818
|
+
try {
|
|
2819
|
+
hls.startLoad(target);
|
|
2820
|
+
} catch (event2) {
|
|
2821
|
+
seekTime = target;
|
|
2822
|
+
}
|
|
2823
|
+
return player;
|
|
2824
|
+
}
|
|
2759
2825
|
try {
|
|
2760
2826
|
video.currentTime = target;
|
|
2761
2827
|
seekTime = 0;
|
|
@@ -5970,7 +6036,7 @@ var require_ckplayer = __commonJS({
|
|
|
5970
6036
|
if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
|
|
5971
6037
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
5972
6038
|
var m2 = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
|
|
5973
|
-
if (cdn && cdn.indexOf("1.0.
|
|
6039
|
+
if (cdn && cdn.indexOf("1.0.7") === -1 && m2) {
|
|
5974
6040
|
if (cdn.slice(-1) !== "/") {
|
|
5975
6041
|
cdn += "/";
|
|
5976
6042
|
}
|