cmd/livepeer: Enable experimental caps only if scene-classification m…

…odel is loaded

cmd/livepeer/livepeer.go

@@ -850,7 +850,12 @@ func main() {
 		// take the port to listen to from the service URI
 		*httpAddr = defaultAddr(*httpAddr, "", n.GetServiceURI().Port())
 
-		n.Capabilities = core.NewCapabilities(core.DefaultCapabilities(), core.MandatoryCapabilities())
+		caps := core.DefaultCapabilities()
+		if *sceneClassificationModelPath != "" {
+			// Only enable experimental capabilities if scene classification model is actually loaded
+			caps = append(caps, core.ExperimentalCapabilities()...)
+		}
+		n.Capabilities = core.NewCapabilities(caps, core.MandatoryCapabilities())
 
 		if !*transcoder && n.OrchSecret == "" {
 			glog.Fatal("Running an orchestrator requires an -orchSecret for standalone mode or -transcoder for orchestrator+transcoder mode")

core/capabilities.go

@@ -43,7 +43,7 @@ var capProfileConv = errors.New("capability: unknown profile")
 
 func DefaultCapabilities() []Capability {
 	// Add to this list as new features are added.
-	var defaultCapabilities = []Capability{
+	return []Capability{
 		Capability_H264,
 		Capability_MPEGTS,
 		Capability_MP4,
@@ -58,8 +58,11 @@ func DefaultCapabilities() []Capability {
 		Capability_GOP,
 		Capability_AuthToken,
 	}
+}
+
+func ExperimentalCapabilities() []Capability {
 	// Add experimental capabilities if enabled during build
-	return append(defaultCapabilities, experimentalCapabilities...)
+	return experimentalCapabilities
 }
 
 func MandatoryCapabilities() []Capability {