diff --git a/codec/flv.go b/codec/flv.go index 4656de6..ec38cf5 100644 --- a/codec/flv.go +++ b/codec/flv.go @@ -4,7 +4,7 @@ import ( "io" "net" - "v4.m7s.live/engine/util" + "m7s.live/engine/v4/util" ) const ( diff --git a/codec/h264.go b/codec/h264.go index 347d12f..6f15672 100644 --- a/codec/h264.go +++ b/codec/h264.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "v4.m7s.live/engine/util" - "v4.m7s.live/engine/util/bits/pio" + "m7s.live/engine/v4/util" + "m7s.live/engine/v4/util/bits/pio" ) // Start Code + NAL Unit -> NALU Header + NALU Body diff --git a/codec/h265.go b/codec/h265.go index 27eb039..67ea156 100644 --- a/codec/h265.go +++ b/codec/h265.go @@ -5,7 +5,7 @@ import ( "errors" "github.com/q191201771/naza/pkg/nazabits" - "v4.m7s.live/engine/util" + "m7s.live/engine/v4/util" ) type H265NALUType byte diff --git a/codec/mp4.go b/codec/mp4.go index aa2b948..e3be500 100644 --- a/codec/mp4.go +++ b/codec/mp4.go @@ -1,6 +1,6 @@ package codec -import "v4.m7s.live/engine/util" +import "m7s.live/engine/v4/util" type MP4 interface { } diff --git a/codec/mpegts/mpegts.go b/codec/mpegts/mpegts.go index ffdccc2..ec6efe9 100644 --- a/codec/mpegts/mpegts.go +++ b/codec/mpegts/mpegts.go @@ -6,7 +6,7 @@ import ( "io" "io/ioutil" - "v4.m7s.live/engine/util" + "m7s.live/engine/v4/util" //"sync" ) diff --git a/codec/mpegts/mpegts_pat.go b/codec/mpegts/mpegts_pat.go index f53fe18..c377746 100644 --- a/codec/mpegts/mpegts_pat.go +++ b/codec/mpegts/mpegts_pat.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "v4.m7s.live/engine/util" + "m7s.live/engine/v4/util" ) // ios13818-1-CN.pdf 43(57)/166 diff --git a/codec/mpegts/mpegts_pes.go b/codec/mpegts/mpegts_pes.go index 178a1fd..cc223f8 100644 --- a/codec/mpegts/mpegts_pes.go +++ b/codec/mpegts/mpegts_pes.go @@ -7,8 +7,8 @@ import ( "io" "io/ioutil" - "v4.m7s.live/engine/codec" - "v4.m7s.live/engine/util" + "m7s.live/engine/v4/codec" + "m7s.live/engine/v4/util" ) // ios13818-1-CN.pdf 45/166 diff --git a/codec/mpegts/mpegts_pmt.go b/codec/mpegts/mpegts_pmt.go index 9c5e48f..1475e39 100644 --- a/codec/mpegts/mpegts_pmt.go +++ b/codec/mpegts/mpegts_pmt.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "v4.m7s.live/engine/util" + "m7s.live/engine/v4/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 5ae7d41..a477cdf 100644 --- a/codec/mpegts/mpegts_psi.go +++ b/codec/mpegts/mpegts_psi.go @@ -6,7 +6,7 @@ import ( "io" "io/ioutil" - "v4.m7s.live/engine/util" + "m7s.live/engine/v4/util" ) // diff --git a/codec/sps.go b/codec/sps.go index feba4f5..ea7f3e4 100644 --- a/codec/sps.go +++ b/codec/sps.go @@ -5,7 +5,7 @@ import ( "github.com/cnotch/ipchub/av/codec/hevc" - "v4.m7s.live/engine/util/bits" + "m7s.live/engine/v4/util/bits" ) type SPSInfo struct { diff --git a/common/frame.go b/common/frame.go index 1613600..4d13285 100644 --- a/common/frame.go +++ b/common/frame.go @@ -5,8 +5,8 @@ import ( "time" "github.com/pion/rtp" - "v4.m7s.live/engine/codec" - "v4.m7s.live/engine/log" + "m7s.live/engine/v4/codec" + "m7s.live/engine/v4/log" ) type NALUSlice net.Buffers diff --git a/common/ring.go b/common/ring.go index dec8393..49fd810 100644 --- a/common/ring.go +++ b/common/ring.go @@ -1,7 +1,7 @@ package common import ( - "v4.m7s.live/engine/util" + "m7s.live/engine/v4/util" ) type RingBuffer[T any] struct { diff --git a/common/stream.go b/common/stream.go index 04e8af3..56a3a05 100644 --- a/common/stream.go +++ b/common/stream.go @@ -1,7 +1,7 @@ package common import ( - "v4.m7s.live/engine/log" + "m7s.live/engine/v4/log" ) type IStream interface { diff --git a/config/config.go b/config/config.go index a4fac16..c434fea 100644 --- a/config/config.go +++ b/config/config.go @@ -8,7 +8,7 @@ import ( "time" "go.uber.org/zap" - "v4.m7s.live/engine/log" + "m7s.live/engine/v4/log" ) type Config map[string]any diff --git a/config/tcp.go b/config/tcp.go index 001b5f0..931686d 100644 --- a/config/tcp.go +++ b/config/tcp.go @@ -6,7 +6,7 @@ import ( "runtime" "time" - "v4.m7s.live/engine/log" + "m7s.live/engine/v4/log" ) type TCP struct { diff --git a/data_track.go b/data_track.go index 2ee5a97..b9c2c21 100644 --- a/data_track.go +++ b/data_track.go @@ -5,7 +5,7 @@ package engine // "time" // "unsafe" -// "v4.m7s.live/engine/util" +// "m7s.live/engine/v4/util" // ) // type DataTrack struct { diff --git a/go.mod b/go.mod index 00a4157..ef88ca2 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module v4.m7s.live/engine +module m7s.live/engine/v4 go 1.18 diff --git a/http.go b/http.go index 0693594..ffa4e91 100644 --- a/http.go +++ b/http.go @@ -6,8 +6,8 @@ import ( . "github.com/logrusorgru/aurora" "go.uber.org/zap" - "v4.m7s.live/engine/config" - "v4.m7s.live/engine/log" + "m7s.live/engine/v4/config" + "m7s.live/engine/v4/log" ) type GlobalConfig struct { diff --git a/io.go b/io.go index 68f6204..b20f41b 100644 --- a/io.go +++ b/io.go @@ -10,8 +10,8 @@ import ( "time" "go.uber.org/zap" - "v4.m7s.live/engine/config" - "v4.m7s.live/engine/util" + "m7s.live/engine/v4/config" + "m7s.live/engine/v4/util" ) type IOConfig interface { diff --git a/main.go b/main.go index 7d4b188..23bb5b3 100644 --- a/main.go +++ b/main.go @@ -1,4 +1,4 @@ -package engine // import "v4.m7s.live/engine" +package engine // import "m7s.live/engine/v4" import ( "bytes" @@ -16,9 +16,9 @@ import ( . "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" + "m7s.live/engine/v4/config" + "m7s.live/engine/v4/log" + "m7s.live/engine/v4/util" ) var ( diff --git a/plugin.go b/plugin.go index d81f5b9..8e444c0 100644 --- a/plugin.go +++ b/plugin.go @@ -12,9 +12,9 @@ import ( "go.uber.org/zap" "gopkg.in/yaml.v3" - "v4.m7s.live/engine/config" - "v4.m7s.live/engine/log" - "v4.m7s.live/engine/util" + "m7s.live/engine/v4/config" + "m7s.live/engine/v4/log" + "m7s.live/engine/v4/util" ) // InstallPlugin 安装插件,传入插件配置生成插件信息对象 diff --git a/publisher.go b/publisher.go index c9a41bc..9fb6ffd 100644 --- a/publisher.go +++ b/publisher.go @@ -1,8 +1,8 @@ package engine import ( - "v4.m7s.live/engine/common" - "v4.m7s.live/engine/config" + "m7s.live/engine/v4/common" + "m7s.live/engine/v4/config" ) type IPublisher interface { diff --git a/stream.go b/stream.go index 029598e..a5e814d 100644 --- a/stream.go +++ b/stream.go @@ -7,10 +7,10 @@ import ( . "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" + . "m7s.live/engine/v4/common" + "m7s.live/engine/v4/log" + "m7s.live/engine/v4/track" + "m7s.live/engine/v4/util" ) type StreamState byte diff --git a/subscriber.go b/subscriber.go index 45b4a5c..043c21c 100644 --- a/subscriber.go +++ b/subscriber.go @@ -6,9 +6,9 @@ import ( "time" "go.uber.org/zap" - . "v4.m7s.live/engine/common" - "v4.m7s.live/engine/config" - "v4.m7s.live/engine/track" + . "m7s.live/engine/v4/common" + "m7s.live/engine/v4/config" + "m7s.live/engine/v4/track" ) type HaveFLV interface { diff --git a/track/aac.go b/track/aac.go index e97c3aa..9f5c253 100644 --- a/track/aac.go +++ b/track/aac.go @@ -4,10 +4,10 @@ import ( "net" "time" - "v4.m7s.live/engine/codec" - . "v4.m7s.live/engine/common" - "v4.m7s.live/engine/config" - "v4.m7s.live/engine/util" + "m7s.live/engine/v4/codec" + . "m7s.live/engine/v4/common" + "m7s.live/engine/v4/config" + "m7s.live/engine/v4/util" ) func NewAAC(stream IStream) (aac *AAC) { diff --git a/track/audio.go b/track/audio.go index 1f76f2d..9af97d5 100644 --- a/track/audio.go +++ b/track/audio.go @@ -4,9 +4,9 @@ import ( "net" "go.uber.org/zap" - "v4.m7s.live/engine/codec" - . "v4.m7s.live/engine/common" - "v4.m7s.live/engine/config" + "m7s.live/engine/v4/codec" + . "m7s.live/engine/v4/common" + "m7s.live/engine/v4/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 084b4d4..3700aad 100644 --- a/track/base.go +++ b/track/base.go @@ -5,9 +5,9 @@ import ( "time" "github.com/pion/rtp" - . "v4.m7s.live/engine/common" - "v4.m7s.live/engine/config" - "v4.m7s.live/engine/util" + . "m7s.live/engine/v4/common" + "m7s.live/engine/v4/config" + "m7s.live/engine/v4/util" ) // Base 基础Track类 diff --git a/track/g711.go b/track/g711.go index 371de89..87f629d 100644 --- a/track/g711.go +++ b/track/g711.go @@ -3,9 +3,9 @@ package track import ( "time" - "v4.m7s.live/engine/codec" - . "v4.m7s.live/engine/common" - "v4.m7s.live/engine/config" + "m7s.live/engine/v4/codec" + . "m7s.live/engine/v4/common" + "m7s.live/engine/v4/config" ) func NewG711(stream IStream, alaw bool) (g711 *G711) { diff --git a/track/h264.go b/track/h264.go index 778e0d4..4f1c28c 100644 --- a/track/h264.go +++ b/track/h264.go @@ -4,10 +4,10 @@ import ( "net" "time" - "v4.m7s.live/engine/codec" - . "v4.m7s.live/engine/common" - "v4.m7s.live/engine/config" - "v4.m7s.live/engine/util" + "m7s.live/engine/v4/codec" + . "m7s.live/engine/v4/common" + "m7s.live/engine/v4/config" + "m7s.live/engine/v4/util" ) type H264 struct { diff --git a/track/h265.go b/track/h265.go index 7924f48..c33de77 100644 --- a/track/h265.go +++ b/track/h265.go @@ -4,10 +4,10 @@ import ( "net" "time" - "v4.m7s.live/engine/codec" - . "v4.m7s.live/engine/common" - "v4.m7s.live/engine/config" - "v4.m7s.live/engine/util" + "m7s.live/engine/v4/codec" + . "m7s.live/engine/v4/common" + "m7s.live/engine/v4/config" + "m7s.live/engine/v4/util" ) type H265 struct { diff --git a/track/video.go b/track/video.go index cd36b57..09775b9 100644 --- a/track/video.go +++ b/track/video.go @@ -6,10 +6,10 @@ import ( . "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" + "m7s.live/engine/v4/codec" + . "m7s.live/engine/v4/common" + "m7s.live/engine/v4/config" + "m7s.live/engine/v4/util" ) type Video struct { diff --git a/util/socket.go b/util/socket.go index 210a86d..ae4503e 100644 --- a/util/socket.go +++ b/util/socket.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "v4.m7s.live/engine/log" + "m7s.live/engine/v4/log" ) type TCPListener interface {