From 12f344197d6af5d23594847359801c983cf4612a Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Wed, 19 Feb 2025 14:50:44 +0800
Subject: [PATCH] 原始流改为rtsp
---
ard-work/src/main/java/com/ard/tianyu/service/impl/TyServiceImpl.java | 6 +++---
ard-work/src/main/java/com/ard/tianyu/websocket/handler/TyStreamHandler.java | 2 +-
ard-work/src/main/java/com/ard/tianyu/service/ITyService.java | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/tianyu/service/ITyService.java b/ard-work/src/main/java/com/ard/tianyu/service/ITyService.java
index d1342fa..f209ba5 100644
--- a/ard-work/src/main/java/com/ard/tianyu/service/ITyService.java
+++ b/ard-work/src/main/java/com/ard/tianyu/service/ITyService.java
@@ -18,6 +18,7 @@
import com.ard.tianyu.model.dto.wayline.*;
import com.ard.tianyu.model.receiver.*;
import com.ard.tianyu.netty.command.BaseCmd;
+import com.ard.vtdu.domain.ArdVtdu;
import com.dtflys.forest.annotation.Var;
import java.util.List;
@@ -283,6 +284,6 @@
/**
* 点播
*/
- String play(String boxSn);
+ ArdVtdu play(String boxSn);
}
diff --git a/ard-work/src/main/java/com/ard/tianyu/service/impl/TyServiceImpl.java b/ard-work/src/main/java/com/ard/tianyu/service/impl/TyServiceImpl.java
index b3a1f2c..a32144c 100644
--- a/ard-work/src/main/java/com/ard/tianyu/service/impl/TyServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/tianyu/service/impl/TyServiceImpl.java
@@ -568,14 +568,14 @@
* 点播
*/
@Override
- public String play(String boxSn) {
+ public ArdVtdu play(String boxSn) {
BoxStreamUrlReceiver boxLiveUrl = getBoxLiveUrl(boxSn);
if(boxLiveUrl == null||boxLiveUrl.getRtsp() == null) {
- return "";
+ return null;
}
ArdVtdu ardVtdu = ArdVtdu.builder().name(boxSn).rtspSource(boxLiveUrl.getRtsp()).build();
ardVtdu = mediaService.addPath(ardVtdu);
- return ardVtdu.getWebrtcUrl();
+ return ardVtdu;
}
/**
diff --git a/ard-work/src/main/java/com/ard/tianyu/websocket/handler/TyStreamHandler.java b/ard-work/src/main/java/com/ard/tianyu/websocket/handler/TyStreamHandler.java
index 30b9272..6ff2ea6 100644
--- a/ard-work/src/main/java/com/ard/tianyu/websocket/handler/TyStreamHandler.java
+++ b/ard-work/src/main/java/com/ard/tianyu/websocket/handler/TyStreamHandler.java
@@ -63,7 +63,7 @@
} else {
BoxStreamUrlReceiver boxLiveUrl = tyService.getBoxLiveUrl(boxSn);
if (boxLiveUrl != null) {
- ArdVtdu vtdu = ArdVtdu.builder().name(boxSn).mode(0).isCode(0).rtspSource(boxLiveUrl.getRtmp()).build();
+ ArdVtdu vtdu = ArdVtdu.builder().name(boxSn).mode(0).isCode(0).rtspSource(boxLiveUrl.getRtsp()).build();
ArdVtdu ardVtdu = mediaService.addPath(vtdu);
BOX_STREAM_PULL_MAP.put(boxSn, ardVtdu.getWebrtcUrl());
messageReply = ardVtdu.getWebrtcUrl();
--
Gitblit v1.9.3