pimhwang
/
livego
mirror of https://github.com/gwuhaolin/livego.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Refactor imports and module name

pull/100/head
Dmitry Kravtsov 5 years ago
parent
8c30a7a93f
commit
3032dcec1a
30 changed files with 69 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      configure/channel.go
  2. 2
      container/flv/demuxer.go
  3. 10
      container/flv/muxer.go
  4. 2
      container/flv/tag.go
  5. 2
      container/ts/muxer.go
  6. 2
      container/ts/muxer_test.go
  7. 3
      go.mod
  8. 10
      main.go
  9. 2
      parser/aac/parser.go
  10. 8
      parser/parser.go
  11. 8
      protocol/api/api.go
  12. 4
      protocol/hls/hls.go
  13. 10
      protocol/hls/source.go
  14. 4
      protocol/httpflv/server.go
  15. 8
      protocol/httpflv/writer.go
  16. 4
      protocol/rtmp/cache/cache.go
  17. 2
      protocol/rtmp/cache/gop.go
  18. 4
      protocol/rtmp/cache/special.go
  19. 4
      protocol/rtmp/core/chunk_stream.go
  20. 2
      protocol/rtmp/core/chunk_stream_test.go
  21. 4
      protocol/rtmp/core/conn.go
  22. 4
      protocol/rtmp/core/conn_client.go
  23. 4
      protocol/rtmp/core/conn_server.go
  24. 2
      protocol/rtmp/core/conn_test.go
  25. 2
      protocol/rtmp/core/handshake.go
  26. 10
      protocol/rtmp/rtmp.go
  27. 4
      protocol/rtmp/rtmprelay/rtmprelay.go
  28. 6
      protocol/rtmp/rtmprelay/staticrelay.go
  29. 6
      protocol/rtmp/stream.go
  30. 2
      utils/queue/queue.go

2
configure/channel.go
Unescape View File

