解决rtp包含多slice的情况

README.md

@@ -62,8 +62,8 @@ to submit your own plugin
 | Protocol | Pusher（push）-->Monibuca  |Source-->Monibuca（pull）|Monibuca-->Player（pull）|Monibuca（push）-->Other Server
 |---------| -------------|-------------| -------------|-------------|
 |rtmp|✔||✔|
-|rtsp|✔|✔|✔|
-|http-flv|||✔|
+|rtsp|✔|✔|✔|✔
+|http-flv||✔|✔|
 |hls||✔|✔|
 |ws-flv|||✔|
 |webrtc|✔||✔

config.toml

@@ -15,8 +15,8 @@ ListenAddr = ":1935"
 [GateWay]
 ListenAddr = ":8080"
 ListenAddrTLS = ":8082"
-CertFile = "server.crt"
-KeyFile = "server.pem"
+CertFile = "server.pem"
+KeyFile = "server.key"
 [Jessica]
 #ListenAddr = ":8081"
 #ListenAddrTLS = ":8083"
@@ -67,6 +67,8 @@ ListenAddr = ":554"
 Reconnect = true
 #启动后自动拉流，可以配置多个
 [RTSP.AutoPullList]
+# "live/rtsp" = "rtsp://114.116.215.52:38558/sub/3"
+# "live/rtsp" = "rtsp://admin:12345678ab@42.193.7.166:9514/11"
 # "live/rtc" = "rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mp4"
 # "live/rtsp" = "rtsp://admin:123456@42.193.7.166:9018/video1"
 [WebRTC]

go.mod

