Skip to content

Commit

Permalink
Merge pull request #90 from GNURub/fixed_example_readme
Browse files Browse the repository at this point in the history
Fixed example readme
  • Loading branch information
gwuhaolin committed Apr 15, 2020
2 parents 66b0d00 + 8f955ee commit 21175a2
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -2,6 +2,6 @@
.idea
dist
.vscode
.tmp
tmp
vendor
livego
7 changes: 4 additions & 3 deletions README.md
Expand Up @@ -20,7 +20,7 @@ Simple and efficient live broadcast server:
#### Supported encoding formats
- H264
- AAC
- sMP3
- MP3

## Installation
After directly downloading the compiled [binary file](https://github.com/gwuhaolin/livego/releases), execute it on the command line.
Expand Down Expand Up @@ -48,8 +48,9 @@ Usage of ./livego:
--write_timeout int write time out (default 10)
```
2. Start the service: execute the livego binary file or `make run` to start the livego service;
3. Upstream push: Push the video stream to `rtmp://localhost:1935/live/movie` through the` RTMP` protocol, for example, use `ffmpeg -re -i demo.flv -c copy -f flv rtmp://localhost:1935/live/movie` push;
4. Downstream playback: The following three playback protocols are supported, and the playback address is as follows:
3. Get a channelkey `curl http://localhost:8090/control/get?room=movie` and copy data like your channelkey.
4. Upstream push: Push the video stream to `rtmp://localhost:1935/live/movie`(`rtmp://localhost:1935/{appname}/{channelkey}`) through the` RTMP` protocol, for example, use `ffmpeg -re -i demo.flv -c copy -f flv rtmp://localhost:1935/live/movie` push;
5. Downstream playback: The following three playback protocols are supported, and the playback address is as follows:
-`RTMP`:`rtmp://localhost:1935/live/movie`
-`FLV`:`http://127.0.0.1:7001/live/movie.flv`
-`HLS`:`http://127.0.0.1:7002/live/movie.m3u8`
Expand Down
4 changes: 2 additions & 2 deletions configure/liveconfig.go
Expand Up @@ -65,7 +65,7 @@ var defaultConf = ServerCfg{
ReadTimeout: 10,
GopNum: 1,
Server: []Application{{
Appname: "livego",
Appname: "live",
Live: true,
Hls: true,
StaticPush: nil,
Expand Down Expand Up @@ -108,7 +108,7 @@ func LoadConfig() {
Config.AddConfigPath(".")
err := Config.ReadInConfig()
if err != nil {
log.Error(err)
log.Warning(err)
log.Info("Using default config")
}

Expand Down
2 changes: 1 addition & 1 deletion livego.yaml
Expand Up @@ -17,6 +17,6 @@
# api_addr: ":8090"

server:
- appname: livego
- appname: live
live: true
hls: true

0 comments on commit 21175a2

Please sign in to comment.