Compare commits
2 Commits
2cb80d15c8
...
f37f480925
| Author | SHA1 | Date | |
|---|---|---|---|
| f37f480925 | |||
| 9a97b42d53 |
@@ -83,7 +83,7 @@ func printUsage() {
|
|||||||
fmt.Fprintln(os.Stderr, "Try 'mxl-gen -h' for more information.")
|
fmt.Fprintln(os.Stderr, "Try 'mxl-gen -h' for more information.")
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkArgs(args appArgs) {
|
func checkArgs(args *appArgs) {
|
||||||
printUsageAndExit := func() {
|
printUsageAndExit := func() {
|
||||||
printUsage()
|
printUsage()
|
||||||
os.Exit(2)
|
os.Exit(2)
|
||||||
@@ -274,7 +274,7 @@ func flagSetAddFlags(fs *pflag.FlagSet, args *appArgs) {
|
|||||||
fs.StringVarP(&args.videoFlowDefFile, "video", "v", "", "Video flow definition JSON file path")
|
fs.StringVarP(&args.videoFlowDefFile, "video", "v", "", "Video flow definition JSON file path")
|
||||||
fs.StringVarP(&args.audioFlowDefFile, "audio", "a", "", "Audio flow definition JSON file path [TODO]")
|
fs.StringVarP(&args.audioFlowDefFile, "audio", "a", "", "Audio flow definition JSON file path [TODO]")
|
||||||
// Video pattern flags
|
// Video pattern flags
|
||||||
fs.StringVarP(&args.pattern, "pattern", "p", "bars", "Video pattern type")
|
fs.StringVarP(&args.pattern, "pattern", "p", "ebu75", "Video pattern type")
|
||||||
fs.BoolVar(&args.listPatterns, "list-patterns", false, "List video available video patterns and exit")
|
fs.BoolVar(&args.listPatterns, "list-patterns", false, "List video available video patterns and exit")
|
||||||
|
|
||||||
fs.StringVarP(&args.textOverlay, "text", "t", "", "Text overlay above video pattern. Ignored if text-pos set")
|
fs.StringVarP(&args.textOverlay, "text", "t", "", "Text overlay above video pattern. Ignored if text-pos set")
|
||||||
@@ -298,12 +298,12 @@ func flagSetAddFlags(fs *pflag.FlagSet, args *appArgs) {
|
|||||||
"br - bottom-right corner",
|
"br - bottom-right corner",
|
||||||
)
|
)
|
||||||
|
|
||||||
fs.UintVar(&args.videoWidth, "width", 1920, "Video pattern width. Zero = no video [TODO]")
|
fs.UintVar(&args.videoWidth, "width", 1920, "Video pattern width. Zero = no video [TODO: 0 width case]")
|
||||||
fs.UintVar(&args.videoHeight, "height", 1080, "Video pattern height")
|
fs.UintVar(&args.videoHeight, "height", 1080, "Video pattern height")
|
||||||
fs.StringVar(&args.videoFPS, "fps", "25", "Video pattern FPS")
|
fs.StringVar(&args.videoFPS, "fps", "25", "Video pattern FPS")
|
||||||
fs.StringVar(&args.videoUUID, "video-id", "", "Video UUID. Will be created, if not provided")
|
fs.StringVar(&args.videoUUID, "video-id", "", "Video UUID. Will be created, if not provided")
|
||||||
// Audio pattern flags
|
// Audio pattern flags
|
||||||
fs.Uint8VarP(&args.audioChannels, "channel", "c", 0, "Amount of audio channels. Each channel: num * 1kHz. Zero = no sound")
|
fs.Uint8VarP(&args.audioChannels, "channel", "c", 0, "Amount of audio channels. Each channel: num * 1kHz. Zero = no sound [TODO]")
|
||||||
fs.StringVarP(&args.audioSamplingFreq, "freq", "f", "48", "Sampling frequency of test audio feed in kHz [TODO]")
|
fs.StringVarP(&args.audioSamplingFreq, "freq", "f", "48", "Sampling frequency of test audio feed in kHz [TODO]")
|
||||||
fs.StringVar(&args.audioUUID, "audio-id", "", "Audio UUID. Will be created, if not provided [TODO]")
|
fs.StringVar(&args.audioUUID, "audio-id", "", "Audio UUID. Will be created, if not provided [TODO]")
|
||||||
}
|
}
|
||||||
@@ -328,9 +328,8 @@ func main() {
|
|||||||
listPatterns(os.Stderr)
|
listPatterns(os.Stderr)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
checkArgs(args)
|
checkArgs(&args)
|
||||||
|
|
||||||
var mxlDomain string = "/dev/shm/mxl"
|
|
||||||
type videoInfo struct {
|
type videoInfo struct {
|
||||||
uuid string
|
uuid string
|
||||||
width uint
|
width uint
|
||||||
@@ -368,7 +367,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
log.Printf("%s %s", APP_NAME, APP_VER)
|
log.Printf("%s %s", APP_NAME, APP_VER)
|
||||||
log.Printf("Domain: %s", mxlDomain)
|
log.Printf("Domain: %s", args.domain)
|
||||||
log.Printf("Video: %dx%d %d/%d", vi.width, vi.height, vi.fps.Num, vi.fps.Den)
|
log.Printf("Video: %dx%d %d/%d", vi.width, vi.height, vi.fps.Num, vi.fps.Den)
|
||||||
log.Printf("Video UUID: %s", vi.uuid)
|
log.Printf("Video UUID: %s", vi.uuid)
|
||||||
|
|
||||||
@@ -409,7 +408,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
inst, err := mxl.NewInstance(mxlDomain, "")
|
inst, err := mxl.NewInstance(args.domain, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("MXL Init Failed: %v", err)
|
log.Fatalf("MXL Init Failed: %v", err)
|
||||||
}
|
}
|
||||||
@@ -420,7 +419,7 @@ func main() {
|
|||||||
log.Fatalf("Failed to create MXL writer: %v", err)
|
log.Fatalf("Failed to create MXL writer: %v", err)
|
||||||
}
|
}
|
||||||
if !isCreated {
|
if !isCreated {
|
||||||
log.Printf("reusing existing flow: %s, domain: %s", vi.uuid, mxlDomain)
|
log.Printf("reusing existing flow: %s, domain: %s", vi.uuid, args.domain)
|
||||||
}
|
}
|
||||||
defer writer.Close()
|
defer writer.Close()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user