diff --git a/.gitignore b/.gitignore index 3e26a3b7..e8cf600e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,6 @@ .idea dist .vscode -.tmp +tmp vendor livego diff --git a/README.md b/README.md index 15cdfc25..57a260bd 100644 --- a/README.md +++ b/README.md @@ -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. @@ -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` diff --git a/configure/liveconfig.go b/configure/liveconfig.go index de2e49bb..9df3143f 100644 --- a/configure/liveconfig.go +++ b/configure/liveconfig.go @@ -65,7 +65,7 @@ var defaultConf = ServerCfg{ ReadTimeout: 10, GopNum: 1, Server: []Application{{ - Appname: "livego", + Appname: "live", Live: true, Hls: true, StaticPush: nil, @@ -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") } diff --git a/livego.yaml b/livego.yaml index 8a034de3..53c65035 100644 --- a/livego.yaml +++ b/livego.yaml @@ -17,6 +17,6 @@ # api_addr: ":8090" server: -- appname: livego +- appname: live live: true hls: true