修改项目包名

This commit is contained in:
yangjiechina
2024-07-10 20:26:30 +08:00
parent 99658f417a
commit 52832690d1
54 changed files with 140 additions and 140 deletions

14
api.go
View File

@@ -5,13 +5,13 @@ import (
"fmt"
"github.com/gorilla/mux"
"github.com/gorilla/websocket"
"github.com/yangjiechina/avformat/utils"
"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"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/flv"
"github.com/lkmio/lkm/gb28181"
"github.com/lkmio/lkm/hls"
"github.com/lkmio/lkm/log"
"github.com/lkmio/lkm/rtc"
"github.com/lkmio/lkm/stream"
"io"
"net"
"net/http"

View File

@@ -1,6 +1,6 @@
package collections
import "github.com/yangjiechina/avformat/utils"
import "github.com/lkmio/avformat/utils"
type Node[T any] struct {
data T

View File

@@ -1,7 +1,7 @@
package collections
import (
"github.com/yangjiechina/avformat/utils"
"github.com/lkmio/avformat/utils"
"testing"
)

View File

@@ -1,7 +1,7 @@
package collections
import (
"github.com/yangjiechina/avformat/utils"
"github.com/lkmio/avformat/utils"
)
// MemoryPool 从解复用阶段拼凑成完整的AVPacket开始(写)到GOP缓存结束(释放),整个过程都使用池中内存

View File

@@ -2,7 +2,7 @@ package collections
import (
"encoding/hex"
"github.com/yangjiechina/avformat/utils"
"github.com/lkmio/avformat/utils"
"testing"
"unsafe"
)

View File

@@ -1,8 +1,8 @@
package collections
import (
"github.com/yangjiechina/avformat/libbufio"
"github.com/yangjiechina/avformat/utils"
"github.com/lkmio/avformat/libbufio"
"github.com/lkmio/avformat/utils"
)
type Queue struct {

View File

@@ -1,7 +1,7 @@
package collections
import (
"github.com/yangjiechina/avformat/utils"
"github.com/lkmio/avformat/utils"
)
type RingBuffer interface {

View File

@@ -1,7 +1,7 @@
package flv
import (
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/lkm/stream"
"net"
)

View File

@@ -3,9 +3,9 @@ package flv
import (
"encoding/binary"
"fmt"
"github.com/yangjiechina/avformat/libflv"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/avformat/libflv"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/stream"
)
const (

View File

@@ -2,7 +2,7 @@ package flv
import (
"github.com/gorilla/websocket"
"github.com/yangjiechina/avformat/transport"
"github.com/lkmio/avformat/transport"
"net"
"time"
)

View File

@@ -5,7 +5,7 @@ import (
"encoding/binary"
"encoding/json"
"fmt"
"github.com/yangjiechina/avformat/transport"
"github.com/lkmio/avformat/transport"
"io"
"net"
"net/http"

View File

@@ -3,14 +3,14 @@ package gb28181
import (
"encoding/hex"
"fmt"
"github.com/lkmio/avformat/libavc"
"github.com/lkmio/avformat/libhevc"
"github.com/lkmio/avformat/libmpeg"
"github.com/lkmio/avformat/transport"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/log"
"github.com/lkmio/lkm/stream"
"github.com/pion/rtp"
"github.com/yangjiechina/avformat/libavc"
"github.com/yangjiechina/avformat/libhevc"
"github.com/yangjiechina/avformat/libmpeg"
"github.com/yangjiechina/avformat/transport"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/log"
"github.com/yangjiechina/lkm/stream"
"net"
)

View File

@@ -1,8 +1,8 @@
package gb28181
import (
"github.com/lkmio/lkm/stream"
"github.com/pion/rtp"
"github.com/yangjiechina/lkm/stream"
)
// UDPSource GB28181 UDP推流源

View File

@@ -1,8 +1,8 @@
package gb28181
import (
"github.com/yangjiechina/avformat/transport"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/avformat/transport"
"github.com/lkmio/lkm/stream"
"net"
)

View File

@@ -1,8 +1,8 @@
package gb28181
import (
"github.com/yangjiechina/avformat/transport"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/avformat/transport"
"github.com/lkmio/lkm/stream"
"net"
"runtime"
)

View File

@@ -2,10 +2,10 @@ package gb28181
import (
"encoding/hex"
"github.com/lkmio/avformat/transport"
"github.com/lkmio/lkm/log"
"github.com/lkmio/lkm/stream"
"github.com/pion/rtp"
"github.com/yangjiechina/avformat/transport"
"github.com/yangjiechina/lkm/log"
"github.com/yangjiechina/lkm/stream"
"net"
)

View File

@@ -1,10 +1,10 @@
package gb28181
import (
"github.com/lkmio/avformat/transport"
"github.com/lkmio/lkm/log"
"github.com/lkmio/lkm/stream"
"github.com/pion/rtp"
"github.com/yangjiechina/avformat/transport"
"github.com/yangjiechina/lkm/log"
"github.com/yangjiechina/lkm/stream"
"net"
"runtime"
)

12
go.mod
View File

@@ -1,18 +1,15 @@
module github.com/yangjiechina/lkm
module github.com/lkmio/lkm
require github.com/yangjiechina/avformat v0.0.0
require github.com/lkmio/avformat v0.0.0
require (
github.com/gorilla/mux v1.8.1
github.com/gorilla/websocket v1.5.1
github.com/natefinch/lumberjack v2.0.0+incompatible
github.com/pion/interceptor v0.1.25
github.com/pion/logging v0.2.2
github.com/pion/rtcp v1.2.14
github.com/pion/rtp v1.8.5
github.com/pion/webrtc/v3 v3.2.29
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
github.com/x-cray/logrus-prefixed-formatter v0.5.2
go.uber.org/zap v1.27.0
)
@@ -27,6 +24,8 @@ require (
github.com/pion/datachannel v1.5.5 // indirect
github.com/pion/dtls/v2 v2.2.7 // indirect
github.com/pion/ice/v2 v2.3.13 // indirect
github.com/pion/interceptor v0.1.25 // indirect
github.com/pion/logging v0.2.2 // indirect
github.com/pion/mdns v0.0.12 // indirect
github.com/pion/randutil v0.1.0 // indirect
github.com/pion/sctp v1.8.12 // indirect
@@ -36,6 +35,7 @@ require (
github.com/pion/transport/v2 v2.2.3 // indirect
github.com/pion/turn/v2 v2.1.3 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/testify v1.9.0 // indirect
go.uber.org/multierr v1.10.0 // indirect
golang.org/x/crypto v0.18.0 // indirect
golang.org/x/net v0.20.0 // indirect
@@ -45,6 +45,6 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)
replace github.com/yangjiechina/avformat => ../avformat
replace github.com/lkmio/avformat => ../avformat
go 1.19

View File

@@ -1,7 +1,7 @@
package hls
import (
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/lkm/stream"
)
type tsSink struct {

View File

@@ -2,10 +2,10 @@ package hls
import (
"fmt"
"github.com/yangjiechina/avformat/libmpeg"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/log"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/avformat/libmpeg"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/log"
"github.com/lkmio/lkm/stream"
"os"
"path/filepath"
"strconv"

View File

@@ -2,7 +2,7 @@ package hls
import (
"bytes"
"github.com/yangjiechina/lkm/collections"
"github.com/lkmio/lkm/collections"
"math"
"strconv"
)

View File

@@ -1,9 +1,9 @@
package jt1078
import (
"github.com/yangjiechina/avformat/transport"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/avformat/transport"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/stream"
"net"
"runtime"
)

View File

@@ -3,11 +3,11 @@ package jt1078
import (
"encoding/binary"
"fmt"
"github.com/yangjiechina/avformat/transport"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/collections"
"github.com/yangjiechina/lkm/log"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/avformat/transport"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/collections"
"github.com/lkmio/lkm/log"
"github.com/lkmio/lkm/stream"
"net"
)

View File

@@ -1,8 +1,8 @@
package jt1078
import (
"github.com/yangjiechina/avformat/libbufio"
"github.com/yangjiechina/avformat/transport"
"github.com/lkmio/avformat/libbufio"
"github.com/lkmio/avformat/transport"
"net"
"os"
"testing"

View File

@@ -2,8 +2,8 @@ package log
import (
"fmt"
"github.com/lkmio/avformat/utils"
"github.com/natefinch/lumberjack"
"github.com/yangjiechina/avformat/utils"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"os"

20
main.go
View File

@@ -2,22 +2,22 @@ package main
import (
"encoding/json"
"github.com/yangjiechina/avformat/transport"
"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"
"github.com/lkmio/avformat/transport"
"github.com/lkmio/lkm/flv"
"github.com/lkmio/lkm/gb28181"
"github.com/lkmio/lkm/hls"
"github.com/lkmio/lkm/jt1078"
"github.com/lkmio/lkm/log"
"github.com/lkmio/lkm/rtc"
"github.com/lkmio/lkm/rtsp"
"go.uber.org/zap/zapcore"
"net"
"net/http"
_ "net/http/pprof"
"strconv"
"github.com/yangjiechina/lkm/rtmp"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/lkm/rtmp"
"github.com/lkmio/lkm/stream"
)
func init() {

View File

@@ -1,9 +1,9 @@
package rtc
import (
"github.com/lkmio/lkm/stream"
"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v3/pkg/media"
"github.com/yangjiechina/lkm/stream"
"time"
)

View File

@@ -1,9 +1,9 @@
package rtc
import (
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/stream"
"github.com/pion/webrtc/v3"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/stream"
)
type transStream struct {

View File

@@ -2,7 +2,7 @@ package rtmp
import (
"encoding/binary"
"github.com/yangjiechina/avformat/transport"
"github.com/lkmio/avformat/transport"
"net"
"os"
"testing"

View File

@@ -1,10 +1,10 @@
package rtmp
import (
"github.com/yangjiechina/avformat/libflv"
"github.com/yangjiechina/avformat/librtmp"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/avformat/libflv"
"github.com/lkmio/avformat/librtmp"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/stream"
"net"
)

View File

@@ -1,13 +1,13 @@
package rtmp
import (
"github.com/yangjiechina/lkm/log"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/lkm/log"
"github.com/lkmio/lkm/stream"
"net"
"runtime"
"github.com/yangjiechina/avformat/transport"
"github.com/yangjiechina/avformat/utils"
"github.com/lkmio/avformat/transport"
"github.com/lkmio/avformat/utils"
)
type Server interface {

View File

@@ -1,9 +1,9 @@
package rtmp
import (
"github.com/yangjiechina/avformat/librtmp"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/avformat/librtmp"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/stream"
"net"
"testing"
)

View File

@@ -1,10 +1,10 @@
package rtmp
import (
"github.com/yangjiechina/avformat/librtmp"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/log"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/avformat/librtmp"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/log"
"github.com/lkmio/lkm/stream"
"net"
)

View File

@@ -1,9 +1,9 @@
package rtmp
import (
"github.com/yangjiechina/avformat/librtmp"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/avformat/librtmp"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/stream"
"net"
)

View File

@@ -1,10 +1,10 @@
package rtmp
import (
"github.com/yangjiechina/avformat/libflv"
"github.com/yangjiechina/avformat/librtmp"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/avformat/libflv"
"github.com/lkmio/avformat/librtmp"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/stream"
)
type transStream struct {

View File

@@ -2,9 +2,9 @@ package rtsp
import (
"fmt"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/log"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/log"
"github.com/lkmio/lkm/stream"
"net/http"
"net/textproto"
"net/url"

View File

@@ -1,9 +1,9 @@
package rtsp
import (
"github.com/yangjiechina/avformat/transport"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/log"
"github.com/lkmio/avformat/transport"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/log"
"net"
"runtime"
)

View File

@@ -1,12 +1,12 @@
package rtsp
import (
"github.com/lkmio/avformat/librtp"
"github.com/lkmio/avformat/transport"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/log"
"github.com/lkmio/lkm/stream"
"github.com/pion/rtcp"
"github.com/yangjiechina/avformat/librtp"
"github.com/yangjiechina/avformat/transport"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/log"
"github.com/yangjiechina/lkm/stream"
"net"
"time"
)

View File

@@ -3,11 +3,11 @@ package rtsp
import (
"encoding/binary"
"fmt"
"github.com/yangjiechina/avformat/libavc"
"github.com/yangjiechina/avformat/librtp"
"github.com/yangjiechina/avformat/librtsp/sdp"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/stream"
"github.com/lkmio/avformat/libavc"
"github.com/lkmio/avformat/librtp"
"github.com/lkmio/avformat/librtsp/sdp"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/stream"
"net"
"strconv"
)

View File

@@ -1,8 +1,8 @@
package rtsp
import (
"github.com/yangjiechina/avformat/librtp"
"github.com/yangjiechina/avformat/utils"
"github.com/lkmio/avformat/librtp"
"github.com/lkmio/avformat/utils"
)
// 对rtsp每路输出流的封装

View File

@@ -4,7 +4,7 @@ import (
"encoding/binary"
"encoding/json"
"fmt"
"github.com/yangjiechina/lkm/log"
"github.com/lkmio/lkm/log"
"go.uber.org/zap/zapcore"
"net"
"os"

View File

@@ -1,8 +1,8 @@
package stream
import (
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/collections"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/collections"
)
// GOPBuffer GOP缓存

View File

@@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/yangjiechina/lkm/log"
"github.com/lkmio/lkm/log"
"net/http"
"time"
)

View File

@@ -1,8 +1,8 @@
package stream
import (
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/log"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/log"
"net/http"
)

View File

@@ -1,8 +1,8 @@
package stream
import (
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/log"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/log"
"net/http"
)

View File

@@ -1,8 +1,8 @@
package stream
import (
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/collections"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/collections"
)
// MergeWritingBuffer 实现针对RTMP/FLV/HLS等基于TCP传输流的合并写缓存

View File

@@ -3,7 +3,7 @@ package stream
import (
"encoding/binary"
"fmt"
"github.com/yangjiechina/avformat/utils"
"github.com/lkmio/avformat/utils"
"net"
"net/url"
"sync"

View File

@@ -3,15 +3,15 @@ package stream
import (
"encoding/json"
"fmt"
"github.com/yangjiechina/lkm/collections"
"github.com/yangjiechina/lkm/log"
"github.com/lkmio/lkm/collections"
"github.com/lkmio/lkm/log"
"net"
"net/url"
"time"
"github.com/yangjiechina/avformat/stream"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/transcode"
"github.com/lkmio/avformat/stream"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/transcode"
)
// SourceType 推流类型

View File

@@ -2,7 +2,7 @@ package stream
import (
"fmt"
"github.com/yangjiechina/lkm/log"
"github.com/lkmio/lkm/log"
"net/url"
"strings"
)

View File

@@ -1,7 +1,7 @@
package stream
import (
"github.com/yangjiechina/avformat/utils"
"github.com/lkmio/avformat/utils"
)
type StreamManager struct {

View File

@@ -1,8 +1,8 @@
package stream
import (
"github.com/yangjiechina/avformat/transport"
"github.com/yangjiechina/lkm/log"
"github.com/lkmio/avformat/transport"
"github.com/lkmio/lkm/log"
"net"
)

View File

@@ -2,7 +2,7 @@ package stream
import (
"fmt"
"github.com/yangjiechina/avformat/utils"
"github.com/lkmio/avformat/utils"
)
type TransStreamFactory func(source Source, protocol Protocol, streams []utils.AVStream) (TransStream, error)

View File

@@ -1,9 +1,9 @@
package stream
import (
"github.com/yangjiechina/avformat/transport"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/lkm/log"
"github.com/lkmio/avformat/transport"
"github.com/lkmio/avformat/utils"
"github.com/lkmio/lkm/log"
)
// TransStream 将AVPacket封装成传输流转发给各个Sink

View File

@@ -1,6 +1,6 @@
package stream
import "github.com/yangjiechina/avformat/utils"
import "github.com/lkmio/avformat/utils"
// TransStreamId 每个传输流的唯一Id根据输出流协议ID+流包含的音视频编码器ID生成
// 输出流协议ID占用高8位