diff --git a/api.go b/api.go index 141542b..dab4145 100644 --- a/api.go +++ b/api.go @@ -6,12 +6,12 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/websocket" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/flv" - "github.com/yangjiechina/live-server/gb28181" - "github.com/yangjiechina/live-server/hls" - "github.com/yangjiechina/live-server/log" - "github.com/yangjiechina/live-server/rtc" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/flv" + "github.com/yangjiechina/lkm/gb28181" + "github.com/yangjiechina/lkm/hls" + "github.com/yangjiechina/lkm/log" + "github.com/yangjiechina/lkm/rtc" + "github.com/yangjiechina/lkm/stream" "io" "net" "net/http" diff --git a/flv/flv_sink.go b/flv/flv_sink.go index ed3eb51..83ac686 100644 --- a/flv/flv_sink.go +++ b/flv/flv_sink.go @@ -1,7 +1,7 @@ package flv import ( - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" "net" ) diff --git a/flv/http_flv.go b/flv/http_flv.go index ef5cc75..fafd812 100644 --- a/flv/http_flv.go +++ b/flv/http_flv.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/yangjiechina/avformat/libflv" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" ) const ( diff --git a/gb28181/filter.go b/gb28181/filter.go index a90d37f..c5040cd 100644 --- a/gb28181/filter.go +++ b/gb28181/filter.go @@ -2,7 +2,7 @@ package gb28181 import ( "github.com/pion/rtp" - "github.com/yangjiechina/live-server/log" + "github.com/yangjiechina/lkm/log" "net" ) diff --git a/gb28181/source.go b/gb28181/source.go index 9ec5a2d..5871ba7 100644 --- a/gb28181/source.go +++ b/gb28181/source.go @@ -9,8 +9,8 @@ import ( "github.com/yangjiechina/avformat/libmpeg" "github.com/yangjiechina/avformat/transport" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/log" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/log" + "github.com/yangjiechina/lkm/stream" "net" ) diff --git a/gb28181/source_passive.go b/gb28181/source_passive.go index 78902e3..b5c6eb0 100644 --- a/gb28181/source_passive.go +++ b/gb28181/source_passive.go @@ -2,7 +2,7 @@ package gb28181 import ( "github.com/pion/rtp" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" ) type PassiveSource struct { diff --git a/gb28181/source_udp.go b/gb28181/source_udp.go index a8efb80..e0b9085 100644 --- a/gb28181/source_udp.go +++ b/gb28181/source_udp.go @@ -3,8 +3,8 @@ package gb28181 import ( "fmt" "github.com/pion/rtp" - "github.com/yangjiechina/live-server/jitterbuffer" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/jitterbuffer" + "github.com/yangjiechina/lkm/stream" ) type UDPSource struct { diff --git a/gb28181/tcp_client.go b/gb28181/tcp_client.go index 66336c3..05abebe 100644 --- a/gb28181/tcp_client.go +++ b/gb28181/tcp_client.go @@ -3,7 +3,7 @@ package gb28181 import ( "fmt" "github.com/yangjiechina/avformat/transport" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" "net" ) diff --git a/gb28181/tcp_server.go b/gb28181/tcp_server.go index 766b5f1..d866dd1 100644 --- a/gb28181/tcp_server.go +++ b/gb28181/tcp_server.go @@ -2,7 +2,7 @@ package gb28181 import ( "github.com/yangjiechina/avformat/transport" - "github.com/yangjiechina/live-server/log" + "github.com/yangjiechina/lkm/log" "net" ) diff --git a/go.mod b/go.mod index 4f80d52..81194ec 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/yangjiechina/live-server +module github.com/yangjiechina/lkm require github.com/yangjiechina/avformat v0.0.0 diff --git a/hls/hls_sink.go b/hls/hls_sink.go index 6369e59..4adb44c 100644 --- a/hls/hls_sink.go +++ b/hls/hls_sink.go @@ -1,7 +1,7 @@ package hls import ( - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" ) type tsSink struct { diff --git a/hls/hls_stream.go b/hls/hls_stream.go index aa5df88..56d6cc8 100644 --- a/hls/hls_stream.go +++ b/hls/hls_stream.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/yangjiechina/avformat/libmpeg" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" "os" ) diff --git a/hls/m3u8.go b/hls/m3u8.go index b3df197..22bff00 100644 --- a/hls/m3u8.go +++ b/hls/m3u8.go @@ -2,7 +2,7 @@ package hls import ( "bytes" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" "math" "strconv" ) diff --git a/jt1078/jt_server.go b/jt1078/jt_server.go index 7e9e9c3..c635f58 100644 --- a/jt1078/jt_server.go +++ b/jt1078/jt_server.go @@ -3,8 +3,8 @@ package jt1078 import ( "github.com/yangjiechina/avformat/transport" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/log" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/log" + "github.com/yangjiechina/lkm/stream" "net" ) diff --git a/jt1078/jt_session.go b/jt1078/jt_session.go index 3d2947f..add0192 100644 --- a/jt1078/jt_session.go +++ b/jt1078/jt_session.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/yangjiechina/avformat/transport" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/log" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/log" + "github.com/yangjiechina/lkm/stream" ) const ( diff --git a/main.go b/main.go index 4176550..09043e8 100644 --- a/main.go +++ b/main.go @@ -2,21 +2,21 @@ package main import ( "fmt" - "github.com/yangjiechina/live-server/flv" - "github.com/yangjiechina/live-server/gb28181" - "github.com/yangjiechina/live-server/hls" - "github.com/yangjiechina/live-server/jt1078" - "github.com/yangjiechina/live-server/log" - "github.com/yangjiechina/live-server/rtc" - "github.com/yangjiechina/live-server/rtsp" + "github.com/yangjiechina/lkm/flv" + "github.com/yangjiechina/lkm/gb28181" + "github.com/yangjiechina/lkm/hls" + "github.com/yangjiechina/lkm/jt1078" + "github.com/yangjiechina/lkm/log" + "github.com/yangjiechina/lkm/rtc" + "github.com/yangjiechina/lkm/rtsp" "go.uber.org/zap/zapcore" "net" "net/http" _ "net/http/pprof" - "github.com/yangjiechina/live-server/rtmp" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/rtmp" + "github.com/yangjiechina/lkm/stream" ) func NewDefaultAppConfig() stream.AppConfig_ { diff --git a/rtc/rtc_sink.go b/rtc/rtc_sink.go index a967f48..86b5b4a 100644 --- a/rtc/rtc_sink.go +++ b/rtc/rtc_sink.go @@ -3,7 +3,7 @@ package rtc import ( "github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3/pkg/media" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" "time" ) diff --git a/rtc/rtc_stream.go b/rtc/rtc_stream.go index 4b49257..06814fe 100644 --- a/rtc/rtc_stream.go +++ b/rtc/rtc_stream.go @@ -3,7 +3,7 @@ package rtc import ( "github.com/pion/webrtc/v3" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" ) type transStream struct { diff --git a/rtmp/rtmp_publisher.go b/rtmp/rtmp_publisher.go index f7e3fca..3bf7a23 100644 --- a/rtmp/rtmp_publisher.go +++ b/rtmp/rtmp_publisher.go @@ -5,7 +5,7 @@ import ( "github.com/yangjiechina/avformat/librtmp" "github.com/yangjiechina/avformat/transport" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" "net" ) diff --git a/rtmp/rtmp_server.go b/rtmp/rtmp_server.go index 96f0c81..2b9619d 100644 --- a/rtmp/rtmp_server.go +++ b/rtmp/rtmp_server.go @@ -1,7 +1,7 @@ package rtmp import ( - "github.com/yangjiechina/live-server/log" + "github.com/yangjiechina/lkm/log" "net" "github.com/yangjiechina/avformat/transport" diff --git a/rtmp/rtmp_server_test.go b/rtmp/rtmp_server_test.go index 3f78449..877f955 100644 --- a/rtmp/rtmp_server_test.go +++ b/rtmp/rtmp_server_test.go @@ -3,7 +3,7 @@ package rtmp import ( "github.com/yangjiechina/avformat/librtmp" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" "net" "testing" ) diff --git a/rtmp/rtmp_session.go b/rtmp/rtmp_session.go index 9450708..541054c 100644 --- a/rtmp/rtmp_session.go +++ b/rtmp/rtmp_session.go @@ -3,8 +3,8 @@ package rtmp import ( "github.com/yangjiechina/avformat/librtmp" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/log" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/log" + "github.com/yangjiechina/lkm/stream" "net" ) diff --git a/rtmp/rtmp_sink.go b/rtmp/rtmp_sink.go index 10db859..a9a6c6e 100644 --- a/rtmp/rtmp_sink.go +++ b/rtmp/rtmp_sink.go @@ -2,7 +2,7 @@ package rtmp import ( "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" "net" ) diff --git a/rtmp/rtmp_stream.go b/rtmp/rtmp_stream.go index 63801b8..6776f36 100644 --- a/rtmp/rtmp_stream.go +++ b/rtmp/rtmp_stream.go @@ -4,7 +4,7 @@ import ( "github.com/yangjiechina/avformat/libflv" "github.com/yangjiechina/avformat/librtmp" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" ) type TransStream struct { diff --git a/rtsp/rtsp_handler.go b/rtsp/rtsp_handler.go index bfc68b7..7c67683 100644 --- a/rtsp/rtsp_handler.go +++ b/rtsp/rtsp_handler.go @@ -3,8 +3,8 @@ package rtsp import ( "fmt" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/log" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/log" + "github.com/yangjiechina/lkm/stream" "net/http" "net/textproto" "net/url" diff --git a/rtsp/rtsp_server.go b/rtsp/rtsp_server.go index 16da8d7..4752445 100644 --- a/rtsp/rtsp_server.go +++ b/rtsp/rtsp_server.go @@ -3,7 +3,7 @@ package rtsp import ( "github.com/yangjiechina/avformat/transport" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/log" + "github.com/yangjiechina/lkm/log" "net" ) diff --git a/rtsp/rtsp_sink.go b/rtsp/rtsp_sink.go index 62de983..c4a7355 100644 --- a/rtsp/rtsp_sink.go +++ b/rtsp/rtsp_sink.go @@ -6,8 +6,8 @@ import ( "github.com/yangjiechina/avformat/librtp" "github.com/yangjiechina/avformat/transport" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/log" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/log" + "github.com/yangjiechina/lkm/stream" "net" "time" ) diff --git a/rtsp/rtsp_stream.go b/rtsp/rtsp_stream.go index 1358724..f116c98 100644 --- a/rtsp/rtsp_stream.go +++ b/rtsp/rtsp_stream.go @@ -8,7 +8,7 @@ import ( "github.com/yangjiechina/avformat/librtp" "github.com/yangjiechina/avformat/librtsp/sdp" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/stream" + "github.com/yangjiechina/lkm/stream" "net" "strconv" ) diff --git a/stream/sink_hook.go b/stream/sink_hook.go index e27a5fc..835ddf9 100644 --- a/stream/sink_hook.go +++ b/stream/sink_hook.go @@ -2,7 +2,7 @@ package stream import ( "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/log" + "github.com/yangjiechina/lkm/log" "net/http" ) diff --git a/stream/source.go b/stream/source.go index 6a5292f..d86896a 100644 --- a/stream/source.go +++ b/stream/source.go @@ -2,14 +2,14 @@ package stream import ( "fmt" - "github.com/yangjiechina/live-server/log" + "github.com/yangjiechina/lkm/log" "net" "net/http" "time" "github.com/yangjiechina/avformat/stream" "github.com/yangjiechina/avformat/utils" - "github.com/yangjiechina/live-server/transcode" + "github.com/yangjiechina/lkm/transcode" ) // SourceType 推流类型