guzijian / wvp-GB28181-pro · Commits

Commit cfed8606679d62d709f2f394ad387c7296e1048f

Authored by 648540858
1 parent 66e67569

合并主线

Inline Side-by-side
Showing 6 changed files with 7 additions and 13 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
  View file @cfed860
... ... @@ -1024,7 +1024,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
1024 1024 AudioBroadcastResult audioBroadcastResult = new AudioBroadcastResult();
1025 1025 audioBroadcastResult.setApp(app);
1026 1026 audioBroadcastResult.setStream(stream);
1027   - audioBroadcastResult.setStreamInfo(mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, stream, null, null, false));
  1027 + audioBroadcastResult.setStreamInfo(mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, stream, null, null, null,false));
1028 1028 audioBroadcastResult.setCodec("G.711");
1029 1029 wvpResult.setData(audioBroadcastResult);
1030 1030 RequestMessage requestMessage = new RequestMessage();
... ...
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
  View file @cfed860
... ... @@ -200,7 +200,7 @@ public class ZLMHttpHookListener {
200 200  
201 201 logger.info("[ ZLM HOOK ]on_publish API调用，参数：" + json.toString());
202 202 JSONObject ret = new JSONObject();
203   - if (!"rtp".equals(param.getApp())) {
  203 + if (!"rtp".equals(param.getApp()) && !"broadcast".equals(param.getApp())) {
204 204 // 推流鉴权
205 205 if (param.getParams() == null) {
206 206 logger.info("推流鉴权失败： 缺少不要参数：sign=md5(user表的pushKey)");
... ...
src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
  View file @cfed860
... ... @@ -40,6 +40,5 @@ public interface IMediaService {
40 40 * @param stream
41 41 * @return
42 42 */
43   - StreamInfo getStreamInfoByAppAndStream(MediaServerItem mediaInfo, String app, String stream, Object tracks, String addr, String callId);
44   - StreamInfo getStreamInfoByAppAndStream(MediaServerItem mediaInfo, String app, String stream, Object tracks, String addr, boolean isPlay);
  43 + StreamInfo getStreamInfoByAppAndStream(MediaServerItem mediaInfo, String app, String stream, Object tracks, String addr, String callId, boolean isPlay);
45 44 }
... ...
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
  View file @cfed860
... ... @@ -517,7 +517,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
517 517 param.put("general.continue_push_ms", "3000" );
518 518 // 最多等待未初始化的Track时间，单位毫秒，超时之后会忽略未初始化的Track, 设置此选项优化那些音频错误的不规范流，
519 519 // 等zlm支持给每个rtpServer设置关闭音频的时候可以不设置此选项
520   - param.put("general.wait_track_ready_ms", "3000" );
  520 +// param.put("general.wait_track_ready_ms", "3000" );
521 521 if (mediaServerItem.isRtpEnable() && !StringUtils.isEmpty(mediaServerItem.getRtpPortRange())) {
522 522 param.put("rtp_proxy.port_range", mediaServerItem.getRtpPortRange().replace(",", "-"));
523 523 }
... ...
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
  View file @cfed860
... ... @@ -40,7 +40,7 @@ public class MediaServiceImpl implements IMediaService {
40 40  
41 41 @Override
42 42 public StreamInfo getStreamInfoByAppAndStream(MediaServerItem mediaInfo, String app, String stream, Object tracks, String callId) {
43   - return getStreamInfoByAppAndStream(mediaInfo, app, stream, tracks, null, callId);
  43 + return getStreamInfoByAppAndStream(mediaInfo, app, stream, tracks, null, callId, true);
44 44 }
45 45  
46 46 @Override
... ... @@ -67,7 +67,7 @@ public class MediaServiceImpl implements IMediaService {
67 67 JSONObject mediaJSON = JSON.parseObject(JSON.toJSONString(data.get(0)), JSONObject.class);
68 68 JSONArray tracks = mediaJSON.getJSONArray("tracks");
69 69 if (authority) {
70   - streamInfo = getStreamInfoByAppAndStream(mediaInfo, app, stream, tracks, streamAuthorityInfo.getCallId());
  70 + streamInfo = getStreamInfoByAppAndStream(mediaInfo, app, stream, tracks, null, streamAuthorityInfo.getCallId(), true);
71 71 }else {
72 72 streamInfo = getStreamInfoByAppAndStream(mediaInfo, app, stream, tracks, null);
73 73 }
... ... @@ -85,11 +85,6 @@ public class MediaServiceImpl implements IMediaService {
85 85 }
86 86  
87 87 @Override
88   - public StreamInfo getStreamInfoByAppAndStream(MediaServerItem mediaInfo, String app, String stream, Object tracks, String addr) {
89   - return getStreamInfoByAppAndStream(mediaInfo, app, stream, tracks, addr, true);
90   - }
91   -
92   - @Override
93 88 public StreamInfo getStreamInfoByAppAndStream(MediaServerItem mediaInfo, String app, String stream, Object tracks, String addr, String callId, boolean isPlay) {
94 89 StreamInfo streamInfoResult = new StreamInfo();
95 90 streamInfoResult.setStream(stream);
... ...
web_src/src/components/dialog/devicePlayer.vue
  View file @cfed860
... ... @@ -915,7 +915,7 @@ export default {
915 915 this.broadcastStatus = 0;
916 916 }else if (e === "connected") {
917 917 this.broadcastStatus = 1;
918   - }else {
  918 + }else if (e === "disconnected") {
919 919 this.broadcastStatus = -1;
920 920 }
921 921 });
... ...