mirror of
				https://github.com/owncast/owncast.git
				synced 2025-11-01 02:44:31 +08:00 
			
		
		
		
	Connections from Restream seem to be more sensitive about if we get the initial packets processed or not, so I moved setStreamAsConnected to be decoupled from when we set broadcaster info. Another update for #432
This commit is contained in:
		| @ -11,8 +11,7 @@ import ( | ||||
| func setCurrentBroadcasterInfo(t flvio.Tag, remoteAddr string) { | ||||
| 	data, err := getInboundDetailsFromMetadata(t.DebugFields()) | ||||
| 	if err != nil { | ||||
| 		log.Errorln(err) | ||||
| 		return | ||||
| 		log.Traceln("RTMP meadata:", err) | ||||
| 	} | ||||
|  | ||||
| 	broadcaster := models.Broadcaster{ | ||||
|  | ||||
| @ -70,7 +70,6 @@ func HandleConn(c *rtmp.Conn, nc net.Conn) { | ||||
| 		if t.Type == flvio.TAG_AMF0 { | ||||
| 			log.Tracef("%+v\n", t.DebugFields()) | ||||
| 			setCurrentBroadcasterInfo(t, nc.RemoteAddr().String()) | ||||
| 			_setStreamAsConnected() | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| @ -89,6 +88,7 @@ func HandleConn(c *rtmp.Conn, nc net.Conn) { | ||||
| 	} | ||||
|  | ||||
| 	log.Infoln("Incoming RTMP connected.") | ||||
| 	_setStreamAsConnected() | ||||
|  | ||||
| 	pipePath := utils.GetTemporaryPipePath() | ||||
| 	if !utils.DoesFileExists(pipePath) { | ||||
|  | ||||
| @ -54,6 +54,10 @@ func getAudioCodec(codec interface{}) string { | ||||
| } | ||||
|  | ||||
| func getVideoCodec(codec interface{}) string { | ||||
| 	if codec == nil { | ||||
| 		return "Unknown" | ||||
| 	} | ||||
|  | ||||
| 	var codecID float64 | ||||
| 	if assertedCodecID, ok := codec.(float64); ok { | ||||
| 		codecID = assertedCodecID | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Gabe Kangas
					Gabe Kangas