diff --git a/codec/flv.go b/codec/flv.go index 6bd0f30..4656de6 100644 --- a/codec/flv.go +++ b/codec/flv.go @@ -4,7 +4,7 @@ import ( "io" "net" - "github.com/Monibuca/engine/v4/util" + "v4.m7s.live/engine/util" ) const ( diff --git a/codec/h264.go b/codec/h264.go index b66fae6..347d12f 100644 --- a/codec/h264.go +++ b/codec/h264.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/Monibuca/engine/v4/util" - "github.com/Monibuca/engine/v4/util/bits/pio" + "v4.m7s.live/engine/util" + "v4.m7s.live/engine/util/bits/pio" ) // Start Code + NAL Unit -> NALU Header + NALU Body diff --git a/codec/h265.go b/codec/h265.go index caebc71..27eb039 100644 --- a/codec/h265.go +++ b/codec/h265.go @@ -4,8 +4,8 @@ import ( "bytes" "errors" - "github.com/Monibuca/engine/v4/util" "github.com/q191201771/naza/pkg/nazabits" + "v4.m7s.live/engine/util" ) type H265NALUType byte diff --git a/codec/mp4.go b/codec/mp4.go index 8ac326a..aa2b948 100644 --- a/codec/mp4.go +++ b/codec/mp4.go @@ -1,6 +1,6 @@ package codec -import "github.com/Monibuca/engine/v4/util" +import "v4.m7s.live/engine/util" type MP4 interface { } diff --git a/codec/mpegts/mpegts.go b/codec/mpegts/mpegts.go index 67af318..ffdccc2 100644 --- a/codec/mpegts/mpegts.go +++ b/codec/mpegts/mpegts.go @@ -6,7 +6,7 @@ import ( "io" "io/ioutil" - "github.com/Monibuca/engine/v4/util" + "v4.m7s.live/engine/util" //"sync" ) diff --git a/codec/mpegts/mpegts_pat.go b/codec/mpegts/mpegts_pat.go index cb464a9..f53fe18 100644 --- a/codec/mpegts/mpegts_pat.go +++ b/codec/mpegts/mpegts_pat.go @@ -4,8 +4,9 @@ import ( "bytes" "errors" "fmt" - "github.com/Monibuca/engine/v4/util" "io" + + "v4.m7s.live/engine/util" ) // ios13818-1-CN.pdf 43(57)/166 diff --git a/codec/mpegts/mpegts_pes.go b/codec/mpegts/mpegts_pes.go index 510babc..178a1fd 100644 --- a/codec/mpegts/mpegts_pes.go +++ b/codec/mpegts/mpegts_pes.go @@ -7,8 +7,8 @@ import ( "io" "io/ioutil" - "github.com/Monibuca/engine/v4/codec" - "github.com/Monibuca/engine/v4/util" + "v4.m7s.live/engine/codec" + "v4.m7s.live/engine/util" ) // ios13818-1-CN.pdf 45/166 diff --git a/codec/mpegts/mpegts_pmt.go b/codec/mpegts/mpegts_pmt.go index 6207f68..9c5e48f 100644 --- a/codec/mpegts/mpegts_pmt.go +++ b/codec/mpegts/mpegts_pmt.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/Monibuca/engine/v4/util" + "v4.m7s.live/engine/util" ) // ios13818-1-CN.pdf 46(60)-153(167)/page diff --git a/codec/mpegts/mpegts_psi.go b/codec/mpegts/mpegts_psi.go index c93fcba..5ae7d41 100644 --- a/codec/mpegts/mpegts_psi.go +++ b/codec/mpegts/mpegts_psi.go @@ -3,9 +3,10 @@ package mpegts import ( "errors" "fmt" - "github.com/Monibuca/engine/v4/util" "io" "io/ioutil" + + "v4.m7s.live/engine/util" ) // diff --git a/codec/sps.go b/codec/sps.go index 32b50f4..feba4f5 100644 --- a/codec/sps.go +++ b/codec/sps.go @@ -5,7 +5,7 @@ import ( "github.com/cnotch/ipchub/av/codec/hevc" - "github.com/Monibuca/engine/v4/util/bits" + "v4.m7s.live/engine/util/bits" ) type SPSInfo struct { diff --git a/common/frame.go b/common/frame.go index 3a309c8..1613600 100644 --- a/common/frame.go +++ b/common/frame.go @@ -4,9 +4,9 @@ import ( "net" "time" - "github.com/Monibuca/engine/v4/codec" - "github.com/Monibuca/engine/v4/log" "github.com/pion/rtp" + "v4.m7s.live/engine/codec" + "v4.m7s.live/engine/log" ) type NALUSlice net.Buffers @@ -197,4 +197,4 @@ type DecoderConfiguration[T RawSlice] struct { AVCC net.Buffers Raw T FLV net.Buffers -} \ No newline at end of file +} diff --git a/common/ring.go b/common/ring.go index 7d5d69b..dec8393 100644 --- a/common/ring.go +++ b/common/ring.go @@ -1,7 +1,7 @@ package common import ( - "github.com/Monibuca/engine/v4/util" + "v4.m7s.live/engine/util" ) type RingBuffer[T any] struct { diff --git a/common/stream.go b/common/stream.go index 68b2d8f..04e8af3 100644 --- a/common/stream.go +++ b/common/stream.go @@ -1,7 +1,7 @@ package common import ( - "github.com/Monibuca/engine/v4/log" + "v4.m7s.live/engine/log" ) type IStream interface { diff --git a/config/config.go b/config/config.go index 59af9fa..a4fac16 100644 --- a/config/config.go +++ b/config/config.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/Monibuca/engine/v4/log" "go.uber.org/zap" + "v4.m7s.live/engine/log" ) type Config map[string]any diff --git a/config/tcp.go b/config/tcp.go index d40e704..001b5f0 100644 --- a/config/tcp.go +++ b/config/tcp.go @@ -1,11 +1,12 @@ package config import ( - "github.com/Monibuca/engine/v4/log" "context" "net" "runtime" "time" + + "v4.m7s.live/engine/log" ) type TCP struct { diff --git a/data_track.go b/data_track.go index 8298d99..2ee5a97 100644 --- a/data_track.go +++ b/data_track.go @@ -5,7 +5,7 @@ package engine // "time" // "unsafe" -// "github.com/Monibuca/engine/v4/util" +// "v4.m7s.live/engine/util" // ) // type DataTrack struct { diff --git a/go.mod b/go.mod index 1aab1d5..00a4157 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module v4.m7s.live/engine +module v4.m7s.live/engine go 1.18 diff --git a/http.go b/http.go index 8925f06..0693594 100644 --- a/http.go +++ b/http.go @@ -4,10 +4,10 @@ import ( "encoding/json" "net/http" - "github.com/Monibuca/engine/v4/config" - "github.com/Monibuca/engine/v4/log" . "github.com/logrusorgru/aurora" "go.uber.org/zap" + "v4.m7s.live/engine/config" + "v4.m7s.live/engine/log" ) type GlobalConfig struct { diff --git a/io.go b/io.go index c795aae..68f6204 100644 --- a/io.go +++ b/io.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/Monibuca/engine/v4/config" - "github.com/Monibuca/engine/v4/util" "go.uber.org/zap" + "v4.m7s.live/engine/config" + "v4.m7s.live/engine/util" ) type IOConfig interface { diff --git a/main.go b/main.go index fc02f9c..7d4b188 100644 --- a/main.go +++ b/main.go @@ -1,4 +1,4 @@ -package engine +package engine // import "v4.m7s.live/engine" import ( "bytes" @@ -12,13 +12,13 @@ import ( "runtime" "time" - "github.com/Monibuca/engine/v4/config" - "github.com/Monibuca/engine/v4/log" - "github.com/Monibuca/engine/v4/util" "github.com/google/uuid" . "github.com/logrusorgru/aurora" "go.uber.org/zap" "gopkg.in/yaml.v3" + "v4.m7s.live/engine/config" + "v4.m7s.live/engine/log" + "v4.m7s.live/engine/util" ) var ( diff --git a/plugin.go b/plugin.go index 5f0b4b9..d81f5b9 100644 --- a/plugin.go +++ b/plugin.go @@ -10,11 +10,11 @@ import ( "runtime" "strings" - "github.com/Monibuca/engine/v4/config" - "github.com/Monibuca/engine/v4/log" - "github.com/Monibuca/engine/v4/util" "go.uber.org/zap" "gopkg.in/yaml.v3" + "v4.m7s.live/engine/config" + "v4.m7s.live/engine/log" + "v4.m7s.live/engine/util" ) // InstallPlugin 安装插件,传入插件配置生成插件信息对象 diff --git a/publisher.go b/publisher.go index 6ecbcee..c9a41bc 100644 --- a/publisher.go +++ b/publisher.go @@ -1,8 +1,8 @@ package engine import ( - "github.com/Monibuca/engine/v4/common" - "github.com/Monibuca/engine/v4/config" + "v4.m7s.live/engine/common" + "v4.m7s.live/engine/config" ) type IPublisher interface { diff --git a/stream.go b/stream.go index 9b530da..029598e 100644 --- a/stream.go +++ b/stream.go @@ -5,12 +5,12 @@ import ( "time" "unsafe" - . "github.com/Monibuca/engine/v4/common" - "github.com/Monibuca/engine/v4/log" - "github.com/Monibuca/engine/v4/track" - "github.com/Monibuca/engine/v4/util" . "github.com/logrusorgru/aurora" "go.uber.org/zap" + . "v4.m7s.live/engine/common" + "v4.m7s.live/engine/log" + "v4.m7s.live/engine/track" + "v4.m7s.live/engine/util" ) type StreamState byte diff --git a/subscriber.go b/subscriber.go index b9e5e45..45b4a5c 100644 --- a/subscriber.go +++ b/subscriber.go @@ -5,10 +5,10 @@ import ( "net" "time" - . "github.com/Monibuca/engine/v4/common" - "github.com/Monibuca/engine/v4/config" - "github.com/Monibuca/engine/v4/track" "go.uber.org/zap" + . "v4.m7s.live/engine/common" + "v4.m7s.live/engine/config" + "v4.m7s.live/engine/track" ) type HaveFLV interface { diff --git a/track/aac.go b/track/aac.go index 71972ff..e97c3aa 100644 --- a/track/aac.go +++ b/track/aac.go @@ -4,10 +4,10 @@ import ( "net" "time" - "github.com/Monibuca/engine/v4/codec" - . "github.com/Monibuca/engine/v4/common" - "github.com/Monibuca/engine/v4/config" - "github.com/Monibuca/engine/v4/util" + "v4.m7s.live/engine/codec" + . "v4.m7s.live/engine/common" + "v4.m7s.live/engine/config" + "v4.m7s.live/engine/util" ) func NewAAC(stream IStream) (aac *AAC) { diff --git a/track/audio.go b/track/audio.go index 036f7cc..1f76f2d 100644 --- a/track/audio.go +++ b/track/audio.go @@ -3,10 +3,10 @@ package track import ( "net" - "github.com/Monibuca/engine/v4/codec" - . "github.com/Monibuca/engine/v4/common" - "github.com/Monibuca/engine/v4/config" "go.uber.org/zap" + "v4.m7s.live/engine/codec" + . "v4.m7s.live/engine/common" + "v4.m7s.live/engine/config" ) var adcflv1 = []byte{codec.FLV_TAG_TYPE_AUDIO, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0} diff --git a/track/base.go b/track/base.go index 51ded00..084b4d4 100644 --- a/track/base.go +++ b/track/base.go @@ -4,10 +4,10 @@ import ( "context" "time" - . "github.com/Monibuca/engine/v4/common" - "github.com/Monibuca/engine/v4/config" - "github.com/Monibuca/engine/v4/util" "github.com/pion/rtp" + . "v4.m7s.live/engine/common" + "v4.m7s.live/engine/config" + "v4.m7s.live/engine/util" ) // Base 基础Track类 @@ -89,7 +89,7 @@ func (av *Media[T]) UnmarshalRTP(raw []byte) (frame *RTPFrame) { return } if config.Global.RTPReorder { - if frame.SequenceNumber < av.lastSeq && av.lastSeq - frame.SequenceNumber < 0x8000 { + if frame.SequenceNumber < av.lastSeq && av.lastSeq-frame.SequenceNumber < 0x8000 { // 出现旧的包直接丢弃 return nil } else if av.lastSeq == 0 { diff --git a/track/g711.go b/track/g711.go index ce07ab4..371de89 100644 --- a/track/g711.go +++ b/track/g711.go @@ -3,9 +3,9 @@ package track import ( "time" - "github.com/Monibuca/engine/v4/codec" - . "github.com/Monibuca/engine/v4/common" - "github.com/Monibuca/engine/v4/config" + "v4.m7s.live/engine/codec" + . "v4.m7s.live/engine/common" + "v4.m7s.live/engine/config" ) func NewG711(stream IStream, alaw bool) (g711 *G711) { diff --git a/track/h264.go b/track/h264.go index 344575b..778e0d4 100644 --- a/track/h264.go +++ b/track/h264.go @@ -4,10 +4,10 @@ import ( "net" "time" - "github.com/Monibuca/engine/v4/codec" - . "github.com/Monibuca/engine/v4/common" - "github.com/Monibuca/engine/v4/config" - "github.com/Monibuca/engine/v4/util" + "v4.m7s.live/engine/codec" + . "v4.m7s.live/engine/common" + "v4.m7s.live/engine/config" + "v4.m7s.live/engine/util" ) type H264 struct { diff --git a/track/h265.go b/track/h265.go index 19322c6..7924f48 100644 --- a/track/h265.go +++ b/track/h265.go @@ -4,10 +4,10 @@ import ( "net" "time" - "github.com/Monibuca/engine/v4/codec" - . "github.com/Monibuca/engine/v4/common" - "github.com/Monibuca/engine/v4/config" - "github.com/Monibuca/engine/v4/util" + "v4.m7s.live/engine/codec" + . "v4.m7s.live/engine/common" + "v4.m7s.live/engine/config" + "v4.m7s.live/engine/util" ) type H265 struct { diff --git a/track/video.go b/track/video.go index 97c5d69..cd36b57 100644 --- a/track/video.go +++ b/track/video.go @@ -4,12 +4,12 @@ import ( "bytes" "net" - "github.com/Monibuca/engine/v4/codec" - . "github.com/Monibuca/engine/v4/common" - "github.com/Monibuca/engine/v4/config" - "github.com/Monibuca/engine/v4/util" . "github.com/logrusorgru/aurora" "go.uber.org/zap" + "v4.m7s.live/engine/codec" + . "v4.m7s.live/engine/common" + "v4.m7s.live/engine/config" + "v4.m7s.live/engine/util" ) type Video struct { diff --git a/util/socket.go b/util/socket.go index 5cd169c..210a86d 100644 --- a/util/socket.go +++ b/util/socket.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/Monibuca/engine/v4/log" + "v4.m7s.live/engine/log" ) type TCPListener interface {