From 33b51c40ddd9750a19b2c6a6618fb22386f87cd7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 13 十一月 2020 18:12:21 +0800
Subject: [PATCH] 增加强制不查询编码信息配置
---
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java | 4 ++++
src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java | 1 -
pom.xml | 6 ------
src/main/resources/application.yml | 1 +
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8367e70..dba80cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,6 @@
<generated.asciidoc.directory>${project.build.directory}/asciidoc</generated.asciidoc.directory>
<asciidoctor.html.output.directory>${project.build.directory}/asciidoc/html</asciidoctor.html.output.directory>
<asciidoctor.pdf.output.directory>${project.build.directory}/asciidoc/pdf</asciidoctor.pdf.output.directory>
- <gson.version>2.8.6</gson.version>
</properties>
<dependencies>
@@ -152,11 +151,6 @@
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.73</version>
- </dependency>
- <!-- google json搴� -->
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
</dependency>
<!--Guava鏄竴绉嶅熀浜庡紑婧愮殑Java搴�-->
diff --git a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java b/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
index a102fe5..990f003 100644
--- a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
+++ b/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
@@ -11,5 +11,4 @@
public static void main(String[] args) {
SpringApplication.run(VManageBootstrap.class, args);
}
-
}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
index feb96df..c9b2d34 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
@@ -38,11 +38,15 @@
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
+ @Value("${media.closeWaitRTPInfo}")
+ private boolean closeWaitRTPInfo;
+
@GetMapping("/play/{deviceId}/{channelId}")
public ResponseEntity<String> play(@PathVariable String deviceId, @PathVariable String channelId,
Integer getEncoding) {
if (getEncoding == null) getEncoding = 0;
+ getEncoding = closeWaitRTPInfo ? 0: getEncoding;
Device device = storager.queryVideoDevice(deviceId);
StreamInfo streamInfo = storager.queryPlayByDevice(deviceId, channelId);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9d5e39c..5a752e5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,6 +45,7 @@
port: 80
secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
streamNoneReaderDelayMS: 1800000 # 鏃犱汉瑙傜湅澶氫箙鑷姩鍏抽棴娴�
+ closeWaitRTPInfo: false # 寮哄埗鍏抽棴绛夊緟鏀跺埌娴佺紪鐮佷俊鎭悗鍦ㄨ繑鍥�, 璁句负true鍙互蹇�熸墦寮�鎾斁绐楀彛, 璁句负false淇濊瘉杩斿洖鍚庢祦灏卞彲浠ユ挱鏀�
rtp: # 鍚敤udp澶氱鍙ｆā寮�
enable: true
udpPortRange: 30000,30500 # 绔彛鑼冨洿
--
Gitblit v1.8.0