8000 Merge pull request #90 from GNURub/fixed_example_readme · invisiblecoder99/livego@21175a2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 21175a2

Browse files
gwuhaolingwuhaolin
authored
Merge pull request gwuhaolin#90 from GNURub/fixed_example_readme
Fixed example readme
2 parents 66b0d00 + 8f955ee commit 21175a2

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
.idea
33
dist
44
.vscode
5-
.tmp
5+
tmp
66
vendor
77
livego

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Simple and efficient live broadcast server:
2020
#### Supported encoding formats
2121
- H264
2222
- AAC
23-
- sMP3
23+
- MP3
2424

2525
## Installation
2626
After directly downloading the compiled [binary file](https://github.com/gwuhaolin/livego/releases), execute it on the command line.
@@ -48,8 +48,9 @@ Usage of ./livego:
4848
--write_timeout int write time out (default 10)
4949
```
5050
2. Start the service: execute the livego binary file or `make run` to start the livego service;
51-
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;
52-
4. Downstream playback: The following three playback protocols are supported, and the playback address is as follows:
51+
3. Get a channelkey `curl http://localhost:8090/control/get?room=movie` and copy data like your channelkey.
52+
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;
53+
5. Downstream playback: The following three playback protocols are supported, and the playback address is as follows:
5354
-`RTMP`:`rtmp://localhost:1935/live/movie`
5455
-`FLV`:`http://127.0.0.1:7001/live/movie.flv`
5556
-`HLS`:`http://127.0.0.1:7002/live/movie.m3u8`

‎configure/liveconfig.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ var defaultConf = ServerCfg{
6565
ReadTimeout: 10,
6666
GopNum: 1,
6767
Server: []Application{{
68-
Appname: "livego",
68+
Appname: "live",
6969
Live: true,
7070
Hls: true,
7171
StaticPush: nil,
@@ -108,7 +108,7 @@ func LoadConfig() {
108108
Config.AddConfigPath(".")
109109
err := Config.ReadInConfig()
110110
if err != nil {
111-
log.Error(err)
111+
log.Warning(err)
112112
log.Info("Using default config")
113113
}
114114

‎livego.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
# api_addr: ":8090"
1818

1919
server:
20-
- appname: livego
20+
- appname: live
2121
live: true
2222
hls: true

0 commit comments

Comments
 (0)
0