Merge pull request #893 from sxh-netizen/wvp-28181-2.0

648540858

2023-06-20 fa62ab9a0143433a5d058ab3229a37e4a9a0f696

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -146,6 +146,11 @@
        builder.append(strTmp, 0, 2);

        strTmp = String.format("%02X", parameter2);

        builder.append(strTmp, 0, 2);

        //优化zoom变倍速率

        if ((combineCode2 > 0) && (combineCode2 <16))

        {

            combineCode2 = 16;

        }

        strTmp = String.format("%X", combineCode2);

        builder.append(strTmp, 0, 1).append("0");

        //计算校验码

@@ -261,7 +266,7 @@
     * @param errorEvent sip错误订阅

     */

    @Override

    public void playStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,

    public void playStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,boolean isSubStream,

                              ZlmHttpHookSubscribe.Event event, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {

        String stream = ssrcInfo.getStream();



@@ -336,6 +341,22 @@
            }

        }



        if( device.isSwitchPrimarySubStream() ){

            if("TP-LINK".equals(device.getManufacturer())){

                if (isSubStream){

                    content.append("a=streamMode:sub\r\n");

                }else {

                    content.append("a=streamMode:main\r\n");

                }

            }else {

                if (isSubStream){

                    content.append("a=streamprofile:1\r\n");

                }else {

                    content.append("a=streamprofile:0\r\n");

                }

            }

        }



        content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc

        // f字段:f= v/编码格式/分辨率/帧率/码率类型/码率大小a/编码格式/码率大小/采样率

//         content.append("f=v/2/5/25/1/4000a/1/8/1" + "\r\n"); // 未发现支持此特性的设备

@@ -351,7 +372,11 @@
            // 这里为例避免一个通道的点播只有一个callID这个参数使用一个固定值

            ResponseEvent responseEvent = (ResponseEvent) e.event;

            SIPResponse response = (SIPResponse) responseEvent.getResponse();

            streamSession.put(device.getDeviceId(), channelId, "play", stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), response, InviteSessionType.PLAY);

            if(device.isSwitchPrimarySubStream()){

                streamSession.put(device.getDeviceId(), channelId, "switch-play", stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), response, InviteSessionType.PLAY);

            }else {

                streamSession.put(device.getDeviceId(), channelId, "play", stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), response, InviteSessionType.PLAY);

            }

            okEvent.response(e);

        });

    }

@@ -447,7 +472,7 @@
            }

            subscribe.removeSubscribe(hookSubscribe);

        });

        Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()), ssrcInfo.getSsrc());

        Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()), ssrcInfo.getSsrc());



        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent, event -> {

            ResponseEvent responseEvent = (ResponseEvent) event.event;

@@ -563,17 +588,13 @@
                    });

        });



        Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null,newCallIdHeader, ssrcInfo.getSsrc());

        Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,newCallIdHeader, ssrcInfo.getSsrc());



        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent, event -> {

            ResponseEvent responseEvent = (ResponseEvent) event.event;

            SIPResponse response = (SIPResponse) responseEvent.getResponse();

            String contentString =new String(response.getRawContent());

            int ssrcIndex = contentString.indexOf("y=");

            String ssrc=ssrcInfo.getSsrc();

            if (ssrcIndex >= 0) {

                ssrc = contentString.substring(ssrcIndex + 2, ssrcIndex + 12);

            }

            String ssrc = SipUtils.getSsrcFromSdp(contentString);

            streamSession.put(device.getDeviceId(), channelId, response.getCallIdHeader().getCallId(), ssrcInfo.getStream(), ssrc, mediaServerItem.getId(), response, InviteSessionType.DOWNLOAD);

            okEvent.response(event);

        });