feat: change package name to v5

This commit is contained in:
langhuihui
2024-10-21 20:13:34 +08:00
parent 315b44bc46
commit fba41faf6b
134 changed files with 385 additions and 385 deletions

10
api.go
View File

@@ -11,7 +11,7 @@ import (
"strings"
"time"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/task"
"github.com/mcuadros/go-defaults"
"github.com/shirou/gopsutil/v3/cpu"
@@ -22,10 +22,10 @@ import (
"google.golang.org/protobuf/types/known/emptypb"
"google.golang.org/protobuf/types/known/timestamppb"
"gopkg.in/yaml.v3"
"m7s.live/m7s/v5/pb"
"m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/config"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pb"
"m7s.live/v5/pkg"
"m7s.live/v5/pkg/config"
"m7s.live/v5/pkg/util"
)
var localIP string

View File

@@ -8,8 +8,8 @@ import (
"github.com/go-ping/ping"
"gorm.io/gorm"
"m7s.live/m7s/v5/pkg/config"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/config"
"m7s.live/v5/pkg/task"
)
const (

View File

@@ -4,23 +4,23 @@ import (
"context"
"flag"
"fmt"
"m7s.live/m7s/v5"
_ "m7s.live/m7s/v5/plugin/console"
_ "m7s.live/m7s/v5/plugin/debug"
_ "m7s.live/m7s/v5/plugin/flv"
_ "m7s.live/m7s/v5/plugin/gb28181"
_ "m7s.live/m7s/v5/plugin/logrotate"
_ "m7s.live/m7s/v5/plugin/monitor"
_ "m7s.live/m7s/v5/plugin/mp4"
mp4 "m7s.live/m7s/v5/plugin/mp4/pkg"
_ "m7s.live/m7s/v5/plugin/preview"
_ "m7s.live/m7s/v5/plugin/rtmp"
_ "m7s.live/m7s/v5/plugin/rtsp"
_ "m7s.live/m7s/v5/plugin/sei"
_ "m7s.live/m7s/v5/plugin/srt"
_ "m7s.live/m7s/v5/plugin/stress"
_ "m7s.live/m7s/v5/plugin/transcode"
_ "m7s.live/m7s/v5/plugin/webrtc"
"m7s.live/v5"
_ "m7s.live/v5/plugin/console"
_ "m7s.live/v5/plugin/debug"
_ "m7s.live/v5/plugin/flv"
_ "m7s.live/v5/plugin/gb28181"
_ "m7s.live/v5/plugin/logrotate"
_ "m7s.live/v5/plugin/monitor"
_ "m7s.live/v5/plugin/mp4"
mp4 "m7s.live/v5/plugin/mp4/pkg"
_ "m7s.live/v5/plugin/preview"
_ "m7s.live/v5/plugin/rtmp"
_ "m7s.live/v5/plugin/rtsp"
_ "m7s.live/v5/plugin/sei"
_ "m7s.live/v5/plugin/srt"
_ "m7s.live/v5/plugin/stress"
_ "m7s.live/v5/plugin/transcode"
_ "m7s.live/v5/plugin/webrtc"
"path/filepath"
"strings"
"time"

View File

@@ -4,22 +4,22 @@ import (
"context"
"flag"
"m7s.live/m7s/v5"
_ "m7s.live/m7s/v5/plugin/console"
_ "m7s.live/m7s/v5/plugin/debug"
_ "m7s.live/m7s/v5/plugin/flv"
_ "m7s.live/m7s/v5/plugin/gb28181"
_ "m7s.live/m7s/v5/plugin/logrotate"
_ "m7s.live/m7s/v5/plugin/monitor"
_ "m7s.live/m7s/v5/plugin/mp4"
_ "m7s.live/m7s/v5/plugin/preview"
_ "m7s.live/m7s/v5/plugin/rtmp"
_ "m7s.live/m7s/v5/plugin/rtsp"
_ "m7s.live/m7s/v5/plugin/sei"
_ "m7s.live/m7s/v5/plugin/srt"
_ "m7s.live/m7s/v5/plugin/stress"
_ "m7s.live/m7s/v5/plugin/transcode"
_ "m7s.live/m7s/v5/plugin/webrtc"
"m7s.live/v5"
_ "m7s.live/v5/plugin/console"
_ "m7s.live/v5/plugin/debug"
_ "m7s.live/v5/plugin/flv"
_ "m7s.live/v5/plugin/gb28181"
_ "m7s.live/v5/plugin/logrotate"
_ "m7s.live/v5/plugin/monitor"
_ "m7s.live/v5/plugin/mp4"
_ "m7s.live/v5/plugin/preview"
_ "m7s.live/v5/plugin/rtmp"
_ "m7s.live/v5/plugin/rtsp"
_ "m7s.live/v5/plugin/sei"
_ "m7s.live/v5/plugin/srt"
_ "m7s.live/v5/plugin/stress"
_ "m7s.live/v5/plugin/transcode"
_ "m7s.live/v5/plugin/webrtc"
)
func main() {

View File

@@ -3,17 +3,17 @@ package main
import (
"context"
"flag"
"m7s.live/m7s/v5"
_ "m7s.live/m7s/v5/plugin/cascade"
_ "m7s.live/m7s/v5/plugin/console"
_ "m7s.live/m7s/v5/plugin/debug"
_ "m7s.live/m7s/v5/plugin/flv"
_ "m7s.live/m7s/v5/plugin/logrotate"
_ "m7s.live/m7s/v5/plugin/monitor"
_ "m7s.live/m7s/v5/plugin/rtmp"
_ "m7s.live/m7s/v5/plugin/rtsp"
_ "m7s.live/m7s/v5/plugin/stress"
_ "m7s.live/m7s/v5/plugin/webrtc"
"m7s.live/v5"
_ "m7s.live/v5/plugin/cascade"
_ "m7s.live/v5/plugin/console"
_ "m7s.live/v5/plugin/debug"
_ "m7s.live/v5/plugin/flv"
_ "m7s.live/v5/plugin/logrotate"
_ "m7s.live/v5/plugin/monitor"
_ "m7s.live/v5/plugin/rtmp"
_ "m7s.live/v5/plugin/rtsp"
_ "m7s.live/v5/plugin/stress"
_ "m7s.live/v5/plugin/webrtc"
"path/filepath"
)

2
go.mod
View File

@@ -1,4 +1,4 @@
module m7s.live/m7s/v5
module m7s.live/v5
go 1.23

View File

@@ -7,8 +7,8 @@ import (
"time"
"github.com/deepch/vdk/codec/aacparser"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
)
var _ IAVFrame = (*ADTS)(nil)

View File

@@ -9,8 +9,8 @@ import (
"github.com/deepch/vdk/codec/h264parser"
"github.com/deepch/vdk/codec/h265parser"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
)
var _ IAVFrame = (*AnnexB)(nil)

View File

@@ -3,9 +3,9 @@ package pkg
import (
"context"
"log/slog"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/config"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/config"
"m7s.live/v5/pkg/task"
"time"
)

View File

@@ -7,8 +7,8 @@ import (
"time"
"github.com/bluenviron/mediacommon/pkg/codecs/av1"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
)
type (

View File

@@ -4,7 +4,7 @@ import (
"bytes"
"encoding/binary"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
type FourCC [4]byte

View File

@@ -5,7 +5,7 @@ import (
"crypto/subtle"
"crypto/tls"
"log/slog"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/task"
"net/http"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"

View File

@@ -6,7 +6,7 @@ import (
"log/slog"
"github.com/quic-go/quic-go"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/task"
)
type QuicConfig interface {

View File

@@ -8,7 +8,7 @@ import (
"runtime"
"time"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/task"
)
//go:embed local.monibuca.com_bundle.pem

View File

@@ -8,7 +8,7 @@ import (
"github.com/mcuadros/go-defaults"
"gopkg.in/yaml.v3"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
type (

View File

@@ -6,7 +6,7 @@ import (
"net"
"time"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/task"
)
type UDP struct {

View File

@@ -3,7 +3,7 @@ package pkg
import (
"context"
"log/slog"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/task"
"slices"
)

View File

@@ -6,8 +6,8 @@ import (
"github.com/deepch/vdk/codec/h264parser"
"github.com/deepch/vdk/codec/h265parser"
"io"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
"time"
)

View File

@@ -1,7 +1,7 @@
package pkg
import (
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
type RingReader struct {

View File

@@ -5,8 +5,8 @@ import (
"sync"
"time"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/task"
"m7s.live/v5/pkg/util"
)
type RingWriter struct {

View File

@@ -10,7 +10,7 @@ import (
"sync"
"sync/atomic"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
var idG atomic.Uint32

View File

@@ -3,7 +3,7 @@ package task
import (
"errors"
. "m7s.live/m7s/v5/pkg/util"
. "m7s.live/v5/pkg/util"
)
var ErrExist = errors.New("exist")

View File

@@ -12,7 +12,7 @@ import (
"sync"
"time"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
const TraceLevel = slog.Level(-8)

View File

@@ -6,11 +6,11 @@ import (
"reflect"
"time"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/config"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/config"
"m7s.live/v5/pkg/task"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
type (

View File

@@ -13,7 +13,7 @@ import (
"runtime"
"strings"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/task"
"github.com/quic-go/quic-go"
@@ -22,10 +22,10 @@ import (
"google.golang.org/grpc"
"gopkg.in/yaml.v3"
"gorm.io/gorm"
. "m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/config"
"m7s.live/m7s/v5/pkg/db"
"m7s.live/m7s/v5/pkg/util"
. "m7s.live/v5/pkg"
"m7s.live/v5/pkg/config"
"m7s.live/v5/pkg/db"
"m7s.live/v5/pkg/util"
)
type (

View File

@@ -3,10 +3,10 @@ package plugin_cascade
import (
"crypto/tls"
"fmt"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/config"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/m7s/v5/plugin/cascade/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg/config"
"m7s.live/v5/pkg/task"
"m7s.live/v5/plugin/cascade/pkg"
"time"
"github.com/quic-go/quic-go"

View File

@@ -1,7 +1,7 @@
package cascade
import (
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
var ENDFLAG = []byte{0}

View File

@@ -8,7 +8,7 @@ import (
"github.com/gobwas/ws"
"github.com/gobwas/ws/wsutil"
"github.com/quic-go/quic-go"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/task"
)
type Http2Quic struct {

View File

@@ -4,8 +4,8 @@ import (
"fmt"
"github.com/quic-go/quic-go"
"m7s.live/m7s/v5"
flv "m7s.live/m7s/v5/plugin/flv/pkg"
"m7s.live/v5"
flv "m7s.live/v5/plugin/flv/pkg"
)
type Puller struct {

View File

@@ -4,9 +4,9 @@ import (
"bufio"
"context"
"io"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/task"
flv "m7s.live/m7s/v5/plugin/flv/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg/task"
flv "m7s.live/v5/plugin/flv/pkg"
"net"
"net/http"
"strings"

View File

@@ -6,11 +6,11 @@ import (
"strconv"
"strings"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5"
"m7s.live/v5/pkg/task"
"github.com/quic-go/quic-go"
cascade "m7s.live/m7s/v5/plugin/cascade/pkg"
cascade "m7s.live/v5/plugin/cascade/pkg"
)
type CascadeServerPlugin struct {

View File

@@ -9,8 +9,8 @@ import (
"fmt"
"github.com/quic-go/quic-go"
"io"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5"
"m7s.live/v5/pkg/task"
"net"
"net/http"
"os"

View File

@@ -5,7 +5,7 @@ import (
"github.com/go-delve/delve/pkg/config"
"github.com/go-delve/delve/service/debugger"
"io"
"m7s.live/m7s/v5"
"m7s.live/v5"
"net/http"
"net/http/pprof"
"os"

View File

@@ -5,9 +5,9 @@ import (
"encoding/binary"
"io"
"io/fs"
"m7s.live/m7s/v5/pkg/util"
flv "m7s.live/m7s/v5/plugin/flv/pkg"
rtmp "m7s.live/m7s/v5/plugin/rtmp/pkg"
"m7s.live/v5/pkg/util"
flv "m7s.live/v5/plugin/flv/pkg"
rtmp "m7s.live/v5/plugin/rtmp/pkg"
"net/http"
"os"
"path/filepath"

View File

@@ -6,10 +6,10 @@ import (
"strings"
"time"
"m7s.live/m7s/v5"
"m7s.live/v5"
"m7s.live/m7s/v5/pkg/task"
. "m7s.live/m7s/v5/plugin/flv/pkg"
"m7s.live/v5/pkg/task"
. "m7s.live/v5/plugin/flv/pkg"
)
type FLVPlugin struct {

View File

@@ -1,7 +1,7 @@
package flv
import (
"m7s.live/m7s/v5"
"m7s.live/v5"
)
type FLVDevice = m7s.HTTPDevice

View File

@@ -4,8 +4,8 @@ import (
"errors"
"fmt"
"io"
"m7s.live/m7s/v5/pkg/util"
rtmp "m7s.live/m7s/v5/plugin/rtmp/pkg"
"m7s.live/v5/pkg/util"
rtmp "m7s.live/v5/plugin/rtmp/pkg"
)
func Echo(r io.Reader) (err error) {

View File

@@ -3,7 +3,7 @@ package flv
import (
"errors"
"io"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
"net"
"os"
"testing"

View File

@@ -5,8 +5,8 @@ import (
"io"
"net"
"m7s.live/m7s/v5/pkg/util"
rtmp "m7s.live/m7s/v5/plugin/rtmp/pkg"
"m7s.live/v5/pkg/util"
rtmp "m7s.live/v5/plugin/rtmp/pkg"
)
const (

View File

@@ -2,9 +2,9 @@ package flv
import (
"encoding/binary"
"m7s.live/m7s/v5"
. "m7s.live/m7s/v5/pkg"
rtmp "m7s.live/m7s/v5/plugin/rtmp/pkg"
"m7s.live/v5"
. "m7s.live/v5/pkg"
rtmp "m7s.live/v5/plugin/rtmp/pkg"
"net"
)

View File

@@ -2,12 +2,12 @@ package flv
import (
"errors"
"m7s.live/m7s/v5/pkg/config"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/config"
"m7s.live/v5/pkg/task"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/util"
rtmp "m7s.live/m7s/v5/plugin/rtmp/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg/util"
rtmp "m7s.live/v5/plugin/rtmp/pkg"
)
type Puller struct {

View File

@@ -8,11 +8,11 @@ import (
"slices"
"time"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/m7s/v5/pkg/util"
rtmp "m7s.live/m7s/v5/plugin/rtmp/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg"
"m7s.live/v5/pkg/task"
"m7s.live/v5/pkg/util"
rtmp "m7s.live/v5/plugin/rtmp/pkg"
)
type WriteFlvMetaTagQueueTask struct {

View File

@@ -5,7 +5,7 @@ import (
"context"
"io"
"io/fs"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
"os"
"path/filepath"
"strings"

View File

@@ -9,10 +9,10 @@ import (
"google.golang.org/protobuf/types/known/emptypb"
"google.golang.org/protobuf/types/known/timestamppb"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/m7s/v5/plugin/gb28181/pb"
gb28181 "m7s.live/m7s/v5/plugin/gb28181/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg/util"
"m7s.live/v5/plugin/gb28181/pb"
gb28181 "m7s.live/v5/plugin/gb28181/pkg"
)
func (gb *GB28181Plugin) List(context.Context, *emptypb.Empty) (ret *pb.ResponseList, err error) {

View File

@@ -5,9 +5,9 @@ import (
"sync/atomic"
"time"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/util"
gb28181 "m7s.live/m7s/v5/plugin/gb28181/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg/util"
gb28181 "m7s.live/v5/plugin/gb28181/pkg"
)
type RecordRequest struct {

View File

@@ -7,10 +7,10 @@ import (
"github.com/emiago/sipgo"
"github.com/emiago/sipgo/sip"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/m7s/v5/pkg/util"
gb28181 "m7s.live/m7s/v5/plugin/gb28181/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg/task"
"m7s.live/v5/pkg/util"
gb28181 "m7s.live/v5/plugin/gb28181/pkg"
)
type DeviceStatus string

View File

@@ -7,10 +7,10 @@ import (
"github.com/emiago/sipgo"
"github.com/emiago/sipgo/sip"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/m7s/v5/pkg/util"
gb28181 "m7s.live/m7s/v5/plugin/gb28181/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg/task"
"m7s.live/v5/pkg/util"
gb28181 "m7s.live/v5/plugin/gb28181/pkg"
)
type Dialog struct {

View File

@@ -19,12 +19,12 @@ import (
"github.com/icholy/digest"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/config"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/m7s/v5/plugin/gb28181/pb"
gb28181 "m7s.live/m7s/v5/plugin/gb28181/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg/config"
"m7s.live/v5/pkg/task"
"m7s.live/v5/pkg/util"
"m7s.live/v5/plugin/gb28181/pb"
gb28181 "m7s.live/v5/plugin/gb28181/pkg"
)
type SipConfig struct {

View File

@@ -2,10 +2,10 @@ package gb28181
import (
"io"
"m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
mpegts "m7s.live/m7s/v5/plugin/hls/pkg/ts"
"m7s.live/v5/pkg"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
mpegts "m7s.live/v5/plugin/hls/pkg/ts"
"time"
)

View File

@@ -5,11 +5,11 @@ import (
"os"
"github.com/pion/rtp"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/m7s/v5/pkg/util"
rtp2 "m7s.live/m7s/v5/plugin/rtp/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg"
"m7s.live/v5/pkg/task"
"m7s.live/v5/pkg/util"
rtp2 "m7s.live/v5/plugin/rtp/pkg"
)
const (

View File

@@ -2,10 +2,10 @@ package gb28181
import (
"io"
"m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
mpegts "m7s.live/m7s/v5/plugin/hls/pkg/ts"
"m7s.live/v5/pkg"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
mpegts "m7s.live/v5/plugin/hls/pkg/ts"
"time"
)

View File

@@ -5,7 +5,7 @@ import (
"errors"
"io"
"io/ioutil"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
//"sync"
)

View File

@@ -5,7 +5,7 @@ import (
"errors"
"fmt"
"io"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
// ios13818-1-CN.pdf 43(57)/166

View File

@@ -3,7 +3,7 @@ package mpegts
import (
"errors"
"io"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
"net"
)

View File

@@ -3,8 +3,8 @@ package mpegts
import (
"bytes"
"io"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
"net"
)

View File

@@ -4,7 +4,7 @@ import (
"errors"
"fmt"
"io"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
//

View File

@@ -9,8 +9,8 @@ import (
"github.com/phsym/console-slog"
"google.golang.org/protobuf/types/known/emptypb"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/m7s/v5/plugin/logrotate/pb"
"m7s.live/v5/pkg/util"
"m7s.live/v5/plugin/logrotate/pb"
)
func (h *LogRotatePlugin) List(context.Context, *emptypb.Empty) (*pb.ResponseFileInfo, error) {

View File

@@ -7,9 +7,9 @@ import (
"github.com/alchemy/rotoslog"
"github.com/phsym/console-slog"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/plugin/logrotate/pb"
"m7s.live/v5"
"m7s.live/v5/pkg"
"m7s.live/v5/plugin/logrotate/pb"
)
type LogRotatePlugin struct {

View File

@@ -5,8 +5,8 @@ import (
"errors"
"google.golang.org/protobuf/types/known/emptypb"
"google.golang.org/protobuf/types/known/timestamppb"
"m7s.live/m7s/v5/plugin/monitor/pb"
monitor "m7s.live/m7s/v5/plugin/monitor/pkg"
"m7s.live/v5/plugin/monitor/pb"
monitor "m7s.live/v5/plugin/monitor/pkg"
"slices"
)

View File

@@ -2,10 +2,10 @@ package plugin_monitor
import (
"encoding/json"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/m7s/v5/plugin/monitor/pb"
monitor "m7s.live/m7s/v5/plugin/monitor/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg/task"
"m7s.live/v5/plugin/monitor/pb"
monitor "m7s.live/v5/plugin/monitor/pkg"
"os"
"strings"
"time"

View File

@@ -5,17 +5,17 @@ import (
"fmt"
"google.golang.org/protobuf/types/known/timestamppb"
"io"
"m7s.live/m7s/v5/plugin/mp4/pb"
"m7s.live/v5/plugin/mp4/pb"
"net/http"
"os"
"path/filepath"
"strings"
"time"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/util"
mp4 "m7s.live/m7s/v5/plugin/mp4/pkg"
"m7s.live/m7s/v5/plugin/mp4/pkg/box"
"m7s.live/v5"
"m7s.live/v5/pkg/util"
mp4 "m7s.live/v5/plugin/mp4/pkg"
"m7s.live/v5/plugin/mp4/pkg/box"
)
type ContentPart struct {

View File

@@ -8,13 +8,13 @@ import (
"time"
"github.com/Eyevinn/mp4ff/mp4"
"m7s.live/m7s/v5"
v5 "m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/m7s/v5/plugin/mp4/pb"
pkg "m7s.live/m7s/v5/plugin/mp4/pkg"
rtmp "m7s.live/m7s/v5/plugin/rtmp/pkg"
"m7s.live/v5"
v5 "m7s.live/v5/pkg"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
"m7s.live/v5/plugin/mp4/pb"
pkg "m7s.live/v5/plugin/mp4/pkg"
rtmp "m7s.live/v5/plugin/rtmp/pkg"
)
type MediaContext struct {

View File

@@ -6,7 +6,7 @@ import (
"time"
"github.com/yapingcat/gomedia/go-codec"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
// aligned(8) class MediaHeaderBox extends FullBox(mdhd, version, 0) {

View File

@@ -5,7 +5,7 @@ import (
"io"
"time"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
// aligned(8) class TrackHeaderBox

View File

@@ -6,7 +6,7 @@ import (
"io"
"slices"
. "m7s.live/m7s/v5/plugin/mp4/pkg/box"
. "m7s.live/v5/plugin/mp4/pkg/box"
)
type (

View File

@@ -6,7 +6,7 @@ import (
"io"
"os"
. "m7s.live/m7s/v5/plugin/mp4/pkg/box"
. "m7s.live/v5/plugin/mp4/pkg/box"
)
const (

View File

@@ -7,11 +7,11 @@ import (
"time"
"github.com/deepch/vdk/codec/h265parser"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/m7s/v5/plugin/mp4/pkg/box"
rtmp "m7s.live/m7s/v5/plugin/rtmp/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
"m7s.live/v5/plugin/mp4/pkg/box"
rtmp "m7s.live/v5/plugin/rtmp/pkg"
)
type HTTPReader struct {

View File

@@ -8,12 +8,12 @@ import (
"time"
"github.com/deepch/vdk/codec/h265parser"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/config"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/m7s/v5/plugin/mp4/pkg/box"
rtmp "m7s.live/m7s/v5/plugin/rtmp/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/config"
"m7s.live/v5/pkg/util"
"m7s.live/v5/plugin/mp4/pkg/box"
rtmp "m7s.live/v5/plugin/rtmp/pkg"
)
type (

View File

@@ -7,12 +7,12 @@ import (
"path/filepath"
"time"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/m7s/v5/plugin/mp4/pkg/box"
rtmp "m7s.live/m7s/v5/plugin/rtmp/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/task"
"m7s.live/v5/plugin/mp4/pkg/box"
rtmp "m7s.live/v5/plugin/rtmp/pkg"
)
type WriteTrailerQueueTask struct {

View File

@@ -3,7 +3,7 @@ package mp4
import (
"io"
. "m7s.live/m7s/v5/plugin/mp4/pkg/box"
. "m7s.live/v5/plugin/mp4/pkg/box"
)
type (

View File

@@ -10,7 +10,7 @@ import (
"slices"
"strings"
"m7s.live/m7s/v5"
"m7s.live/v5"
)
//go:embed ui

View File

@@ -2,10 +2,10 @@ package plugin_rtmp
import (
"context"
gpb "m7s.live/m7s/v5/pb"
"m7s.live/m7s/v5/pkg/config"
"m7s.live/m7s/v5/plugin/rtmp/pb"
rtmp "m7s.live/m7s/v5/plugin/rtmp/pkg"
gpb "m7s.live/v5/pb"
"m7s.live/v5/pkg/config"
"m7s.live/v5/plugin/rtmp/pb"
rtmp "m7s.live/v5/plugin/rtmp/pkg"
)
func (r *RTMPPlugin) PushOut(ctx context.Context, req *pb.PushRequest) (res *gpb.SuccessResponse, err error) {

View File

@@ -5,10 +5,10 @@ import (
"io"
"net"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/m7s/v5/plugin/rtmp/pb"
. "m7s.live/m7s/v5/plugin/rtmp/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg/task"
"m7s.live/v5/plugin/rtmp/pb"
. "m7s.live/v5/plugin/rtmp/pkg"
)
type RTMPPlugin struct {

View File

@@ -10,7 +10,7 @@ import (
_ "google.golang.org/genproto/googleapis/api/annotations"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
pb "m7s.live/m7s/v5/pb"
pb "m7s.live/v5/pb"
reflect "reflect"
sync "sync"
)

View File

@@ -11,7 +11,7 @@ import (
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
pb "m7s.live/m7s/v5/pb"
pb "m7s.live/v5/pb"
)
// This is a compile-time assertion to ensure that this generated file

View File

@@ -5,7 +5,7 @@ import (
"io"
"reflect"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
// Action Message Format -- AMF 0

View File

@@ -2,9 +2,9 @@ package rtmp
import (
"github.com/deepch/vdk/codec/aacparser"
. "m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
. "m7s.live/v5/pkg"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
"time"
)

View File

@@ -3,7 +3,7 @@ package rtmp
import (
"encoding/binary"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
// RTMP协议中基本的数据单元称为消息(Message).

View File

@@ -3,13 +3,13 @@ package rtmp
import (
"crypto/tls"
"errors"
"m7s.live/m7s/v5/pkg/config"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/config"
"m7s.live/v5/pkg/task"
"net"
"net/url"
"strings"
"m7s.live/m7s/v5"
"m7s.live/v5"
)
func (c *Client) Start() (err error) {

View File

@@ -5,8 +5,8 @@ import (
"fmt"
"io"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
)
type (

View File

@@ -6,7 +6,7 @@ import (
"io"
"time"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
const (

View File

@@ -11,7 +11,7 @@ import (
"net"
"time"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
const (

View File

@@ -5,7 +5,7 @@ import (
"errors"
"strings"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
// https://zhuanlan.zhihu.com/p/196743129

View File

@@ -6,10 +6,10 @@ import (
"runtime"
"sync/atomic"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5"
"m7s.live/v5/pkg/task"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
)
const (

View File

@@ -1,7 +1,7 @@
package rtmp
import (
"m7s.live/m7s/v5"
"m7s.live/v5"
)
type NetStream struct {

View File

@@ -2,10 +2,10 @@ package rtmp
import (
"errors"
"m7s.live/m7s/v5/pkg"
"m7s.live/v5/pkg"
"runtime"
"m7s.live/m7s/v5"
"m7s.live/v5"
)
type Sender struct {

View File

@@ -8,9 +8,9 @@ import (
"github.com/deepch/vdk/codec/h264parser"
"github.com/deepch/vdk/codec/h265parser"
. "m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
. "m7s.live/v5/pkg"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
)
var _ IAVFrame = (*RTMPVideo)(nil)

View File

@@ -15,9 +15,9 @@ import (
"github.com/pion/rtp"
"github.com/pion/webrtc/v3"
. "m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
. "m7s.live/v5/pkg"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
)
type RTPData struct {

View File

@@ -4,7 +4,7 @@ import (
"bufio"
"encoding/binary"
"io"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
"net"
)

View File

@@ -12,9 +12,9 @@ import (
"github.com/pion/rtp"
"github.com/pion/webrtc/v3"
. "m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/codec"
"m7s.live/m7s/v5/pkg/util"
. "m7s.live/v5/pkg"
"m7s.live/v5/pkg/codec"
"m7s.live/v5/pkg/util"
)
type (

View File

@@ -4,8 +4,8 @@ import (
"testing"
"github.com/pion/webrtc/v3"
"m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg"
"m7s.live/v5/pkg/util"
)
func TestRTPH264Ctx_CreateFrame(t *testing.T) {

View File

@@ -3,9 +3,9 @@ package plugin_rtsp
import (
"time"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/util"
. "m7s.live/m7s/v5/plugin/rtsp/pkg"
"m7s.live/v5"
"m7s.live/v5/pkg/util"
. "m7s.live/v5/plugin/rtsp/pkg"
)
type RTSPDevice struct {

View File

@@ -3,10 +3,10 @@ package plugin_rtsp
import (
"net"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/task"
"m7s.live/m7s/v5"
. "m7s.live/m7s/v5/plugin/rtsp/pkg"
"m7s.live/v5"
. "m7s.live/v5/plugin/rtsp/pkg"
)
const defaultConfig = m7s.DefaultYaml(`tcp:

View File

@@ -1,10 +1,10 @@
package rtsp
import (
"m7s.live/m7s/v5/pkg/config"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/config"
"m7s.live/v5/pkg/task"
"m7s.live/m7s/v5"
"m7s.live/v5"
)
const (

View File

@@ -12,10 +12,10 @@ import (
"sync/atomic"
"time"
"m7s.live/m7s/v5/pkg/task"
"m7s.live/v5/pkg/task"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5"
"m7s.live/v5/pkg/util"
)
const Timeout = time.Second * 10

View File

@@ -3,7 +3,7 @@ package rtsp
import (
"errors"
"fmt"
"m7s.live/m7s/v5/pkg/util"
"m7s.live/v5/pkg/util"
"net/http"
"strconv"
"strings"

View File

@@ -5,8 +5,8 @@ import (
"github.com/pion/rtcp"
"github.com/pion/rtp"
"github.com/pion/webrtc/v3"
"m7s.live/m7s/v5"
mrtp "m7s.live/m7s/v5/plugin/rtp/pkg"
"m7s.live/v5"
mrtp "m7s.live/v5/plugin/rtp/pkg"
"reflect"
)

View File

@@ -7,8 +7,8 @@ import (
"strconv"
"strings"
"m7s.live/m7s/v5/pkg/util"
. "m7s.live/m7s/v5/plugin/rtsp/pkg"
"m7s.live/v5/pkg/util"
. "m7s.live/v5/plugin/rtsp/pkg"
)
type RTSPServer struct {

View File

@@ -4,11 +4,11 @@ import (
"context"
"errors"
globalPB "m7s.live/m7s/v5/pb"
"m7s.live/m7s/v5/pkg"
"m7s.live/m7s/v5/pkg/config"
pb "m7s.live/m7s/v5/plugin/sei/pb"
sei "m7s.live/m7s/v5/plugin/sei/pkg"
globalPB "m7s.live/v5/pb"
"m7s.live/v5/pkg"
"m7s.live/v5/pkg/config"
pb "m7s.live/v5/plugin/sei/pb"
sei "m7s.live/v5/plugin/sei/pkg"
)
func (conf *SEIPlugin) Insert(ctx context.Context, req *pb.InsertRequest) (*globalPB.SuccessResponse, error) {

View File

@@ -1,9 +1,9 @@
package plugin_sei
import (
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/plugin/sei/pb"
sei "m7s.live/m7s/v5/plugin/sei/pkg"
"m7s.live/v5"
"m7s.live/v5/plugin/sei/pb"
sei "m7s.live/v5/plugin/sei/pkg"
)
var _ = m7s.InstallPlugin[SEIPlugin](sei.NewTransform, pb.RegisterApiServer, &pb.Api_ServiceDesc)

Some files were not shown because too many files have changed in this diff Show More