优化zoom低倍速下的变倍速率

shanyuanzz

2023-05-28 6d52e1539f6c33d5b625ff7fd56bccf8b76971b3

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

@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;



import com.alibaba.fastjson2.JSONObject;

import com.genersoft.iot.vmp.common.InviteSessionType;

import com.genersoft.iot.vmp.common.StreamInfo;

import com.genersoft.iot.vmp.conf.SipConfig;

import com.genersoft.iot.vmp.conf.UserSetting;

@@ -145,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");

        //计算校验码

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

            ResponseEvent responseEvent = (ResponseEvent) e.event;

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

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

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

            okEvent.response(e);

        });

    }

@@ -365,11 +371,11 @@
     */

    @Override

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

                                  String startTime, String endTime, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,

                                  String startTime, String endTime, ZlmHttpHookSubscribe.Event hookEvent,

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





        logger.info("{} 分配的ZLM为: {} [{}:{}]", ssrcInfo.getStream(), mediaServerItem.getSdpIp(), mediaServerItem.getIp(), ssrcInfo.getPort());

        logger.info("{} 分配的ZLM为: {} [{}:{}]", ssrcInfo.getStream(), mediaServerItem.getId(), mediaServerItem.getSdpIp(), ssrcInfo.getPort());

        String sdpIp;

        if (!ObjectUtils.isEmpty(device.getSdpIp())) {

            sdpIp = device.getSdpIp();

@@ -442,8 +448,7 @@
        // 添加订阅

        subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject json) -> {

            if (hookEvent != null) {

                InviteStreamInfo inviteStreamInfo = new InviteStreamInfo(mediaServerItemInUse, json,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()).getCallId(), "rtp", ssrcInfo.getStream());

                hookEvent.call(inviteStreamInfo);

                hookEvent.response(mediaServerItemInUse, json);

            }

            subscribe.removeSubscribe(hookSubscribe);

        });

@@ -452,12 +457,9 @@
        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent, event -> {

            ResponseEvent responseEvent = (ResponseEvent) event.event;

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

            streamSession.put(device.getDeviceId(), channelId,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()).getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), response, VideoStreamSessionManager.SessionType.playback);

            streamSession.put(device.getDeviceId(), channelId,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()).getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), response, InviteSessionType.PLAYBACK);

            okEvent.response(event);

        });

        if (inviteStreamCallback != null) {

            inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()).getCallId(), "rtp", ssrcInfo.getStream()));

        }

    }



    /**

@@ -472,10 +474,10 @@
    @Override

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

                                  String startTime, String endTime, int downloadSpeed,

                                  InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,

                                  ZlmHttpHookSubscribe.Event hookEvent,

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



        logger.info("{} 分配的ZLM为: {} [{}:{}]", ssrcInfo.getStream(), mediaServerItem.getSdpIp(), mediaServerItem.getIp(), ssrcInfo.getPort());

        logger.info("{} 分配的ZLM为: {} [{}:{}]", ssrcInfo.getStream(), mediaServerItem.getId(), mediaServerItem.getSdpIp(), ssrcInfo.getPort());

        String sdpIp;

        if (!ObjectUtils.isEmpty(device.getSdpIp())) {

            sdpIp = device.getSdpIp();

@@ -543,13 +545,13 @@


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

        logger.debug("此时请求下载信令的ssrc===>{}",ssrcInfo.getSsrc());

        HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, null, mediaServerItem.getId());

        HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, "rtsp", mediaServerItem.getId());

        // 添加订阅

        CallIdHeader newCallIdHeader = sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()), device.getTransport());

        String callId= newCallIdHeader.getCallId();

        subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject json) -> {

            logger.debug("sipc 添加订阅===callId {}",callId);

            hookEvent.call(new InviteStreamInfo(mediaServerItem, json,callId, "rtp", ssrcInfo.getStream()));

            hookEvent.response(mediaServerItemInUse, json);

            subscribe.removeSubscribe(hookSubscribe);

            hookSubscribe.getContent().put("regist", false);

            hookSubscribe.getContent().put("schema", "rtsp");

@@ -567,9 +569,6 @@
        });



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

        if (inviteStreamCallback != null) {

            inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null,callId, "rtp", ssrcInfo.getStream()));

        }



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

            ResponseEvent responseEvent = (ResponseEvent) event.event;

@@ -580,7 +579,7 @@
            if (ssrcIndex >= 0) {

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

            }

            streamSession.put(device.getDeviceId(), channelId, response.getCallIdHeader().getCallId(), ssrcInfo.getStream(), ssrc, mediaServerItem.getId(), response, VideoStreamSessionManager.SessionType.download);

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

            okEvent.response(event);

        });

    }