Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加强制不查询编码信息配置

Browse Source
This commit is contained in:
648540858 2020-11-13 18:12:21 +08:00
parent 028e656f56
commit f594229a72
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -26,7 +26,6 @@
<generated.asciidoc.directory>${project.build.directory}/asciidoc</generated.asciidoc.directory> <generated.asciidoc.directory>${project.build.directory}/asciidoc</generated.asciidoc.directory>
<asciidoctor.html.output.directory>${project.build.directory}/asciidoc/html</asciidoctor.html.output.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> <asciidoctor.pdf.output.directory>${project.build.directory}/asciidoc/pdf</asciidoctor.pdf.output.directory>
<gson.version>2.8.6</gson.version>
</properties> </properties>
<dependencies> <dependencies>
@ -153,11 +152,6 @@
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.73</version> <version>1.2.73</version>
</dependency> </dependency>
<!-- google json库 -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<!--Guava是一种基于开源的Java库--> <!--Guava是一种基于开源的Java库-->
<dependency> <dependency>

1
src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
View File

@ -11,5 +11,4 @@ public class VManageBootstrap extends LogManager {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(VManageBootstrap.class, args); SpringApplication.run(VManageBootstrap.class, args);
} }
} }

4
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
View File

@ -38,11 +38,15 @@ public class PlayController {
@Autowired @Autowired
private ZLMRESTfulUtils zlmresTfulUtils; private ZLMRESTfulUtils zlmresTfulUtils;
@Value("${media.closeWaitRTPInfo}")
private boolean closeWaitRTPInfo;
@GetMapping("/play/{deviceId}/{channelId}") @GetMapping("/play/{deviceId}/{channelId}")
public ResponseEntity<String> play(@PathVariable String deviceId, @PathVariable String channelId, public ResponseEntity<String> play(@PathVariable String deviceId, @PathVariable String channelId,
Integer getEncoding) { Integer getEncoding) {
if (getEncoding == null) getEncoding = 0; if (getEncoding == null) getEncoding = 0;
getEncoding = closeWaitRTPInfo ? 0: getEncoding;
Device device = storager.queryVideoDevice(deviceId); Device device = storager.queryVideoDevice(deviceId);
StreamInfo streamInfo = storager.queryPlayByDevice(deviceId, channelId); StreamInfo streamInfo = storager.queryPlayByDevice(deviceId, channelId);

1
src/main/resources/application.yml
View File

@ -45,6 +45,7 @@ media: #zlm服务器的ip与http端口, 重点: 这是http端口
port: 80 port: 80
secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
streamNoneReaderDelayMS: 1800000 # 无人观看多久自动关闭流 streamNoneReaderDelayMS: 1800000 # 无人观看多久自动关闭流
closeWaitRTPInfo: false # 强制关闭等待收到流编码信息后在返回, 设为true可以快速打开播放窗口, 设为false保证返回后流就可以播放
rtp: # 启用udp多端口模式 rtp: # 启用udp多端口模式
enable: true enable: true
udpPortRange: 30000,30500 # 端口范围 udpPortRange: 30000,30500 # 端口范围