Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-13 9e09755ef054d6455e94ed4a68d60f231d8e944a

 src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java

@@ -39,8 +39,6 @@
    @Autowired
    private IRedisCatchStorage redisCatchStorage;

    private boolean closeWaitRTPInfo = false;


    @Autowired
    private ZLMRESTfulUtils zlmresTfulUtils;
@@ -170,6 +168,7 @@
        }
        cmder.streamByeCmd(streamInfo.getStreamId());
        redisCatchStorage.stopPlay(streamInfo);
        storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
        return null;
    }