From a689af1348938afd3b4506aad9b6d5057193e25d Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期五, 27 五月 2022 09:59:00 +0800
Subject: [PATCH] bug修复
---
public/libs/wasmPlayer/turbo.js | 182 ++++++++++++++++++++++----------------------
1 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/public/libs/wasmPlayer/turbo.js b/public/libs/wasmPlayer/turbo.js
index e4ce4b4..7ba1df1 100644
--- a/public/libs/wasmPlayer/turbo.js
+++ b/public/libs/wasmPlayer/turbo.js
@@ -1,78 +1,78 @@
Module = {
onRuntimeInitialized: function() {
- onWasmLoaded()
+ onWasmLoaded();
},
-}
-importScripts('libffmpeg.js')
+};
+importScripts("libffmpeg.js");
-var MediaName = null
-var IsStream = true
-var FileLen = -1
+var MediaName = null;
+var IsStream = true;
+var FileLen = -1;
-var SocketObj //WebSocket
-var CPointer_Buffer = null
-var CPointer_Cap = 0
+var SocketObj; //WebSocket
+var CPointer_Buffer = null;
+var CPointer_Cap = 0;
function onWasmLoaded() {
DeliverVideo = Module.addFunction(function(Buf, BufLen, TimeStamp) {
- var CPointer_Array = Module.HEAPU8.subarray(Buf, Buf + BufLen)
+ var CPointer_Array = Module.HEAPU8.subarray(Buf, Buf + BufLen);
var message = {
- command: 'deliver_video',
+ command: "deliver_video",
sample: { time_stamp: TimeStamp, buf: new Uint8Array(CPointer_Array) },
- }
- self.postMessage(message, [message.sample.buf.buffer])
- }, 'viii')
+ };
+ self.postMessage(message, [message.sample.buf.buffer]);
+ }, "viii");
DeliverAudio = Module.addFunction(function(Buf, BufLen, TimeStamp) {
- var CPointer_Array = Module.HEAPU8.subarray(Buf, Buf + BufLen)
+ var CPointer_Array = Module.HEAPU8.subarray(Buf, Buf + BufLen);
var message = {
- command: 'deliver_audio',
+ command: "deliver_audio",
sample: { time_stamp: TimeStamp, buf: new Uint8Array(CPointer_Array) },
- }
- self.postMessage(message, [message.sample.buf.buffer])
- }, 'viii')
+ };
+ self.postMessage(message, [message.sample.buf.buffer]);
+ }, "viii");
GetFileLength = Module.addFunction(function() {
if (FileLen == -1) {
- var xhr = new XMLHttpRequest()
- xhr.open('get', MediaName, false) //false: syn mode
- xhr.send()
- FileLen = xhr.getResponseHeader('Content-Length')
- xhr.abort()
+ var xhr = new XMLHttpRequest();
+ xhr.open("get", MediaName, false); //false: syn mode
+ xhr.send();
+ FileLen = xhr.getResponseHeader("Content-Length");
+ xhr.abort();
}
- return FileLen
- }, 'i')
+ return FileLen;
+ }, "i");
ReadFile = Module.addFunction(function(Buf, Pos, Size) {
- var xhr = new XMLHttpRequest()
- xhr.open('get', MediaName, false)
- xhr.responseType = 'arraybuffer'
- xhr.setRequestHeader('Range', 'bytes=' + Pos + '-' + (Pos + Size - 1))
- xhr.send()
- Module.HEAPU8.set(new Uint8Array(xhr.response), Buf) //Uint8Array(xhr.response).length
- xhr.abort()
- }, 'viii')
+ var xhr = new XMLHttpRequest();
+ xhr.open("get", MediaName, false);
+ xhr.responseType = "arraybuffer";
+ xhr.setRequestHeader("Range", "bytes=" + Pos + "-" + (Pos + Size - 1));
+ xhr.send();
+ Module.HEAPU8.set(new Uint8Array(xhr.response), Buf); //Uint8Array(xhr.response).length
+ xhr.abort();
+ }, "viii");
CreateVideo = Module.addFunction(function(Duration, Width, Height) {
self.postMessage({
- command: 'create_video',
+ command: "create_video",
param: { duration: Duration, width: Width, height: Height },
- })
- }, 'viii')
+ });
+ }, "viii");
CreateAudio = Module.addFunction(function(Channel, SampleRate) {
self.postMessage({
- command: 'create_audio',
+ command: "create_audio",
param: { channel: Channel, sample_rate: SampleRate },
- })
- }, 'vii')
+ });
+ }, "vii");
Notify = Module.addFunction(function(Type, Value) {
//type 1:鎾斁澶辫触 2:鏂囦欢鎾斁鍒版湯灏�
//console.log(Type+" "+Value);
- if (Type == 1) self.postMessage({ command: 'play_failed' })
- else if (Type == 2) self.postMessage({ command: 'play_end' })
- }, 'vii')
+ if (Type == 1) self.postMessage({ command: "play_failed" });
+ else if (Type == 2) self.postMessage({ command: "play_end" });
+ }, "vii");
Module._Initialize(
DeliverVideo,
@@ -82,87 +82,87 @@
CreateVideo,
CreateAudio,
Notify
- )
+ );
- self.postMessage({ command: 'initialized' })
+ self.postMessage({ command: "initialized" });
}
function OnTimer() {
- Module._Turbo0(null, 0)
+ Module._Turbo0(null, 0);
}
function requestWebsocket(url, msg, cb_message) {
- SocketObj = new WebSocket(url)
- SocketObj.binaryType = 'arraybuffer'
+ SocketObj = new WebSocket(url);
+ SocketObj.binaryType = "arraybuffer";
SocketObj.onopen = function(evt) {
- SocketObj.send(msg)
- }
+ SocketObj.send(msg);
+ };
SocketObj.onerror = function(evt) {
- console.log('Ws connect error ' + evt.data)
- }
- SocketObj.onmessage = cb_message
+ console.log("Ws connect error " + evt.data);
+ };
+ SocketObj.onmessage = cb_message;
SocketObj.onclose = function() {
- console.log('Ws closed.')
- }
+ console.log("Ws closed.");
+ };
}
function downloadFileByWebsocket(ws, payload) {
this.requestWebsocket(ws, payload, function(evt) {
if (evt.data.byteLength > CPointer_Cap) {
- if (CPointer_Buffer != null) Module._free(CPointer_Buffer)
- CPointer_Cap = evt.data.byteLength
- CPointer_Buffer = Module._malloc(CPointer_Cap)
+ if (CPointer_Buffer != null) Module._free(CPointer_Buffer);
+ CPointer_Cap = evt.data.byteLength;
+ CPointer_Buffer = Module._malloc(CPointer_Cap);
}
- var typedArray = new Uint8Array(evt.data)
- Module.HEAPU8.set(typedArray, CPointer_Buffer)
+ var typedArray = new Uint8Array(evt.data);
+ Module.HEAPU8.set(typedArray, CPointer_Buffer);
//console.log("websocket data: "+typedArray.length);
- Module._Turbo0(CPointer_Buffer, typedArray.length)
- })
+ Module._Turbo0(CPointer_Buffer, typedArray.length);
+ });
}
self.onmessage = function(evt) {
switch (evt.data.command) {
- case 'play': {
- MediaName = evt.data.media_name
- IsStream = evt.data.other
+ case "play": {
+ MediaName = evt.data.media_name;
+ IsStream = evt.data.other;
if (IsStream) {
- downloadFileByWebsocket(MediaName, evt.data.payload)
+ downloadFileByWebsocket(MediaName, evt.data.payload);
}
- Module._Play(null, !IsStream)
- TimerID = setInterval(OnTimer, 5) //姝ゅ�艰秺灏�,娓叉煋绮惧害瓒婇珮,涓斿彲澧炲己'鍙岀嚎绋嬬紦鍐插钩婊戞満鍒�'鍙潬鎬�
- break
+ Module._Play(null, !IsStream);
+ TimerID = setInterval(OnTimer, 5); //姝ゅ�艰秺灏�,娓叉煋绮惧害瓒婇珮,涓斿彲澧炲己'鍙岀嚎绋嬬紦鍐插钩婊戞満鍒�'鍙潬鎬�
+ break;
}
- case 'pause': {
- Module._Pause()
- clearInterval(TimerID)
- break
+ case "pause": {
+ Module._Pause();
+ clearInterval(TimerID);
+ break;
}
- case 'resume': {
- Module._Resume()
- TimerID = setInterval(OnTimer, 5)
- break
+ case "resume": {
+ Module._Resume();
+ TimerID = setInterval(OnTimer, 5);
+ break;
}
- case 'stop': {
- Module._Stop()
- clearInterval(TimerID)
+ case "stop": {
+ Module._Stop();
+ clearInterval(TimerID);
if (IsStream) {
- SocketObj.close()
+ SocketObj.close();
if (CPointer_Buffer != null) {
- Module._free(CPointer_Buffer)
- CPointer_Buffer = null
- CPointer_Cap = 0
+ Module._free(CPointer_Buffer);
+ CPointer_Buffer = null;
+ CPointer_Cap = 0;
}
}
- close() //exit worker
- break
+ close(); //exit worker
+ break;
}
- case 'seek': {
- Module._Seek(evt.data.pos)
- break
+ case "seek": {
+ Module._Seek(evt.data.pos);
+ break;
}
default:
- return
+ return;
}
-}
+};
--
Gitblit v1.8.0