@ -3,7 +3,7 @@ package configure @@ -3,7 +3,7 @@ package configure
import (
"fmt"
"livego/utils/uid"
"github.com/gwuhaolin/livego/utils/uid"
"github.com/go-redis/redis/v7"
"github.com/patrickmn/go-cache"

2
container/flv/demuxer.go
Unescape View File

@ -2,7 +2,7 @@ package flv @@ -2,7 +2,7 @@ package flv
import (
"fmt"
"livego/av"
"github.com/gwuhaolin/livego/av"
)
var (

10
container/flv/muxer.go
Unescape View File

@ -7,11 +7,11 @@ import ( @@ -7,11 +7,11 @@ import (
"strings"
"time"
"livego/av"
"livego/configure"
"livego/protocol/amf"
"livego/utils/pio"
"livego/utils/uid"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/configure"
"github.com/gwuhaolin/livego/protocol/amf"
"github.com/gwuhaolin/livego/utils/pio"
"github.com/gwuhaolin/livego/utils/uid"
log "github.com/sirupsen/logrus"
)

2
container/flv/tag.go
Unescape View File

@ -3,7 +3,7 @@ package flv @@ -3,7 +3,7 @@ package flv
import (
"fmt"
"livego/av"
"github.com/gwuhaolin/livego/av"
)
type flvTag struct {

2
container/ts/muxer.go
Unescape View File

@ -3,7 +3,7 @@ package ts @@ -3,7 +3,7 @@ package ts
import (
"io"
"livego/av"
"github.com/gwuhaolin/livego/av"
)
const (

2
container/ts/muxer_test.go
Unescape View File

@ -3,7 +3,7 @@ package ts @@ -3,7 +3,7 @@ package ts
import (
"testing"
"livego/av"
"github.com/gwuhaolin/livego/av"
"github.com/stretchr/testify/assert"
)

3
go.mod
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
module livego
module github.com/gwuhaolin/livego
go 1.13
@ -14,6 +14,7 @@ require ( @@ -14,6 +14,7 @@ require (
github.com/sirupsen/logrus v1.5.0
github.com/spf13/pflag v1.0.3
github.com/spf13/viper v1.6.3
github.com/stretchr/objx v0.1.1 // indirect
github.com/stretchr/testify v1.4.0
github.com/urfave/negroni v1.0.0 // indirect
)

10
main.go
Unescape View File

@ -2,11 +2,11 @@ package main @@ -2,11 +2,11 @@ package main
import (
"fmt"
"livego/configure"
"livego/protocol/api"
"livego/protocol/hls"
"livego/protocol/httpflv"
"livego/protocol/rtmp"
"github.com/gwuhaolin/livego/configure"
"github.com/gwuhaolin/livego/protocol/api"
"github.com/gwuhaolin/livego/protocol/hls"
"github.com/gwuhaolin/livego/protocol/httpflv"
"github.com/gwuhaolin/livego/protocol/rtmp"
"net"
"path"
"runtime"

2
parser/aac/parser.go
Unescape View File

@ -4,7 +4,7 @@ import ( @@ -4,7 +4,7 @@ import (
"fmt"
"io"
"livego/av"
"github.com/gwuhaolin/livego/av"
)
type mpegExtension struct {

8
parser/parser.go
Unescape View File

@ -4,10 +4,10 @@ import ( @@ -4,10 +4,10 @@ import (
"fmt"
"io"
"livego/av"
"livego/parser/aac"
"livego/parser/h264"
"livego/parser/mp3"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/parser/aac"
"github.com/gwuhaolin/livego/parser/h264"
"github.com/gwuhaolin/livego/parser/mp3"
)
var (

8
protocol/api/api.go
Unescape View File

@ -6,10 +6,10 @@ import ( @@ -6,10 +6,10 @@ import (
"net"
"net/http"
"livego/av"
"livego/configure"
"livego/protocol/rtmp"
"livego/protocol/rtmp/rtmprelay"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/configure"
"github.com/gwuhaolin/livego/protocol/rtmp"
"github.com/gwuhaolin/livego/protocol/rtmp/rtmprelay"
jwtmiddleware "github.com/auth0/go-jwt-middleware"
"github.com/dgrijalva/jwt-go"

4
protocol/hls/hls.go
Unescape View File

@ -2,7 +2,7 @@ package hls @@ -2,7 +2,7 @@ package hls
import (
"fmt"
"livego/configure"
"github.com/gwuhaolin/livego/configure"
"net"
"net/http"
"path"
@ -10,7 +10,7 @@ import ( @@ -10,7 +10,7 @@ import (
"strings"
"time"
"livego/av"
"github.com/gwuhaolin/livego/av"
cmap "github.com/orcaman/concurrent-map"
log "github.com/sirupsen/logrus"

10
protocol/hls/source.go
Unescape View File

@ -3,13 +3,13 @@ package hls @@ -3,13 +3,13 @@ package hls
import (
"bytes"
"fmt"
"livego/configure"
"github.com/gwuhaolin/livego/configure"
"time"
"livego/av"
"livego/container/flv"
"livego/container/ts"
"livego/parser"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/container/flv"
"github.com/gwuhaolin/livego/container/ts"
"github.com/gwuhaolin/livego/parser"
log "github.com/sirupsen/logrus"
)

4
protocol/httpflv/server.go
Unescape View File

@ -6,8 +6,8 @@ import ( @@ -6,8 +6,8 @@ import (
"net/http"
"strings"
"livego/av"
"livego/protocol/rtmp"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/protocol/rtmp"
log "github.com/sirupsen/logrus"
)

8
protocol/httpflv/writer.go
Unescape View File

@ -5,10 +5,10 @@ import ( @@ -5,10 +5,10 @@ import (
"net/http"
"time"
"livego/av"
"livego/protocol/amf"
"livego/utils/pio"
"livego/utils/uid"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/protocol/amf"
"github.com/gwuhaolin/livego/utils/pio"
"github.com/gwuhaolin/livego/utils/uid"
log "github.com/sirupsen/logrus"
)

4
protocol/rtmp/cache/cache.go vendored
Unescape View File

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package cache
import (
"livego/av"
"livego/configure"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/configure"
)
type Cache struct {

2
protocol/rtmp/cache/gop.go vendored
Unescape View File

@ -3,7 +3,7 @@ package cache @@ -3,7 +3,7 @@ package cache
import (
"fmt"
"livego/av"
"github.com/gwuhaolin/livego/av"
)
var (

4
protocol/rtmp/cache/special.go vendored
Unescape View File

@ -3,8 +3,8 @@ package cache @@ -3,8 +3,8 @@ package cache
import (
"bytes"
"livego/av"
"livego/protocol/amf"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/protocol/amf"
log "github.com/sirupsen/logrus"
)

4
protocol/rtmp/core/chunk_stream.go
Unescape View File

@ -4,8 +4,8 @@ import ( @@ -4,8 +4,8 @@ import (
"encoding/binary"
"fmt"
"livego/av"
"livego/utils/pool"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/utils/pool"
)
type ChunkStream struct {

2
protocol/rtmp/core/chunk_stream_test.go
Unescape View File

@ -4,7 +4,7 @@ import ( @@ -4,7 +4,7 @@ import (
"bytes"
"testing"
"livego/utils/pool"
"github.com/gwuhaolin/livego/utils/pool"
"github.com/stretchr/testify/assert"
)

4
protocol/rtmp/core/conn.go
Unescape View File

@ -5,8 +5,8 @@ import ( @@ -5,8 +5,8 @@ import (
"net"
"time"
"livego/utils/pio"
"livego/utils/pool"
"github.com/gwuhaolin/livego/utils/pio"
"github.com/gwuhaolin/livego/utils/pool"
)
const (

4
protocol/rtmp/core/conn_client.go
Unescape View File

@ -9,8 +9,8 @@ import ( @@ -9,8 +9,8 @@ import (
neturl "net/url"
"strings"
"livego/av"
"livego/protocol/amf"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/protocol/amf"
log "github.com/sirupsen/logrus"
)

4
protocol/rtmp/core/conn_server.go
Unescape View File

@ -5,8 +5,8 @@ import ( @@ -5,8 +5,8 @@ import (
"fmt"
"io"
"livego/av"
"livego/protocol/amf"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/protocol/amf"
log "github.com/sirupsen/logrus"
)

2
protocol/rtmp/core/conn_test.go
Unescape View File

@ -5,7 +5,7 @@ import ( @@ -5,7 +5,7 @@ import (
"io"
"testing"
"livego/utils/pool"
"github.com/gwuhaolin/livego/utils/pool"
"github.com/stretchr/testify/assert"
)

2
protocol/rtmp/core/handshake.go
Unescape View File

@ -10,7 +10,7 @@ import ( @@ -10,7 +10,7 @@ import (
"time"
"livego/utils/pio"
"github.com/gwuhaolin/livego/utils/pio"
)
var (

10
protocol/rtmp/rtmp.go
Unescape View File

@ -8,12 +8,12 @@ import ( @@ -8,12 +8,12 @@ import (
"strings"
"time"
"livego/utils/uid"
"github.com/gwuhaolin/livego/utils/uid"
"livego/av"
"livego/configure"
"livego/container/flv"
"livego/protocol/rtmp/core"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/configure"
"github.com/gwuhaolin/livego/container/flv"
"github.com/gwuhaolin/livego/protocol/rtmp/core"
log "github.com/sirupsen/logrus"
)

4
protocol/rtmp/rtmprelay/rtmprelay.go
Unescape View File

@ -5,8 +5,8 @@ import ( @@ -5,8 +5,8 @@ import (
"fmt"
"io"
"livego/protocol/amf"
"livego/protocol/rtmp/core"
"github.com/gwuhaolin/livego/protocol/amf"
"github.com/gwuhaolin/livego/protocol/rtmp/core"
log "github.com/sirupsen/logrus"
)

6
protocol/rtmp/rtmprelay/staticrelay.go
Unescape View File

@ -4,9 +4,9 @@ import ( @@ -4,9 +4,9 @@ import (
"fmt"
"sync"
"livego/av"
"livego/configure"
"livego/protocol/rtmp/core"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/configure"
"github.com/gwuhaolin/livego/protocol/rtmp/core"
log "github.com/sirupsen/logrus"
)

6
protocol/rtmp/stream.go
Unescape View File

@ -5,9 +5,9 @@ import ( @@ -5,9 +5,9 @@ import (
"strings"
"time"
"livego/av"
"livego/protocol/rtmp/cache"
"livego/protocol/rtmp/rtmprelay"
"github.com/gwuhaolin/livego/av"
"github.com/gwuhaolin/livego/protocol/rtmp/cache"
"github.com/gwuhaolin/livego/protocol/rtmp/rtmprelay"
cmap "github.com/orcaman/concurrent-map"
log "github.com/sirupsen/logrus"

2
utils/queue/queue.go
Unescape View File

@ -3,7 +3,7 @@ package queue @@ -3,7 +3,7 @@ package queue
import (
"sync"
"livego/av"
"github.com/gwuhaolin/livego/av"
)
// Queue is a basic FIFO queue for Messages.

Write Preview
Loading…
Cancel
Save