okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/ciderapp/Cider

Browse source
This commit is contained in:
vapormusic 2021-12-27 13:27:01 +07:00
commit 6637e0e571
2 changed files with 24783 additions and 24775 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/renderer/hlscider.js
View file

@ -3316,7 +3316,7 @@ typeof window !== "undefined" &&
_this3.tick(); _this3.tick();
}).catch(function (reason) { }).catch(function (reason) {
// _this3.warn(reason); _this3.warn(reason);
_this3.resetFragmentLoading(frag); _this3.resetFragmentLoading(frag);
}); });
@ -10793,10 +10793,13 @@ typeof window !== "undefined" &&
if (currentTrack !== null && currentTrack !== void 0 && currentTrack.details) { if (currentTrack !== null && currentTrack !== void 0 && currentTrack.details) {
this.mediaBuffer = this.mediaBufferTimeRanges; this.mediaBuffer = this.mediaBufferTimeRanges;
this.setInterval(TICK_INTERVAL);
} else { } else {
this.mediaBuffer = null; this.mediaBuffer = null;
} }
if (currentTrack) {
this.setInterval(TICK_INTERVAL);
}
} // Got a new set of subtitle fragments. } // Got a new set of subtitle fragments.
; ;
@ -11461,6 +11464,7 @@ typeof window !== "undefined" &&
this.cea608Parser1 = void 0; this.cea608Parser1 = void 0;
this.cea608Parser2 = void 0; this.cea608Parser2 = void 0;
this.lastSn = -1; this.lastSn = -1;
this.lastPartIndex = -1;
this.prevCC = -1; this.prevCC = -1;
this.vttCCs = newVTTCCs(); this.vttCCs = newVTTCCs();
this.captionsProperties = void 0; this.captionsProperties = void 0;
@ -11697,6 +11701,7 @@ typeof window !== "undefined" &&
_proto.onManifestLoading = function onManifestLoading() { _proto.onManifestLoading = function onManifestLoading() {
this.lastSn = -1; // Detect discontinuity in fragment parsing this.lastSn = -1; // Detect discontinuity in fragment parsing
this.lastPartIndex = -1;
this.prevCC = -1; this.prevCC = -1;
this.vttCCs = newVTTCCs(); // Detect discontinuity in subtitle manifests this.vttCCs = newVTTCCs(); // Detect discontinuity in subtitle manifests
@ -11833,7 +11838,8 @@ typeof window !== "undefined" &&
_proto.onFragLoading = function onFragLoading(event, data) { _proto.onFragLoading = function onFragLoading(event, data) {
var cea608Parser1 = this.cea608Parser1, var cea608Parser1 = this.cea608Parser1,
cea608Parser2 = this.cea608Parser2, cea608Parser2 = this.cea608Parser2,
lastSn = this.lastSn; lastSn = this.lastSn,
lastPartIndex = this.lastPartIndex;
if (!this.enabled || !(cea608Parser1 && cea608Parser2)) { if (!this.enabled || !(cea608Parser1 && cea608Parser2)) {
return; return;
@ -11841,14 +11847,18 @@ typeof window !== "undefined" &&
if (data.frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_7__["PlaylistLevelType"].MAIN) { if (data.frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_7__["PlaylistLevelType"].MAIN) {
var sn = data.frag.sn; var _data$part$index, _data$part;
if (sn !== lastSn + 1) { var sn = data.frag.sn;
var partIndex = (_data$part$index = data === null || data === void 0 ? void 0 : (_data$part = data.part) === null || _data$part === void 0 ? void 0 : _data$part.index) != null ? _data$part$index : -1;
if (!(sn === lastSn + 1 || sn === lastSn && partIndex === lastPartIndex + 1)) {
cea608Parser1.reset(); cea608Parser1.reset();
cea608Parser2.reset(); cea608Parser2.reset();
} }
this.lastSn = sn; this.lastSn = sn;
this.lastPartIndex = partIndex;
} }
}; };
@ -17864,7 +17874,7 @@ typeof window !== "undefined" &&
}], [{ }], [{
key: "version", key: "version",
get: function get() { get: function get() {
return "1.1.2-0.canary.8085"; return "1.1.2";
} }
}, { }, {
key: "Events", key: "Events",
@ -19209,11 +19219,7 @@ typeof window !== "undefined" &&
} }
} }
} }
if (levels && levels.length > 0) {
levels = levels.sort(function (a, b) {
return a.bitrate - b.bitrate;
});
}
return { return {
levels: levels, levels: levels,
sessionData: hasSessionData ? sessionData : null sessionData: hasSessionData ? sessionData : null
@ -27813,3 +27819,4 @@ typeof window !== "undefined" &&
/******/ })["default"]; /******/ })["default"];
}); });
//# sourceMappingURL=CiderHls.js.map

5
src/renderer/style.less
View file

@ -1,5 +1,6 @@
@import url("ameframework.css"); @import url("ameframework.css");
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&family=Noto+Sans+JP:wght@100;300;400;500;700;900&display=swap'); @import url("assets/fonts/Inter/inter.css");
@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@100;300;400;500;700;900&display=swap');
:root { :root {
--appleEase: cubic-bezier(0.42, 0, 0.58, 1); --appleEase: cubic-bezier(0.42, 0, 0.58, 1);
@ -36,7 +37,7 @@ body {
background-size: cover; background-size: cover;
background-position: center; background-position: center;
background: #0000; background: #0000;
font-family: 'Inter', 'Noto Sans JP', "Segoe UI Variable Display", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-family: "Inter var experimental", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
transition: opacity .10s var(--appleEase); transition: opacity .10s var(--appleEase);
} }