Add custom RTMP port number support (#462)

* Bump api spec version

* Add support for custom RTMP port. Closes #454

config/config.go

@@ -26,6 +26,7 @@ type config struct {
 	VersionNumber        string          `yaml:"-"`
 	VideoSettings        videoSettings   `yaml:"videoSettings"`
 	WebServerPort        int             `yaml:"webServerPort"`
+	RTMPServerPort       int             `yaml:"rtmpServerPort"`
 	DisableUpgradeChecks bool            `yaml:"disableUpgradeChecks"`
 	YP                   YP              `yaml:"yp"`
 }
@@ -174,6 +175,14 @@ func (c *config) GetPublicWebServerPort() int {
 	return _default.WebServerPort
 }
 
+func (c *config) GetRTMPServerPort() int {
+	if c.RTMPServerPort != 0 {
+		return c.RTMPServerPort
+	}
+
+	return _default.RTMPServerPort
+}
+
 func (c *config) GetMaxNumberOfReferencedSegmentsInPlaylist() int {
 	if c.Files.MaxNumberInPlaylist > 0 {
 		return c.Files.MaxNumberInPlaylist

config/defaults.go

@@ -3,6 +3,7 @@ package config
 func getDefaults() config {
 	defaults := config{}
 	defaults.WebServerPort = 8080
+	defaults.RTMPServerPort = 1935
 	defaults.VideoSettings.ChunkLengthInSeconds = 4
 	defaults.Files.MaxNumberInPlaylist = 5
 	defaults.YP.Enabled = false

core/core.go

@@ -66,7 +66,8 @@ func Start() error {
 	go rtmp.Start(setStreamAsConnected, setBroadcaster)
 
 	port := config.Config.GetPublicWebServerPort()
-	log.Infof("Web server is listening on port %d, RTMP is accepting inbound streams on port 1935.", port)
+	rtmpPort := config.Config.GetRTMPServerPort()
+	log.Infof("Web server is listening on port %d, RTMP is accepting inbound streams on port %d.", port, rtmpPort)
 	log.Infoln("The web admin interface is available at /admin.")
 
 	return nil

core/rtmp/rtmp.go

@@ -30,12 +30,12 @@ var _rtmpConnection net.Conn
 var _setStreamAsConnected func()
 var _setBroadcaster func(models.Broadcaster)
 
-// Start starts the rtmp service, listening on port 1935.
+// Start starts the rtmp service, listening on specified RTMP port.
 func Start(setStreamAsConnected func(), setBroadcaster func(models.Broadcaster)) {
 	_setStreamAsConnected = setStreamAsConnected
 	_setBroadcaster = setBroadcaster
 
-	port := 1935
+	port := config.Config.GetRTMPServerPort()
 	s := rtmp.NewServer()
 	var lis net.Listener
 	var err error