Skip to content

Commit

Permalink
chore: bump sc media
Browse files Browse the repository at this point in the history
  • Loading branch information
zijiren233 committed Feb 11, 2025
1 parent dd94413 commit 6beac79
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 29 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@swarmcloud/dashjs": "^0.8.1",
"@swarmcloud/hls": "^2.13.9",
"@swarmcloud/media": "^1.2.0",
"@swarmcloud/media": "^1.2.1",
"@vueuse/core": "^11.0.3",
"@vueuse/router": "^11.0.3",
"animate.css": "^4.1.1",
Expand Down
38 changes: 14 additions & 24 deletions src/components/Player.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ Artplayer.FAST_FORWARD_VALUE = 3; // 设置长按倍速的速率
Artplayer.FAST_FORWARD_TIME = 1000; // 设置长按加速的延迟时间(毫秒)
let art: Artplayer;
let p2pEngine: Ref<p2pOperationType | undefined> = ref(undefined);
const p2pEngine: Ref<p2pOperationType | undefined> = ref(undefined);
const p2pStats = ref<p2pStatsType>();
const resetP2P = () => {
if (p2pEngine.value) p2pEngine.value.destroy();
p2pEngine.value = undefined;
p2pStats.value = undefined;
};
Expand Down Expand Up @@ -91,6 +92,8 @@ const Props = defineProps({
const Emits = defineEmits(["get-instance"]);
const playMedia = async (player: HTMLMediaElement, url: string, art: any) => {
resetP2P();
const p2pConfig: P2pConfigMedia = {
swFile: "/web/sw.media.js",
p2pEnabled: defaultP2PEnabled.value,
Expand All @@ -112,16 +115,15 @@ const playMedia = async (player: HTMLMediaElement, url: string, art: any) => {
console.log(stats);
console.groupEnd();
p2pStats.value = {
totalHTTPDownloaded: stats.totalHTTPDownloaded,
totalP2PDownloaded: stats.totalP2PDownloaded,
totalP2PUploaded: stats.totalP2PUploaded,
p2pDownloadSpeed: stats.p2pDownloadSpeed
...stats
};
});
p2pEngine.value = engine;
};
const playMpd = async (player: HTMLMediaElement, url: string, art: any) => {
resetP2P();
const dashjs = await import("dashjs");
const P2pEngineDash = (await import("@swarmcloud/dashjs")).default;
Expand Down Expand Up @@ -154,14 +156,10 @@ const playMpd = async (player: HTMLMediaElement, url: string, art: any) => {
console.log(stats);
console.groupEnd();
p2pStats.value = {
totalHTTPDownloaded: stats.totalHTTPDownloaded,
totalP2PDownloaded: stats.totalP2PDownloaded,
totalP2PUploaded: stats.totalP2PUploaded,
p2pDownloadSpeed: stats.p2pDownloadSpeed
...stats
};
});
d.on(dashjs.MediaPlayer.events.PROTECTION_DESTROYED, () => {
engine.destroy();
resetP2P();
});
p2pEngine.value = engine;
Expand Down Expand Up @@ -251,6 +249,8 @@ const playM2ts = async (player: HTMLMediaElement, url: string, art: Artplayer) =
};
const playM3u8 = async (player: HTMLMediaElement, url: string, art: Artplayer) => {
resetP2P();
const Hls = (await import("hls.js")).default;
const P2pEngineHls = (await import("@swarmcloud/hls")).default;
Expand All @@ -273,10 +273,7 @@ const playM3u8 = async (player: HTMLMediaElement, url: string, art: Artplayer) =
console.log(stats);
console.groupEnd();
p2pStats.value = {
totalHTTPDownloaded: stats.totalHTTPDownloaded,
totalP2PDownloaded: stats.totalP2PDownloaded,
totalP2PUploaded: stats.totalP2PUploaded,
p2pDownloadSpeed: stats.p2pDownloadSpeed
...stats
};
});
engine
Expand All @@ -286,7 +283,6 @@ const playM3u8 = async (player: HTMLMediaElement, url: string, art: Artplayer) =
if (!player.src) player.src = url;
});
art.once("destroy", () => {
engine.destroy();
resetP2P();
});
p2pEngine.value = engine;
Expand Down Expand Up @@ -356,15 +352,11 @@ const playM3u8 = async (player: HTMLMediaElement, url: string, art: Artplayer) =
console.log(stats);
console.groupEnd();
p2pStats.value = {
totalHTTPDownloaded: stats.totalHTTPDownloaded,
totalP2PDownloaded: stats.totalP2PDownloaded,
totalP2PUploaded: stats.totalP2PUploaded,
p2pDownloadSpeed: stats.p2pDownloadSpeed
...stats
};
});
hls.once(Hls.Events.DESTROYING, () => {
engine.destroy();
resetP2P();
});
p2pEngine.value = engine;
Expand Down Expand Up @@ -447,10 +439,8 @@ const mountPlayer = () => {
art = new Artplayer(newPlayerOption(newDiv));
art.on("destroy", () => {
destroyOldCustomPlayLib(art);
if (p2pEngine.value) {
p2pEngine.value.destroy();
p2pEngine.value = undefined;
}
resetP2P();
art.video.src = "";
});
// addHotKeyEvnet(art);
Emits("get-instance", art);
Expand Down

0 comments on commit 6beac79

Please sign in to comment.