Merge pull request #12 from lawrencehj/master

648540858

2020-12-17 288059eecd5af4722841b1b1ac0d9131a1f02545

Merge pull request #12 from lawrencehj/master

修正转码播放重复回调的错误

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

@@ -88,9 +88,6 @@
        viaHeader.setRPort();

        viaHeaders.add(viaHeader);



        viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);

        viaHeader.setRPort();

        viaHeaders.add(viaHeader);

        //from

        SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(),sipConfig.getSipDomain());

        Address fromAddress = sipFactory.createAddressFactory().createAddress(fromSipURI);


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

@@ -384,16 +384,22 @@
            }

            String streamMode = device.getStreamMode().toUpperCase();

            if("TCP-PASSIVE".equals(streamMode)) {

                content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n");

                content.append("m=video "+ mediaPort +" TCP/RTP/AVP 126 125 99 34 98 97 96\r\n");

            }else if ("TCP-ACTIVE".equals(streamMode)) {

                content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n");

                content.append("m=video "+ mediaPort +" TCP/RTP/AVP 126 125 99 34 98 97 96\r\n");

            }else if("UDP".equals(streamMode)) {

                content.append("m=video "+ mediaPort +" RTP/AVP 96 98 97\r\n");

                content.append("m=video "+ mediaPort +" RTP/AVP 126 125 99 34 98 97 96\r\n");

            }

            content.append("a=recvonly\r\n");

            content.append("a=rtpmap:96 PS/90000\r\n");

            content.append("a=rtpmap:98 H264/90000\r\n");

            content.append("a=rtpmap:97 MPEG4/90000\r\n");

            content.append("a=recvonly\r\n");

            content.append("a=fmtp:126 profile-level-id=42e01e\r\n");

            content.append("a=rtpmap:126 H264/90000\r\n");

            content.append("a=rtpmap:125 H264S/90000\r\n");

            content.append("a=fmtp:125 profile-level-id=42e01e\r\n");

            content.append("a=rtpmap:99 MP4V-ES/90000\r\n");

            content.append("a=fmtp:99 profile-level-id=3\r\n");

            content.append("a=rtpmap:98 H264/90000\r\n");

            content.append("a=rtpmap:97 MPEG4/90000\r\n");

            content.append("a=rtpmap:96 PS/90000\r\n");

            if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式

                content.append("a=setup:passive\r\n");

                content.append("a=connection:new\r\n");


 web_src/src/components/gb28181/devicePlayer.vue

@@ -296,7 +296,7 @@
              }).catch(function (e) {});
            that.coverPlaying = false;
            that.convertKey = "";
            if (callback )callback();
            // if (callback )callback();
        },

        playFromStreamInfo: function (realHasAudio, streamInfo) {
@@ -306,7 +306,7 @@
        },
        close: function () {
            console.log('关闭视频');
            if (!this.$refs.videoPlayer){
            if (!!this.$refs.videoPlayer){
              this.$refs.videoPlayer.pause();
            }
            this.videoUrl = '';