| | |
| | | @Override |
| | | public StreamInfo getStreamInfoByAppAndStreamWithCheck(String app, String stream, String mediaServerId, String addr) { |
| | | StreamInfo streamInfo = null; |
| | | MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId); |
| | | |
| | | MediaServerItem mediaInfo; |
| | | if (mediaServerId == null) { |
| | | mediaInfo = mediaServerService.getDefaultMediaServer(); |
| | | }else { |
| | | mediaInfo = mediaServerService.getOne(mediaServerId); |
| | | } |
| | | if (mediaInfo == null) { |
| | | return streamInfo; |
| | | } |
| | |
| | | return streamInfo; |
| | | } |
| | | |
| | | |
| | | |
| | | @Override |
| | | public StreamInfo getStreamInfoByAppAndStreamWithCheck(String app, String stream, String mediaServerId) { |
| | | return getStreamInfoByAppAndStreamWithCheck(app, stream, mediaServerId, null); |