瀏覽代碼

调整前端使用转码后的流

648540858 1 年之前
父節點
當前提交
107caf1171

+ 3 - 0
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java

@@ -120,6 +120,9 @@ public class ApiStreamController {
             if (errorCode == InviteErrorCode.SUCCESS.getCode()) {
                 if (data != null) {
                     StreamInfo streamInfo = (StreamInfo)data;
+                    if (streamInfo.getTranscodeStream() != null) {
+                        streamInfo = streamInfo.getTranscodeStream();
+                    }
                     JSONObject resultJjson = new JSONObject();
                     resultJjson.put("StreamID", streamInfo.getStream());
                     resultJjson.put("DeviceID", serial);

+ 6 - 2
web_src/src/components/dialog/devicePlayer.vue

@@ -473,10 +473,14 @@ export default {
     },
     getUrlByStreamInfo() {
       console.log(this.streamInfo)
+      let streamInfo = this.streamInfo
+      if (this.streamInfo.transcodeStream) {
+        streamInfo = this.streamInfo.transcodeStream;
+      }
       if (location.protocol === "https:") {
-        this.videoUrl = this.streamInfo[this.player[this.activePlayer][1]]
+        this.videoUrl = streamInfo[this.player[this.activePlayer][1]]
       } else {
-        this.videoUrl = this.streamInfo[this.player[this.activePlayer][0]]
+        this.videoUrl = streamInfo[this.player[this.activePlayer][0]]
       }
       return this.videoUrl;