Merge pull request #1747 from QianNangong/master

修复上级点播国标级联的拉流代理相机,当流上线很慢时,收到来自上级的 ACK 早于流注册导致推流失败的问题
This commit is contained in:
648540858
2025-01-11 20:32:40 +08:00
committed by GitHub
3 changed files with 64 additions and 6 deletions

View File

@@ -129,12 +129,7 @@ public class GbChannelPlayServiceImpl implements IGbChannelPlayService {
public void playProxy(CommonGBChannel channel, ErrorCallback<StreamInfo> callback){
// 拉流代理通道
try {
StreamInfo streamInfo = streamProxyPlayService.start(channel.getDataDeviceId());
if (streamInfo == null) {
callback.run(Response.BUSY_HERE, "busy here", null);
}else {
callback.run(InviteErrorCode.SUCCESS.getCode(), InviteErrorCode.SUCCESS.getMsg(), streamInfo);
}
streamProxyPlayService.start(channel.getDataDeviceId(), callback);
}catch (Exception e) {
callback.run(Response.BUSY_HERE, "busy here", null);
}