Merge branch 'wvp-28181-2.0' into main-dev

# Conflicts: # pom.xml # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
2023-12-14 09:30:21 +08:00
parent fc8bb378de b699158e43
commit 60dffa5813
23 changed files with 801 additions and 682 deletions
--- a/web_src/static/js/jessibuca/jessibuca.d.ts
+++ b/web_src/static/js/jessibuca/jessibuca.d.ts
@@ -561,9 +561,9 @@ declare class Jessibuca {
        buf: number;
        /** 当前视频帧率 */
        fps: number;
-        /** 当前音频码率，单位bit */
+        /** 当前音频码率，单位byte */
        abps: number;
-        /** 当前视频码率，单位bit */
+        /** 当前视频码率，单位byte */
        vbps: number;
        /** 当前视频帧pts，单位毫秒 */
        ts: number;
--- a/web_src/static/js/jessibuca/jessibuca.js
+++ b/web_src/static/js/jessibuca/jessibuca.js