guzijian / wvp-GB28181-pro · Commits

Commit e625520bc8be62a844735195ffa5a76daf021d40

Authored by 648540858
1 parent f75b3e6c

修改转码接口以使用127.0.0.1, 作为源IP

Inline Side-by-side
Showing 2 changed files with 4 additions and 1 deletions
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
  View file @e625520
@@ -64,6 +64,7 @@ public class PlayController { @@ -64,6 +64,7 @@ public class PlayController {
64 DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(); 64 DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
65 // 超时处理 65 // 超时处理
66 result.onTimeout(()->{ 66 result.onTimeout(()->{
  67 + logger.warn(String.format("设备点播超时，deviceId：%s ，channelId：%s", deviceId, channelId));
67 RequestMessage msg = new RequestMessage(); 68 RequestMessage msg = new RequestMessage();
68 msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 69 msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
69 msg.setData("Timeout"); 70 msg.setData("Timeout");
@@ -141,7 +142,8 @@ public class PlayController { @@ -141,7 +142,8 @@ public class PlayController {
141 MediaServerConfig mediaInfo = storager.getMediaInfo(); 142 MediaServerConfig mediaInfo = storager.getMediaInfo();
142 String dstUrl = String.format("rtmp://%s:%s/convert/%s", "127.0.0.1", mediaInfo.getRtmpPort(), 143 String dstUrl = String.format("rtmp://%s:%s/convert/%s", "127.0.0.1", mediaInfo.getRtmpPort(),
143 streamId ); 144 streamId );
144 - JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(streamInfo.getRtsp(), dstUrl, "1000000"); 145 + String srcUrl = String.format("rtsp://%s:%s/rtp/%s", "127.0.0.1", mediaInfo.getRtspPort(), streamId);
  146 + JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(srcUrl, dstUrl, "1000000");
145 System.out.println(jsonObject); 147 System.out.println(jsonObject);
146 JSONObject result = new JSONObject(); 148 JSONObject result = new JSONObject();
147 if (jsonObject != null && jsonObject.getInteger("code") == 0) { 149 if (jsonObject != null && jsonObject.getInteger("code") == 0) {
src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
  View file @e625520
@@ -62,6 +62,7 @@ public class PlaybackController { @@ -62,6 +62,7 @@ public class PlaybackController {
62 DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(); 62 DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
63 // 超时处理 63 // 超时处理
64 result.onTimeout(()->{ 64 result.onTimeout(()->{
  65 + logger.warn(String.format("设备回放超时，deviceId：%s ，channelId：%s", deviceId, channelId));
65 RequestMessage msg = new RequestMessage(); 66 RequestMessage msg = new RequestMessage();
66 msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); 67 msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
67 msg.setData("Timeout"); 68 msg.setData("Timeout");