合并分支

src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java

@@ -147,4 +147,6 @@ public interface IMediaServerService {
 
     SendRtpItem createSendRtpItem(MediaServer serverItem, String ip, int port, String ssrc, String platformId,
                                   String app, String stream, String channelId, boolean tcp, boolean rtcp);
+
+    MediaServer getMediaServerByAppAndStream(String app, String stream);
 }

src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java

@@ -898,4 +898,16 @@ public class MediaServerServiceImpl implements IMediaServerService {
         sendRtpItem.setRtcp(rtcp);
         return sendRtpItem;
     }
+
+    @Override
+    public MediaServer getMediaServerByAppAndStream(String app, String stream) {
+        List<MediaServer> mediaServerList = getAll();
+        for (MediaServer mediaServer : mediaServerList) {
+            MediaInfo mediaInfo = getMediaInfo(mediaServer, app, stream);
+            if (mediaInfo != null) {
+                return mediaServer;
+            }
+        }
+        return null;
+    }
 }