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

Update urls

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

11
README.md
Unescape View File

@ -4,8 +4,8 @@
[中文](./README_cn.md) [中文](./README_cn.md)
[![Test](https://github.com/gwuhaolin/livego/workflows/Test/badge.svg)](https://github.com/gwuhaolin/livego/actions?query=workflow%3ATest) [![Test](https://github.com/dudebing99/livego/workflows/Test/badge.svg)](https://github.com/dudebing99/livego/actions?query=workflow%3ATest)
[![Release](https://github.com/gwuhaolin/livego/workflows/Release/badge.svg)](https://github.com/gwuhaolin/livego/actions?query=workflow%3ARelease) [![Release](https://github.com/dudebing99/livego/workflows/Release/badge.svg)](https://github.com/dudebing99/livego/actions?query=workflow%3ARelease)
Simple and efficient live broadcast server: Simple and efficient live broadcast server:
- Very simple to install and use; - Very simple to install and use;
@ -28,7 +28,7 @@ Simple and efficient live broadcast server:
- MP3 - MP3
## Installation ## Installation
After directly downloading the compiled [binary file](https://github.com/gwuhaolin/livego/releases), execute it on the command line. After directly downloading the compiled [binary file](https://github.com/dudebing99/livego/releases), execute it on the command line.
#### Boot from Docker #### Boot from Docker
Run `docker run -p 1935:1935 -p 7001:7001 -p 7002:7002 -p 8090:8090 -d gwuhaolin/livego` to start Run `docker run -p 1935:1935 -p 7001:7001 -p 7002:7002 -p 8090:8090 -d gwuhaolin/livego` to start
@ -45,8 +45,8 @@ Run `docker run -p 1935:1935 -p 7001:7001 -p 7002:7002 -p 8090:8090 -d gwuhaolin
- `RTMP`:`rtmp://localhost:1935/{appname}/movie` - `RTMP`:`rtmp://localhost:1935/{appname}/movie`
- `FLV`:`http://127.0.0.1:7001/{appname}/movie.flv` - `FLV`:`http://127.0.0.1:7001/{appname}/movie.flv`
- `HLS`:`http://127.0.0.1:7002/{appname}/movie.m3u8` - `HLS`:`http://127.0.0.1:7002/{appname}/movie.m3u8`
all options: all options:
```bash ```bash
./livego -h ./livego -h
Usage of ./livego: Usage of ./livego:
@ -64,4 +64,3 @@ Usage of ./livego:
### [Use with flv.js](https://github.com/gwuhaolin/blog/issues/3) ### [Use with flv.js](https://github.com/gwuhaolin/blog/issues/3)
Interested in Golang? Please see [Golang Chinese Learning Materials Summary](http://go.wuhaolin.cn/)

10
README_cn.md
Unescape View File

@ -2,8 +2,8 @@
<img src='./logo.png' width='200px' height='80px'/> <img src='./logo.png' width='200px' height='80px'/>
</p> </p>
[![Test](https://github.com/gwuhaolin/livego/workflows/Test/badge.svg)](https://github.com/gwuhaolin/livego/actions?query=workflow%3ATest) [![Test](https://github.com/dudebing99/livego/workflows/Test/badge.svg)](https://github.com/dudebing99/livego/actions?query=workflow%3ATest)
[![Release](https://github.com/gwuhaolin/livego/workflows/Release/badge.svg)](https://github.com/gwuhaolin/livego/actions?query=workflow%3ARelease) [![Release](https://github.com/dudebing99/livego/workflows/Release/badge.svg)](https://github.com/dudebing99/livego/actions?query=workflow%3ARelease)
简单高效的直播服务器： 简单高效的直播服务器：
- 安装和使用非常简单； - 安装和使用非常简单；
@ -26,7 +26,7 @@
- MP3 - MP3
## 安装 ## 安装
直接下载编译好的[二进制文件](https://github.com/gwuhaolin/livego/releases)后，在命令行中执行。 直接下载编译好的[二进制文件](https://github.com/dudebing99/livego/releases)后，在命令行中执行。
#### 从 Docker 启动 #### 从 Docker 启动
执行`docker run -p 1935:1935 -p 7001:7001 -p 7002:7002 -p 8090:8090 -d gwuhaolin/livego`启动 执行`docker run -p 1935:1935 -p 7001:7001 -p 7002:7002 -p 8090:8090 -d gwuhaolin/livego`启动
@ -44,7 +44,7 @@
- `FLV`:`http://127.0.0.1:7001/{appname}/movie.flv` - `FLV`:`http://127.0.0.1:7001/{appname}/movie.flv`
- `HLS`:`http://127.0.0.1:7002/{appname}/movie.m3u8` - `HLS`:`http://127.0.0.1:7002/{appname}/movie.m3u8`
所有配置项: 所有配置项:
```bash ```bash
./livego -h ./livego -h
Usage of ./livego: Usage of ./livego:
@ -63,5 +63,3 @@ Usage of ./livego:
### [和 flv.js 搭配使用](https://github.com/gwuhaolin/blog/issues/3) ### [和 flv.js 搭配使用](https://github.com/gwuhaolin/blog/issues/3)
对Golang感兴趣？请看[Golang 中文学习资料汇总](http://go.wuhaolin.cn/)

2
configure/channel.go
Unescape View File

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

2
container/flv/demuxer.go
Unescape View File

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

10
container/flv/muxer.go
Unescape View File

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

2
container/flv/tag.go
Unescape View File

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

2
container/ts/muxer.go
Unescape View File

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

2
container/ts/muxer_test.go
Unescape View File

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

3
go.mod
Unescape View File

@ -1,4 +1,4 @@
module github.com/gwuhaolin/livego module github.com/dudebing99/livego
go 1.13 go 1.13
@ -13,6 +13,7 @@ require (
github.com/sirupsen/logrus v1.5.0 github.com/sirupsen/logrus v1.5.0
github.com/spf13/pflag v1.0.3 github.com/spf13/pflag v1.0.3
github.com/spf13/viper v1.6.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/stretchr/testify v1.4.0
github.com/urfave/negroni v1.0.0 // indirect github.com/urfave/negroni v1.0.0 // indirect
) )

10
main.go
Unescape View File

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

2
parser/aac/parser.go
Unescape View File

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

8
parser/parser.go
Unescape View File

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

8
protocol/api/api.go
Unescape View File

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

4
protocol/hls/hls.go
Unescape View File

@ -10,9 +10,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/gwuhaolin/livego/configure" "github.com/dudebing99/livego/configure"
"github.com/gwuhaolin/livego/av" "github.com/dudebing99/livego/av"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )

10
protocol/hls/source.go
Unescape View File

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

4
protocol/httpflv/server.go
Unescape View File

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

8
protocol/httpflv/writer.go
Unescape View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

10
protocol/rtmp/rtmp.go
Unescape View File

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

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

@ -3,11 +3,11 @@ package rtmprelay
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/gwuhaolin/livego/av" "github.com/dudebing99/livego/av"
"io" "io"
"github.com/gwuhaolin/livego/protocol/amf" "github.com/dudebing99/livego/protocol/amf"
"github.com/gwuhaolin/livego/protocol/rtmp/core" "github.com/dudebing99/livego/protocol/rtmp/core"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )

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

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

6
protocol/rtmp/stream.go
Unescape View File

@ -6,9 +6,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/gwuhaolin/livego/av" "github.com/dudebing99/livego/av"
"github.com/gwuhaolin/livego/protocol/rtmp/cache" "github.com/dudebing99/livego/protocol/rtmp/cache"
"github.com/gwuhaolin/livego/protocol/rtmp/rtmprelay" "github.com/dudebing99/livego/protocol/rtmp/rtmprelay"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )

2
utils/queue/queue.go
Unescape View File

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

Write Preview
Loading…
Cancel
Save