Merge remote-tracking branch 'origin/master' into master

648540858

2020-11-09 2e9b4b4e5e86c84088c45563cd61d18d8c7e5fea

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java

@@ -30,13 +30,8 @@
        param.put("stream_id", streamId);
        JSONObject jsonObject = zlmresTfulUtils.openRtpServer(param);
        if (jsonObject.getInteger("code") == 0) {
            System.out.println(11111111);
            System.out.println(streamId);
            System.out.println(ssrc);
            System.out.println(newPort);
            System.out.println(jsonObject.toJSONString());
            return newPort;
        }else {
        } else {
            return getNewRTPPort(ssrc);
        }
    }
@@ -48,11 +43,14 @@
            udpPortRangeArray[1] = Integer.parseInt(udpPortRangeStrArray[1]);
        }

        if (currentPort == 0 || currentPort ++ > udpPortRangeArray[1]) {
        if (currentPort == 0 || currentPort++ > udpPortRangeArray[1]) {
            currentPort = udpPortRangeArray[0];
            return udpPortRangeArray[0];
        }else {
            return currentPort ++;
        } else {
            if (currentPort % 2 == 1) {
                currentPort++;
            }
            return currentPort++;
        }
    }
}