@@ -3,16 +3,16 @@ module github.com/langhuihui/monibuca
 go 1.16
 
 require (
-	github.com/Monibuca/engine/v3 v3.4.1
+	github.com/Monibuca/engine/v3 v3.4.2
 	github.com/Monibuca/plugin-gateway/v3 v3.0.7
 	github.com/Monibuca/plugin-gb28181/v3 v3.0.0
-	github.com/Monibuca/plugin-hdl/v3 v3.0.3
-	github.com/Monibuca/plugin-hls/v3 v3.0.2
+	github.com/Monibuca/plugin-hdl/v3 v3.0.5
+	github.com/Monibuca/plugin-hls/v3 v3.0.3
 	github.com/Monibuca/plugin-jessica/v3 v3.0.0-20210807235919-48ac5fbec646
 	github.com/Monibuca/plugin-logrotate/v3 v3.0.0-20210710104346-3db68431dcab
 	github.com/Monibuca/plugin-record/v3 v3.0.0-20210813073316-79dce1e0dc70
 	github.com/Monibuca/plugin-rtmp/v3 v3.0.0
-	github.com/Monibuca/plugin-rtsp/v3 v3.0.3
+	github.com/Monibuca/plugin-rtsp/v3 v3.0.6
 	github.com/Monibuca/plugin-summary v0.0.0-20210821070131-2261e0efb7b9
 	github.com/Monibuca/plugin-ts/v3 v3.0.0
 	github.com/Monibuca/plugin-webrtc/v3 v3.0.0

go.sum

@@ -6,18 +6,18 @@ github.com/Monibuca/engine/v3 v3.1.1/go.mod h1:yz6cssED2VlYu+g/LrxseBB9pcvsLM/o2
 github.com/Monibuca/engine/v3 v3.3.0/go.mod h1:odyqD/VTQDN4qgzajsgn7kW7MWDIzTHt+j+BcI8i+4g=
 github.com/Monibuca/engine/v3 v3.3.9/go.mod h1:odyqD/VTQDN4qgzajsgn7kW7MWDIzTHt+j+BcI8i+4g=
 github.com/Monibuca/engine/v3 v3.3.11/go.mod h1:LowMZ/iw4t6tfTZkSYZHIA0Z1HE8b7xfTDLO4WhX3Hg=
-github.com/Monibuca/engine/v3 v3.3.15/go.mod h1:LowMZ/iw4t6tfTZkSYZHIA0Z1HE8b7xfTDLO4WhX3Hg=
 github.com/Monibuca/engine/v3 v3.3.16/go.mod h1:rgAUey5ziRhlh6WugWyA5fYKyGOvcwhtTMDk4sukE7E=
-github.com/Monibuca/engine/v3 v3.4.1 h1:Ap2VbwTkMUkv80NPeUX2sNdV5Vz5nPVoU/6RU51PSAc=
 github.com/Monibuca/engine/v3 v3.4.1/go.mod h1:rgAUey5ziRhlh6WugWyA5fYKyGOvcwhtTMDk4sukE7E=
+github.com/Monibuca/engine/v3 v3.4.2 h1:nfUIK9pm3pYxiYxHwbXeFWH1RODG+VsWObqMdZwjv7Q=
+github.com/Monibuca/engine/v3 v3.4.2/go.mod h1:rgAUey5ziRhlh6WugWyA5fYKyGOvcwhtTMDk4sukE7E=
 github.com/Monibuca/plugin-gateway/v3 v3.0.7 h1:2/juy2G+ZmkYeB7XXP7lCPTnzPvHvE0rhkwowXcA9z4=
 github.com/Monibuca/plugin-gateway/v3 v3.0.7/go.mod h1:GPQDIll0o9+txwJ+ZwDcQTcR8rTE2SFZ/UbgmDKZTdg=
 github.com/Monibuca/plugin-gb28181/v3 v3.0.0 h1:o9a3Dnud7eoHwDF1cmwX6ipr4u4VW/1/9X0yzi1jQ9Q=
 github.com/Monibuca/plugin-gb28181/v3 v3.0.0/go.mod h1:foflXhJgzpYvMu3mlwQ/8JQ4ieo6RPSiubZ9t12FIbA=
-github.com/Monibuca/plugin-hdl/v3 v3.0.3 h1:2jxBKq1M4sbe/WBwfaDTRDgEy1ibCxlapcuBZhgoh/k=
-github.com/Monibuca/plugin-hdl/v3 v3.0.3/go.mod h1:ImBolaupuPvXGoWD5hOUUMvSPPuzrg2lzVWqhcXmdVA=
-github.com/Monibuca/plugin-hls/v3 v3.0.2 h1:pMpLDkPDbt9T7dBaXdyCoN+xeIA7XEELVirTN1bPdsE=
-github.com/Monibuca/plugin-hls/v3 v3.0.2/go.mod h1:gt+hWJLSeAaLy6d+bvd5D6YzTP6xJarm4fkBJ2kLHgM=
+github.com/Monibuca/plugin-hdl/v3 v3.0.5 h1:D7DO1a4wdNIQw5grcrSuIu2TMBTk7hTlNJjxEsMbvSE=
+github.com/Monibuca/plugin-hdl/v3 v3.0.5/go.mod h1:ImBolaupuPvXGoWD5hOUUMvSPPuzrg2lzVWqhcXmdVA=
+github.com/Monibuca/plugin-hls/v3 v3.0.3 h1:IWLY9TiHkbFPVuMIKkljZfIch1RUuRSAXXKnIdYom84=
+github.com/Monibuca/plugin-hls/v3 v3.0.3/go.mod h1:HRfFcEfpBZYrbtj4j46wLhYuAcZdTukzpw87CLf8FcE=
 github.com/Monibuca/plugin-jessica/v3 v3.0.0-20210807235919-48ac5fbec646 h1:wfge6Eakjoh+j6kRb8JlTazLWImWVbRqAVB/FlB4nHk=
 github.com/Monibuca/plugin-jessica/v3 v3.0.0-20210807235919-48ac5fbec646/go.mod h1:ycVTGh96OWFjzFfK7ErMcxTgohNZwagHRDab0GkTIFU=
 github.com/Monibuca/plugin-logrotate/v3 v3.0.0-20210710104346-3db68431dcab h1:s/yYXSOwXQxSdrPALlq8fHcdhtWnsM0RBPwAo2d+FOU=
@@ -26,8 +26,8 @@ github.com/Monibuca/plugin-record/v3 v3.0.0-20210813073316-79dce1e0dc70 h1:NO3NL
 github.com/Monibuca/plugin-record/v3 v3.0.0-20210813073316-79dce1e0dc70/go.mod h1:CusWmmgSjE1rRaGO9O06LOvXSpKilfiFgRsUlYHvFq0=
 github.com/Monibuca/plugin-rtmp/v3 v3.0.0 h1:sXO6ZQDuQFz+8AMlTkltThmLI0OOA2DEIeyeIWFFT3E=
 github.com/Monibuca/plugin-rtmp/v3 v3.0.0/go.mod h1:sDXF75JHXvZY4NjEe2raBmEF6RDvvOre9s1GKZvojjI=
-github.com/Monibuca/plugin-rtsp/v3 v3.0.3 h1:mLkCDheESJMmRSYrX5tzRE5vhvYqnJkvEh3TvMCBsA8=
-github.com/Monibuca/plugin-rtsp/v3 v3.0.3/go.mod h1:byXGE5BxFv0RpcoOjcQRt7B7mZvrgNuVpRn0kJtFIkU=
+github.com/Monibuca/plugin-rtsp/v3 v3.0.6 h1:gk8mozljwjv/gOWo7h+Q1oy4FiLn3GBm4Mz7awViNjE=
+github.com/Monibuca/plugin-rtsp/v3 v3.0.6/go.mod h1:byXGE5BxFv0RpcoOjcQRt7B7mZvrgNuVpRn0kJtFIkU=
 github.com/Monibuca/plugin-summary v0.0.0-20210821070131-2261e0efb7b9 h1:8JVquYo8PUQtc75vFa8ovPvsXSmU0N2twfD+8hOoZeM=
 github.com/Monibuca/plugin-summary v0.0.0-20210821070131-2261e0efb7b9/go.mod h1:1kiDXMF82y299q2+KKEeaKRpQFvVkiGAIGg8OhYk9Qk=
 github.com/Monibuca/plugin-ts/v3 v3.0.0 h1:W6A5onbEDKAxuewl46PJPippV5E3fu7UV6rK+Hq/q5s=

server.crt

@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDPTCCAiWgAwIBAgIUFnIxXBFC9OMqd2AB2+ZtSoy/P+swDQYJKoZIhvcNAQEL
-BQAwLjELMAkGA1UEBhMCQ0gxDDAKBgNVBAoMA203czERMA8GA1UEAwwIbW9uaWJ1
-Y2EwHhcNMjExMjExMDgyNzE3WhcNMjIwMTEwMDgyNzE3WjAuMQswCQYDVQQGEwJD
-SDEMMAoGA1UECgwDbTdzMREwDwYDVQQDDAhtb25pYnVjYTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALDGa4R44OYDkAtLPV5I2vgZf69T0/TNsets8i3b
-q/JKWAbROzqGyOeDhxEp6cyheY0NsNcaOhCnhGbGmtd5di4u/0UkaCeUv1qQMBZS
-3K5tEs7n9/sYV18Bqb+1zx+pJSi3/g1qXs7+IrFlXKUxKhNBcr1kzlEb0FwK40/2
-d7bTSTmEW3/m0mcDGo2ZIMnh8VFiUhX4NXFmJ0aWbWpbMtlhkFnCW4lrzlT78mej
-/2jrEqEkhrbhQJmCr9gv0AuyQhQ0S320ZenwNChZSi1kK1cL2iXHKbSMgN6W4PPn
-XmfH0cTT0miNw3WJvdrNqE1KJqNttOVH8qj52yZVserWGdsCAwEAAaNTMFEwHQYD
-VR0OBBYEFCB2Cb43kRRDf5TJkNWL3TkXdIm+MB8GA1UdIwQYMBaAFCB2Cb43kRRD
-f5TJkNWL3TkXdIm+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-AGN3WlRsx8HIgEvyyEHke0/dpm7Q1dDZ0fkOqsc/mG34psJbhcFJS5wq2P6phygN
-vc+NHS9mF2jVXdlx5aO5vO2KBh5KV2MuUoWj0uJL6oTvXaEBYT0i+vNCdVB/R0Lt
-vsroUnXyj7g0islrm2IbBcT8MT2wzXHHfkToiO+WotIW7eYuLCj0QXDbxUGHlq5O
-GNsDCSs1YF8uWlNe8QdAnZxLDKtpYnM9RMu77USG+RZ9OqSqNKSCQ0+XZFh2n7we
-XINPuxCwEUcm8LgS+AylovQdvxTUJ3KDve/9DgngbpZZKAMnTGL/8Q0VT2sAIfe+
-gFYY+/bcmraEr8xSfP+AhSw=
------END CERTIFICATE-----

server.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA9GfMG29OMywEVPWgQ0po9ItEamQtLr7Vo16FabJ4C/YyzGlD
+P48aJ5jcOazdVbVN9spndyk1fDBmO+tDkSw9nD2TI+GrXdEf/hDN3voTK5W2oZag
+1tVqjENprtTlk1JgzM3Cpe/CZJcBCjp040Dl6ccS9rkyFoYE1PsIkaottxV0iUoY
+WMVJtEt5FZQZ4Uu6RhlR0DKVGLq/V20F0cwvYmU4BaPigsKx/Azn8QNSaaePy947
+XPZn/he1JjNcqXp185ZGF7AvIbkJGCsH6YOnMhppidI/i4z5kE14dOXWnO2C6f6Z
+LN4X24JtTTIcjkQ/KSR0KLy8XHafseA55ztK2QIDAQABAoIBAQCeGU7lKFkzrPOY
+adOj88x09GnrUKYRqQzVw10WBIa3ZilyJV2FDfLjTnSXMoVy3fdy/3dyk8uvbDeV
+5xgsHqw0F3jJK0AJTjAdz4z9AlPIS+56FNAyaJel6C3DFKD1bcKEeU3CvZfILg5U
+KYBXSTHwygAwbZhDDaqugz0FzUoJNaoxLChdPLnpVat/WjWIvqnLJ6OMx9J0LdxK
+FsIw6OruiZEalQBJ5R/uhX6MasSUrnUuwloeuDNtEoyF67+Vuor0JtirN7HbaTFK
+IKx5tRKXtJNGy82G45He/qZeXENEF/02NN3JehX5hxZfH0BtRgoARgt+gVDP67SX
+tqrmcl8hAoGBAPnMVZQNmdsK8DT3GdTxBjMYEBa/PgTbX1MzLgcEjE/0l5ppBQmv
+n5ckXwGkVEM7DEbMBfV3GLMRsW/+Gu4VFXdvgGix7zylWmbWB5a+yxG+1HHPV5WI
+Yabi0vZf3Y7KIPooNxAwgeWKpLnDiPh4WvCm45i2oT27CxMkUX8JubRdAoGBAPp5
+MB7WPm9QN6U80Tg6RGz/YqVa3xhG65vrUesneK9N/SdTtb1z09r+Gat/DL+ACWfc
+f2p5JTPoRO1v7cpYYdmamTYXhxEec3+72j0WeGdiGsYVO48TepfN1IXw1U4W3tXY
+K4jBFgsjzLWW75DTSnKkT4th/dZT23oszLTR54itAoGAFxFLhdSLtLKZ5Ao9lHB9
+hhJeyfr3GzO25dQAGB3PZ0LLDTNNh8t0DV0KePhX362AQLlug3BwE3k6zYDFs962
+kMT3MrPbx9ntMznokX8k+YqJy8i96c0iV2ry2FWZ/CmmSfOUwiX4mN3owE7SQz+6
+BicjNWMIGM9BAo+EBxs6zvECgYEA4Qj6q+nvBFF8/S9MBgmLqqY0+b1QDV7Clj5x
+RiYbbt1R4gB6m3EyWWHMrGEkkfU1/iOEMqQPQbigHPdgHFkV6MzWdFvlFQNX395l
+8FZ87N2eknNHJH/qt/LMy14aNuOjZ1ulmWNpK68JX+jw6hx7mc54TRFIX0TOPtF7
+RcYFEK0CgYEAhJH+7qaiJkH8pdNJsIu+d4MSi7gTTJDeaplQJzjQqlMihCM+Vieu
+RWx+T4TTezcBp8gLhF9WjUEgcEqLRJaJ2qxZWnJtxROGcVqj202DciN27lpKyMJW
+Fz/anEaq6k7WsoFxCDNqSR4nP7kiR1EZlv1Y3Lh9j5eAvZfGMwma9Uk=
+-----END RSA PRIVATE KEY-----

server.pem

@@ -1,27 +1,23 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAsMZrhHjg5gOQC0s9Xkja+Bl/r1PT9M2x62zyLdur8kpYBtE7
-OobI54OHESnpzKF5jQ2w1xo6EKeEZsaa13l2Li7/RSRoJ5S/WpAwFlLcrm0Szuf3
-+xhXXwGpv7XPH6klKLf+DWpezv4isWVcpTEqE0FyvWTOURvQXArjT/Z3ttNJOYRb
-f+bSZwMajZkgyeHxUWJSFfg1cWYnRpZtalsy2WGQWcJbiWvOVPvyZ6P/aOsSoSSG
-tuFAmYKv2C/QC7JCFDRLfbRl6fA0KFlKLWQrVwvaJccptIyA3pbg8+deZ8fRxNPS
-aI3DdYm92s2oTUomo2205UfyqPnbJlWx6tYZ2wIDAQABAoIBAQCXWDmDAC6kHta7
-JJ6U01FNah9MTzu/cj/qbKrnIhSTapz0sTvBPtZQh+YihrzZakHzxo3pi1W9Hn6X
-s1+sLRxGLAx2+NWHVa2CbsIMysKPP2kD5cwEmPFssLLRJGoBFEJxGx2SBMjI9QFk
-2YA5Gd+I/taqWdzdyi9YLiYxNrWFuu98v2nEiPqkys9KCw/d2MLfJFUiRV51z/Wi
-8DxJ6BlJmEudHh8TFP38Id62q26qIosJoN28UBxwlrT1ZuP4te81W5jDLeIJMe3k
-wWLZ9J1ko1+MqSc3wPUcbYegkULkA4dRr+7oHXi2Wh6Gl3+VwWxSPqb+/5OZmu39
-YILgr4MpAoGBAOd/std1j1u9LBnumcFKlEWoRqE1F1nzfXXFDEBdxFCVwaRP8EYT
-Piazygv0Iev7O/hEz2Ma9LqOiiiSDzN3DYpD1571nJeuJgDtXKsZ9q3EE4RS14bH
-tv1DV8U3+S4LrWZBb+GZTiR+Otiqv1C7q4FZ3+qhU5kmhCZyz221rkNNAoGBAMN8
-BOftsc9u9BtGsmvoZ0SJzuNn6MLNlTOGgR9ylC1n+faEQyuWzN1W49Jv+d0zMhx2
-lf56blMczPLzFvb3bqEffuf8uPMB4KlAVAl7aR0LCgTSAbWQRdg5632CUdQLY8sY
-/sScqEJcXpBI2nXlGcGsJWXdFa0j6YmAbRyomG3HAoGAKIT6eanzCLyoznUr5mA2
-aabVjfvr9WugBxARX+bJqM09kpQHW0yc8UtAzyzRDyvvSDpLDm62bTzrw8Qk8v4g
-mZXcVM9qtEXgEwN41934hluuitexL78fMV8rKrLsY3nZxO8pNRSPT+XkSO5CBFCE
-6WQgxEGujzzlnpEz62EEenUCgYASttK5aVX2Z8bSvafjELKiKxc1SgNMcuXvsta1
-rgBlgGi7otnTWHJwVhslUDb5aCdJ9khRvmLFbiJot8DhD7r1jdBWYSlLikh5q4Dg
-D4J2l1H0OC6VtSQamSDkOQ+gXx7EmLX7GIw7HiCna3IOi0o18kb6Q3oJw0BeO382
-mSVOjQKBgDruvLIiaB7TPmti6z3U2yNHmn+7e0Ua7W2moy3l/rCVcgySBuw4Yjgs
-KC5ZbItx8xnV16K8LKfzWso76nmT7N3pPdNI+szzphDNyRe8vW5EaIF0fi4OZupP
-B7Hx5HGGjluRLWO4FjchYdjcD/nxhQtzCT4SvPn9KUxmRJ4c3lIz
------END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIID2DCCAsCgAwIBAgIQS3ina9KfQpGwnzf0oMQ/VDANBgkqhkiG9w0BAQsFADBe
+MQswCQYDVQQGEwJDTjEOMAwGA1UEChMFTXlTU0wxKzApBgNVBAsTIk15U1NMIFRl
+c3QgUlNBIC0gRm9yIHRlc3QgdXNlIG9ubHkxEjAQBgNVBAMTCU15U1NMLmNvbTAe
+Fw0yMTEyMjcxMzM5MzJaFw0yMjEyMjcxMzM5MzJaMCExCzAJBgNVBAYTAkNOMRIw
+EAYDVQQDEwlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQD0Z8wbb04zLARU9aBDSmj0i0RqZC0uvtWjXoVpsngL9jLMaUM/jxonmNw5rN1V
+tU32ymd3KTV8MGY760ORLD2cPZMj4atd0R/+EM3e+hMrlbahlqDW1WqMQ2mu1OWT
+UmDMzcKl78JklwEKOnTjQOXpxxL2uTIWhgTU+wiRqi23FXSJShhYxUm0S3kVlBnh
+S7pGGVHQMpUYur9XbQXRzC9iZTgFo+KCwrH8DOfxA1Jpp4/L3jtc9mf+F7UmM1yp
+enXzlkYXsC8huQkYKwfpg6cyGmmJ0j+LjPmQTXh05dac7YLp/pks3hfbgm1NMhyO
+RD8pJHQovLxcdp+x4DnnO0rZAgMBAAGjgc4wgcswDgYDVR0PAQH/BAQDAgWgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQogSYF0TQa
+P8FzD7uTzxUcPwO/fzBjBggrBgEFBQcBAQRXMFUwIQYIKwYBBQUHMAGGFWh0dHA6
+Ly9vY3NwLm15c3NsLmNvbTAwBggrBgEFBQcwAoYkaHR0cDovL2NhLm15c3NsLmNv
+bS9teXNzbHRlc3Ryc2EuY3J0MBQGA1UdEQQNMAuCCWxvY2FsaG9zdDANBgkqhkiG
+9w0BAQsFAAOCAQEAb/ZSwe0DS38TlVtxsueYMNWxfVzKA2WMzyabuRbsUMl8ja2Q
+GWVOpb1EyCF8nPYtbalrbm8BWFyW9+qDtkLmpMZaFKx4VqhjbQnpK3tJliea+9U3
+gtFKBVCinW81RnaET0A54Uy7ifrHWghBGjfXGfHx8bWMDYM2ksb5mC8BxPAueqnT
+3s0g1iP8vVNvpiDeHsjyB1WQwt/Uj79sKrgRU3ZKAvPvHd61Dl7IZSJAR78XyOqG
+DyF67ftWb+5EaXeT1gUy8dmdUIYfNhZFZYljwQa+DmTcO4dPzmSuvz4I1QGRyaSX
+bYb8T4bgcmvHeSUKuhB/5/O4lPLW0NaOiUqA0g==
+-----END CERTIFICATE-----