From 242a766794ace13567cae628c63ae2321ffa9dda Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 16 十一月 2020 17:09:48 +0800
Subject: [PATCH] Merge pull request #2 from lawrencehj/master

---
 src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

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);
 

--
Gitblit v1.8.0