Browse Source

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

648540858 4 years ago
parent
commit
e625520bc8

+ 3 - 1
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java

@@ -64,6 +64,7 @@ public class PlayController {
 		DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
 		// 超时处理
 		result.onTimeout(()->{
+			logger.warn(String.format("设备点播超时,deviceId:%s ,channelId:%s", deviceId, channelId));
 			RequestMessage msg = new RequestMessage();
 			msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
 			msg.setData("Timeout");
@@ -141,7 +142,8 @@ public class PlayController {
 			MediaServerConfig mediaInfo = storager.getMediaInfo();
 			String dstUrl = String.format("rtmp://%s:%s/convert/%s", "127.0.0.1", mediaInfo.getRtmpPort(),
 					streamId );
-			JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(streamInfo.getRtsp(), dstUrl, "1000000");
+			String srcUrl = String.format("rtsp://%s:%s/rtp/%s", "127.0.0.1", mediaInfo.getRtspPort(), streamId);
+			JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(srcUrl, dstUrl, "1000000");
 			System.out.println(jsonObject);
 			JSONObject result = new JSONObject();
 			if (jsonObject != null && jsonObject.getInteger("code") == 0) {

+ 1 - 0
src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java

@@ -62,6 +62,7 @@ public class PlaybackController {
 		DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
 		// 超时处理
 		result.onTimeout(()->{
+			logger.warn(String.format("设备回放超时,deviceId:%s ,channelId:%s", deviceId, channelId));
 			RequestMessage msg = new RequestMessage();
 			msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid);
 			msg.setData("Timeout");