ckplayer-plus 1.1.7 → 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.
Files changed (9) hide show
  1. package/dist/ckplayer.js +84 -51
  2. package/dist/ckplayer.min.js +2 -2
  3. package/dist/index.cjs +63 -43
  4. package/dist/index.js +63 -43
  5. package/dist/react.cjs +63 -43
  6. package/dist/react.js +63 -43
  7. package/dist/vue.cjs +63 -43
  8. package/dist/vue.js +63 -43
  9. package/package.json +1 -1
package/dist/index.cjs CHANGED
@@ -210,7 +210,7 @@ var require_ckplayer = __commonJS({
210
210
  cdnFallback: true
211
211
  // getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
212
212
  };
213
- var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.7/dist/";
213
+ var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.9/dist/";
214
214
  function ckplayerEmbed(videoObj) {
215
215
  var rightMenu = [
216
216
  {
@@ -435,7 +435,7 @@ var require_ckplayer = __commonJS({
435
435
  }
436
436
  var allowCdn = !vars || vars["cdnFallback"] !== false;
437
437
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
438
- if (!allowCdn || !cdn || cdn.indexOf("1.1.7") > -1) {
438
+ if (!allowCdn || !cdn || cdn.indexOf("1.1.9") > -1) {
439
439
  return folder + "/" + file;
440
440
  }
441
441
  if (cdn.slice(-1) !== "/") {
@@ -671,7 +671,7 @@ var require_ckplayer = __commonJS({
671
671
  return true;
672
672
  }
673
673
  }
674
- var loadAt = hlsPriorLoadTime(target);
674
+ var loadAt = hlsFragStartTime(target);
675
675
  if (!force) {
676
676
  if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
677
677
  return true;
@@ -826,7 +826,7 @@ var require_ckplayer = __commonJS({
826
826
  } });
827
827
  return;
828
828
  } else {
829
- if (vars["plug"] && !canPlay(vstr)) {
829
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr))) {
830
830
  plugPlayer(vstr);
831
831
  } else {
832
832
  if (!existenceObj) {
@@ -838,7 +838,7 @@ var require_ckplayer = __commonJS({
838
838
  } else if (valType(vstr) == "array") {
839
839
  for (i = 0; i < vstr.length; i++) {
840
840
  if (valType(vstr[i]) == "array") {
841
- if (vars["plug"] && !canPlay(vstr[i][0])) {
841
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr[i][0]))) {
842
842
  plugPlayer(vstr[i][0]);
843
843
  } else {
844
844
  var type = ' type="' + vstr[i][1] + '"';
@@ -919,6 +919,7 @@ var require_ckplayer = __commonJS({
919
919
  resumeAt = parseResumeSeekFromVars();
920
920
  }
921
921
  if (resumeAt && resumeAt > 0 && (isUndefined(vars["live"]) || !vars["live"])) {
922
+ hlsConf.autoStartLoad = false;
922
923
  maxSeeTime = Math.max(maxSeeTime, resumeAt);
923
924
  if (firstSeekTime < 0) {
924
925
  firstSeekTime = resumeAt;
@@ -927,6 +928,7 @@ var require_ckplayer = __commonJS({
927
928
  hlsResumeTarget = resumeAt;
928
929
  hlsResumeSettling = true;
929
930
  hlsResumeWarmup = false;
931
+ autoplayPending = false;
930
932
  }
931
933
  hls = new Hls(hlsConf);
932
934
  hls.loadSource(url);
@@ -934,31 +936,18 @@ var require_ckplayer = __commonJS({
934
936
  hls.on(Hls.Events.MANIFEST_PARSED, function() {
935
937
  if (seekTime > 0 && hlsResumeSettling) {
936
938
  hlsStartPositionUsed = true;
937
- var tryResume = function() {
938
- if (!seekTime || !hlsResumeSettling) {
939
- return;
940
- }
941
- var t = seekTime;
942
- if (video && (video.readyState >= 1 || duration && isFinite(duration) && duration > 0)) {
943
- finishResumeSeek(t);
944
- return;
945
- }
946
- seekRetryCount++;
947
- if (seekRetryCount <= 25) {
948
- if (seekRetryTimer) {
949
- clearTimeout(seekRetryTimer);
950
- }
951
- seekRetryTimer = setTimeout(tryResume, 120);
952
- } else {
953
- finishResumeSeek(t);
954
- }
955
- };
956
- tryResume();
939
+ hlsSeekTo(seekTime, true);
940
+ if (C["buffer"]) {
941
+ C["buffer"].show();
942
+ }
957
943
  setTimeout(function() {
958
- if (hlsResumeSettling && seekTime > 0) {
959
- finishResumeSeek(seekTime);
944
+ if (hlsResumeSettling) {
945
+ var t = seekTime > 0 ? seekTime : hlsResumeTarget;
946
+ if (t > 0) {
947
+ finishResumeSeek(t);
948
+ }
960
949
  }
961
- }, 4e3);
950
+ }, 1e4);
962
951
  return;
963
952
  }
964
953
  if (!hlsStartPositionUsed) {
@@ -966,7 +955,9 @@ var require_ckplayer = __commonJS({
966
955
  }
967
956
  });
968
957
  hls.on(Hls.Events.FRAG_BUFFERED, function(event2, data) {
969
- if (hlsResumeSettling && seekTime > 0) {
958
+ if (hlsResumeSettling && (seekTime > 0 || hlsResumeTarget > 0)) {
959
+ var resumeT = seekTime > 0 ? seekTime : hlsResumeTarget;
960
+ tryCompleteResumeSeek(resumeT);
970
961
  return;
971
962
  }
972
963
  if (hlsResumeTarget <= 0 || !data || !data.frag) {
@@ -1812,17 +1803,14 @@ var require_ckplayer = __commonJS({
1812
1803
  if (!timeInBuffered(t)) {
1813
1804
  return false;
1814
1805
  }
1815
- var loadStart = hlsPriorLoadTime(t);
1816
- try {
1817
- var buf = video.buffered;
1818
- for (var i = 0; i < buf.length; i++) {
1819
- var start = buf.start(i);
1820
- var end = buf.end(i);
1821
- if (loadStart >= start - 0.35 && t <= end + 0.15) {
1822
- return true;
1823
- }
1824
- }
1825
- } catch (event2) {
1806
+ return true;
1807
+ }, tryCompleteResumeSeek = function(t) {
1808
+ if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
1809
+ return false;
1810
+ }
1811
+ if (hlsCanSafelySeekTo(t)) {
1812
+ finishResumeSeek(t);
1813
+ return true;
1826
1814
  }
1827
1815
  return false;
1828
1816
  }, finishResumeSeek = function(t) {
@@ -1900,6 +1888,20 @@ var require_ckplayer = __commonJS({
1900
1888
  }
1901
1889
  if (hls) {
1902
1890
  hlsResumeSettling = true;
1891
+ hlsResumeTarget = t;
1892
+ autoplayPending = false;
1893
+ if (hlsResumeWarmup) {
1894
+ return;
1895
+ }
1896
+ if (tryCompleteResumeSeek(t)) {
1897
+ return;
1898
+ }
1899
+ if (hlsSeekTo(t, force)) {
1900
+ if (C["buffer"]) {
1901
+ C["buffer"].show();
1902
+ }
1903
+ return;
1904
+ }
1903
1905
  if (!force && (!isUndefined(video.readyState) && video.readyState < 1) && !(dur && isFinite(dur) && dur > 0)) {
1904
1906
  seekRetryCount++;
1905
1907
  if (seekRetryCount <= 40) {
@@ -2209,10 +2211,28 @@ var require_ckplayer = __commonJS({
2209
2211
  seekApplyLock = false;
2210
2212
  decodeRecoverCount = 0;
2211
2213
  hlsScrubbing = false;
2212
- hlsResumeSettling = false;
2214
+ var resumePending = false;
2215
+ if (hlsResumeSettling && hlsResumeTarget > 0) {
2216
+ if (!timeInBuffered(hlsResumeTarget)) {
2217
+ resumePending = true;
2218
+ } else if (Math.abs(this.currentTime - hlsResumeTarget) > 0.5) {
2219
+ resumePending = true;
2220
+ var resumeTarget = hlsResumeTarget;
2221
+ setTimeout(function() {
2222
+ if (hlsResumeSettling && timeInBuffered(resumeTarget)) {
2223
+ finishResumeSeek(resumeTarget);
2224
+ }
2225
+ }, 0);
2226
+ }
2227
+ }
2228
+ if (!resumePending) {
2229
+ hlsResumeSettling = false;
2230
+ }
2213
2231
  startPendingAutoplay();
2214
2232
  pSliderMouseDown = false;
2215
- hidePlaybackBuffer();
2233
+ if (!resumePending) {
2234
+ hidePlaybackBuffer();
2235
+ }
2216
2236
  if (hlsScrubResumePlay) {
2217
2237
  hlsScrubResumePlay = false;
2218
2238
  try {
@@ -6427,7 +6447,7 @@ var require_ckplayer = __commonJS({
6427
6447
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6428
6448
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6429
6449
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6430
- if (cdn && cdn.indexOf("1.1.7") === -1 && m) {
6450
+ if (cdn && cdn.indexOf("1.1.9") === -1 && m) {
6431
6451
  if (cdn.slice(-1) !== "/") {
6432
6452
  cdn += "/";
6433
6453
  }
package/dist/index.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.7/dist/";
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.7") > -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 = hlsPriorLoadTime(target);
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] + '"';
@@ -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,18 @@ var require_ckplayer = __commonJS({
928
930
  hls.on(Hls.Events.MANIFEST_PARSED, function() {
929
931
  if (seekTime > 0 && hlsResumeSettling) {
930
932
  hlsStartPositionUsed = true;
931
- var tryResume = function() {
932
- if (!seekTime || !hlsResumeSettling) {
933
- return;
934
- }
935
- var t = seekTime;
936
- if (video && (video.readyState >= 1 || duration && isFinite(duration) && duration > 0)) {
937
- finishResumeSeek(t);
938
- return;
939
- }
940
- seekRetryCount++;
941
- if (seekRetryCount <= 25) {
942
- if (seekRetryTimer) {
943
- clearTimeout(seekRetryTimer);
944
- }
945
- seekRetryTimer = setTimeout(tryResume, 120);
946
- } else {
947
- finishResumeSeek(t);
948
- }
949
- };
950
- tryResume();
933
+ hlsSeekTo(seekTime, true);
934
+ if (C["buffer"]) {
935
+ C["buffer"].show();
936
+ }
951
937
  setTimeout(function() {
952
- if (hlsResumeSettling && seekTime > 0) {
953
- finishResumeSeek(seekTime);
938
+ if (hlsResumeSettling) {
939
+ var t = seekTime > 0 ? seekTime : hlsResumeTarget;
940
+ if (t > 0) {
941
+ finishResumeSeek(t);
942
+ }
954
943
  }
955
- }, 4e3);
944
+ }, 1e4);
956
945
  return;
957
946
  }
958
947
  if (!hlsStartPositionUsed) {
@@ -960,7 +949,9 @@ var require_ckplayer = __commonJS({
960
949
  }
961
950
  });
962
951
  hls.on(Hls.Events.FRAG_BUFFERED, function(event2, data) {
963
- if (hlsResumeSettling && seekTime > 0) {
952
+ if (hlsResumeSettling && (seekTime > 0 || hlsResumeTarget > 0)) {
953
+ var resumeT = seekTime > 0 ? seekTime : hlsResumeTarget;
954
+ tryCompleteResumeSeek(resumeT);
964
955
  return;
965
956
  }
966
957
  if (hlsResumeTarget <= 0 || !data || !data.frag) {
@@ -1806,17 +1797,14 @@ var require_ckplayer = __commonJS({
1806
1797
  if (!timeInBuffered(t)) {
1807
1798
  return false;
1808
1799
  }
1809
- var loadStart = hlsPriorLoadTime(t);
1810
- try {
1811
- var buf = video.buffered;
1812
- for (var i = 0; i < buf.length; i++) {
1813
- var start = buf.start(i);
1814
- var end = buf.end(i);
1815
- if (loadStart >= start - 0.35 && t <= end + 0.15) {
1816
- return true;
1817
- }
1818
- }
1819
- } catch (event2) {
1800
+ return true;
1801
+ }, tryCompleteResumeSeek = function(t) {
1802
+ if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
1803
+ return false;
1804
+ }
1805
+ if (hlsCanSafelySeekTo(t)) {
1806
+ finishResumeSeek(t);
1807
+ return true;
1820
1808
  }
1821
1809
  return false;
1822
1810
  }, finishResumeSeek = function(t) {
@@ -1894,6 +1882,20 @@ var require_ckplayer = __commonJS({
1894
1882
  }
1895
1883
  if (hls) {
1896
1884
  hlsResumeSettling = true;
1885
+ hlsResumeTarget = t;
1886
+ autoplayPending = false;
1887
+ if (hlsResumeWarmup) {
1888
+ return;
1889
+ }
1890
+ if (tryCompleteResumeSeek(t)) {
1891
+ return;
1892
+ }
1893
+ if (hlsSeekTo(t, force)) {
1894
+ if (C["buffer"]) {
1895
+ C["buffer"].show();
1896
+ }
1897
+ return;
1898
+ }
1897
1899
  if (!force && (!isUndefined(video.readyState) && video.readyState < 1) && !(dur && isFinite(dur) && dur > 0)) {
1898
1900
  seekRetryCount++;
1899
1901
  if (seekRetryCount <= 40) {
@@ -2203,10 +2205,28 @@ var require_ckplayer = __commonJS({
2203
2205
  seekApplyLock = false;
2204
2206
  decodeRecoverCount = 0;
2205
2207
  hlsScrubbing = false;
2206
- hlsResumeSettling = false;
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
+ }
2207
2225
  startPendingAutoplay();
2208
2226
  pSliderMouseDown = false;
2209
- hidePlaybackBuffer();
2227
+ if (!resumePending) {
2228
+ hidePlaybackBuffer();
2229
+ }
2210
2230
  if (hlsScrubResumePlay) {
2211
2231
  hlsScrubResumePlay = false;
2212
2232
  try {
@@ -6421,7 +6441,7 @@ var require_ckplayer = __commonJS({
6421
6441
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6422
6442
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6423
6443
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6424
- if (cdn && cdn.indexOf("1.1.7") === -1 && m) {
6444
+ if (cdn && cdn.indexOf("1.1.9") === -1 && m) {
6425
6445
  if (cdn.slice(-1) !== "/") {
6426
6446
  cdn += "/";
6427
6447
  }
package/dist/react.cjs CHANGED
@@ -210,7 +210,7 @@ var require_ckplayer = __commonJS({
210
210
  cdnFallback: true
211
211
  // getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
212
212
  };
213
- var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.7/dist/";
213
+ var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.9/dist/";
214
214
  function ckplayerEmbed(videoObj) {
215
215
  var rightMenu = [
216
216
  {
@@ -435,7 +435,7 @@ var require_ckplayer = __commonJS({
435
435
  }
436
436
  var allowCdn = !vars || vars["cdnFallback"] !== false;
437
437
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
438
- if (!allowCdn || !cdn || cdn.indexOf("1.1.7") > -1) {
438
+ if (!allowCdn || !cdn || cdn.indexOf("1.1.9") > -1) {
439
439
  return folder + "/" + file;
440
440
  }
441
441
  if (cdn.slice(-1) !== "/") {
@@ -671,7 +671,7 @@ var require_ckplayer = __commonJS({
671
671
  return true;
672
672
  }
673
673
  }
674
- var loadAt = hlsPriorLoadTime(target);
674
+ var loadAt = hlsFragStartTime(target);
675
675
  if (!force) {
676
676
  if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
677
677
  return true;
@@ -826,7 +826,7 @@ var require_ckplayer = __commonJS({
826
826
  } });
827
827
  return;
828
828
  } else {
829
- if (vars["plug"] && !canPlay(vstr)) {
829
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr))) {
830
830
  plugPlayer(vstr);
831
831
  } else {
832
832
  if (!existenceObj) {
@@ -838,7 +838,7 @@ var require_ckplayer = __commonJS({
838
838
  } else if (valType(vstr) == "array") {
839
839
  for (i = 0; i < vstr.length; i++) {
840
840
  if (valType(vstr[i]) == "array") {
841
- if (vars["plug"] && !canPlay(vstr[i][0])) {
841
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr[i][0]))) {
842
842
  plugPlayer(vstr[i][0]);
843
843
  } else {
844
844
  var type = ' type="' + vstr[i][1] + '"';
@@ -919,6 +919,7 @@ var require_ckplayer = __commonJS({
919
919
  resumeAt = parseResumeSeekFromVars();
920
920
  }
921
921
  if (resumeAt && resumeAt > 0 && (isUndefined(vars["live"]) || !vars["live"])) {
922
+ hlsConf.autoStartLoad = false;
922
923
  maxSeeTime = Math.max(maxSeeTime, resumeAt);
923
924
  if (firstSeekTime < 0) {
924
925
  firstSeekTime = resumeAt;
@@ -927,6 +928,7 @@ var require_ckplayer = __commonJS({
927
928
  hlsResumeTarget = resumeAt;
928
929
  hlsResumeSettling = true;
929
930
  hlsResumeWarmup = false;
931
+ autoplayPending = false;
930
932
  }
931
933
  hls = new Hls(hlsConf);
932
934
  hls.loadSource(url);
@@ -934,31 +936,18 @@ var require_ckplayer = __commonJS({
934
936
  hls.on(Hls.Events.MANIFEST_PARSED, function() {
935
937
  if (seekTime > 0 && hlsResumeSettling) {
936
938
  hlsStartPositionUsed = true;
937
- var tryResume = function() {
938
- if (!seekTime || !hlsResumeSettling) {
939
- return;
940
- }
941
- var t = seekTime;
942
- if (video && (video.readyState >= 1 || duration && isFinite(duration) && duration > 0)) {
943
- finishResumeSeek(t);
944
- return;
945
- }
946
- seekRetryCount++;
947
- if (seekRetryCount <= 25) {
948
- if (seekRetryTimer) {
949
- clearTimeout(seekRetryTimer);
950
- }
951
- seekRetryTimer = setTimeout(tryResume, 120);
952
- } else {
953
- finishResumeSeek(t);
954
- }
955
- };
956
- tryResume();
939
+ hlsSeekTo(seekTime, true);
940
+ if (C["buffer"]) {
941
+ C["buffer"].show();
942
+ }
957
943
  setTimeout(function() {
958
- if (hlsResumeSettling && seekTime > 0) {
959
- finishResumeSeek(seekTime);
944
+ if (hlsResumeSettling) {
945
+ var t = seekTime > 0 ? seekTime : hlsResumeTarget;
946
+ if (t > 0) {
947
+ finishResumeSeek(t);
948
+ }
960
949
  }
961
- }, 4e3);
950
+ }, 1e4);
962
951
  return;
963
952
  }
964
953
  if (!hlsStartPositionUsed) {
@@ -966,7 +955,9 @@ var require_ckplayer = __commonJS({
966
955
  }
967
956
  });
968
957
  hls.on(Hls.Events.FRAG_BUFFERED, function(event2, data) {
969
- if (hlsResumeSettling && seekTime > 0) {
958
+ if (hlsResumeSettling && (seekTime > 0 || hlsResumeTarget > 0)) {
959
+ var resumeT = seekTime > 0 ? seekTime : hlsResumeTarget;
960
+ tryCompleteResumeSeek(resumeT);
970
961
  return;
971
962
  }
972
963
  if (hlsResumeTarget <= 0 || !data || !data.frag) {
@@ -1812,17 +1803,14 @@ var require_ckplayer = __commonJS({
1812
1803
  if (!timeInBuffered(t)) {
1813
1804
  return false;
1814
1805
  }
1815
- var loadStart = hlsPriorLoadTime(t);
1816
- try {
1817
- var buf = video.buffered;
1818
- for (var i = 0; i < buf.length; i++) {
1819
- var start = buf.start(i);
1820
- var end = buf.end(i);
1821
- if (loadStart >= start - 0.35 && t <= end + 0.15) {
1822
- return true;
1823
- }
1824
- }
1825
- } catch (event2) {
1806
+ return true;
1807
+ }, tryCompleteResumeSeek = function(t) {
1808
+ if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
1809
+ return false;
1810
+ }
1811
+ if (hlsCanSafelySeekTo(t)) {
1812
+ finishResumeSeek(t);
1813
+ return true;
1826
1814
  }
1827
1815
  return false;
1828
1816
  }, finishResumeSeek = function(t) {
@@ -1900,6 +1888,20 @@ var require_ckplayer = __commonJS({
1900
1888
  }
1901
1889
  if (hls) {
1902
1890
  hlsResumeSettling = true;
1891
+ hlsResumeTarget = t;
1892
+ autoplayPending = false;
1893
+ if (hlsResumeWarmup) {
1894
+ return;
1895
+ }
1896
+ if (tryCompleteResumeSeek(t)) {
1897
+ return;
1898
+ }
1899
+ if (hlsSeekTo(t, force)) {
1900
+ if (C["buffer"]) {
1901
+ C["buffer"].show();
1902
+ }
1903
+ return;
1904
+ }
1903
1905
  if (!force && (!isUndefined(video.readyState) && video.readyState < 1) && !(dur && isFinite(dur) && dur > 0)) {
1904
1906
  seekRetryCount++;
1905
1907
  if (seekRetryCount <= 40) {
@@ -2209,10 +2211,28 @@ var require_ckplayer = __commonJS({
2209
2211
  seekApplyLock = false;
2210
2212
  decodeRecoverCount = 0;
2211
2213
  hlsScrubbing = false;
2212
- hlsResumeSettling = false;
2214
+ var resumePending = false;
2215
+ if (hlsResumeSettling && hlsResumeTarget > 0) {
2216
+ if (!timeInBuffered(hlsResumeTarget)) {
2217
+ resumePending = true;
2218
+ } else if (Math.abs(this.currentTime - hlsResumeTarget) > 0.5) {
2219
+ resumePending = true;
2220
+ var resumeTarget = hlsResumeTarget;
2221
+ setTimeout(function() {
2222
+ if (hlsResumeSettling && timeInBuffered(resumeTarget)) {
2223
+ finishResumeSeek(resumeTarget);
2224
+ }
2225
+ }, 0);
2226
+ }
2227
+ }
2228
+ if (!resumePending) {
2229
+ hlsResumeSettling = false;
2230
+ }
2213
2231
  startPendingAutoplay();
2214
2232
  pSliderMouseDown = false;
2215
- hidePlaybackBuffer();
2233
+ if (!resumePending) {
2234
+ hidePlaybackBuffer();
2235
+ }
2216
2236
  if (hlsScrubResumePlay) {
2217
2237
  hlsScrubResumePlay = false;
2218
2238
  try {
@@ -6427,7 +6447,7 @@ var require_ckplayer = __commonJS({
6427
6447
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6428
6448
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6429
6449
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6430
- if (cdn && cdn.indexOf("1.1.7") === -1 && m) {
6450
+ if (cdn && cdn.indexOf("1.1.9") === -1 && m) {
6431
6451
  if (cdn.slice(-1) !== "/") {
6432
6452
  cdn += "/";
6433
6453
  }