diff --git a/cmd/revid-cli/main.go b/cmd/revid-cli/main.go index be94ae87..fd9aa8ee 100644 --- a/cmd/revid-cli/main.go +++ b/cmd/revid-cli/main.go @@ -98,13 +98,14 @@ func main() { cpuprofile := flag.String("cpuprofile", "", "write cpu profile to `file`") flagNames := [noOfConfigFlags]struct{ name, description string }{ - {"Input", "The input type"}, - {"InputCodec", "The codec of the input"}, - {"Output", "The output type"}, - {"RtmpMethod", "The method used to send over rtmp (ffmpeg or librtmp)"}, - {"Packetization", "The method of data packetisation"}, - {"QuantizationMode", "The level of quantization"}, - {"Verbosity", "Verbosity on or off"}, + {"Input", "The input type: Raspivid, File"}, + {"InputCodec", "The codec of the input: H264, Mjpeg"}, + {"Output", "The output type: Http, Rtmp, File"}, + {"RtmpMethod", "The method used to send over rtmp: Ffmpeg, Librtmp"}, + // NOTE: we add rtp here when we have this functionality + {"Packetization", "The method of data packetisation: Flv, Mpegts, None"}, + {"QuantizationMode", "Whether quantization if on or off (variable bitrate): On, Off"}, + {"Verbosity", "Verbosity: On, Off"}, {"FramesPerClip", "Number of frames per clip sent"}, {"RtmpUrl", "Url of rtmp endpoint"}, {"Bitrate", "Bitrate of recorded video"}, @@ -114,11 +115,11 @@ func main() { {"Width", "Width in pixels"}, {"FrameRate", "Frame rate of captured video"}, {"HttpAddress", "Destination address of http posts"}, - {"Quantization", "Desired quantization value"}, + {"Quantization", "Desired quantization value: 0-40"}, {"Timeout", "Http timeout in seconds"}, {"IntraRefreshPeriod", "The IntraRefreshPeriod i.e. how many keyframes we send"}, - {"VerticalFlip", "Flip video vertically"}, - {"HorizontalFlip", "Flip video horizontally"}, + {"VerticalFlip", "Flip video vertically: Yes, No"}, + {"HorizontalFlip", "Flip video horizontally: Yes, No"}, } // Create the configFlags based on the flagNames array @@ -281,11 +282,11 @@ func main() { // initialize then run the main NetSender client func run() error { // initialize NetSender and use NetSender's logger - config.Logger = netsender.Logger() + //config.Logger = netsender.Logger() config.Logger.Log(progName, "Info", "Running in NetSender mode") var ns netsender.Sender - err := ns.Init(nil, nil, nil) + err := ns.Init(nil, nil, nil, nil) if err != nil { return err }