entirely remove control chunk stream ID validation

Author: aler9

internal/protocols/rtmp/message/message.go

@@ -10,26 +10,6 @@ const (
 	ControlChunkStreamID = 2
 )
 
-// Common non-standard control chunk stream IDs used by various cameras
-var commonControlChunkStreamIDs = []byte{
-	2, // Standard RTMP
-	3, // Some cameras use this
-	4, // PTZ cameras and others
-	5, // Some IP cameras
-	6, // Alternative implementation
-}
-
-// isControlChunkStreamID checks if the given chunk stream ID is acceptable for control messages
-// This provides compatibility with various camera implementations that don't strictly follow RTMP spec
-func isControlChunkStreamID(chunkStreamID byte) bool {
-	for _, id := range commonControlChunkStreamIDs {
-		if chunkStreamID == id {
-			return true
-		}
-	}
-	return false
-}
-
 // Type is a message type.
 type Type byte
 

internal/protocols/rtmp/message/msg_acknowledge.go

@@ -12,11 +12,6 @@ type Acknowledge struct {
 }
 
 func (m *Acknowledge) unmarshal(raw *rawmessage.Message) error {
-	// Use flexible chunk stream ID validation for better camera compatibility
-	if !isControlChunkStreamID(raw.ChunkStreamID) {
-		return fmt.Errorf("unexpected chunk stream ID: %d", raw.ChunkStreamID)
-	}
-
 	if len(raw.Body) != 4 {
 		return fmt.Errorf("unexpected body size")
 	}

internal/protocols/rtmp/message/msg_set_chunk_size.go

@@ -12,11 +12,6 @@ type SetChunkSize struct {
 }
 
 func (m *SetChunkSize) unmarshal(raw *rawmessage.Message) error {
-	// Use flexible chunk stream ID validation for better camera compatibility
-	if !isControlChunkStreamID(raw.ChunkStreamID) {
-		return fmt.Errorf("unexpected chunk stream ID: %d", raw.ChunkStreamID)
-	}
-
 	if len(raw.Body) != 4 {
 		return fmt.Errorf("invalid body size")
 	}

internal/protocols/rtmp/message/msg_set_peer_bandwidth.go

@@ -13,11 +13,6 @@ type SetPeerBandwidth struct {
 }
 
 func (m *SetPeerBandwidth) unmarshal(raw *rawmessage.Message) error {
-	// Use flexible chunk stream ID validation for better camera compatibility
-	if !isControlChunkStreamID(raw.ChunkStreamID) {
-		return fmt.Errorf("unexpected chunk stream ID: %d", raw.ChunkStreamID)
-	}
-
 	if len(raw.Body) != 5 {
 		return fmt.Errorf("invalid body size")
 	}

internal/protocols/rtmp/message/msg_set_window_ack_size.go

@@ -12,11 +12,6 @@ type SetWindowAckSize struct {
 }
 
 func (m *SetWindowAckSize) unmarshal(raw *rawmessage.Message) error {
-	// Use flexible chunk stream ID validation for better camera compatibility
-	if !isControlChunkStreamID(raw.ChunkStreamID) {
-		return fmt.Errorf("unexpected chunk stream ID: %d", raw.ChunkStreamID)
-	}
-
 	if len(raw.Body) != 4 {
 		return fmt.Errorf("invalid body size")
 	}

internal/protocols/rtmp/message/msg_user_control_ping_request.go

@@ -12,12 +12,6 @@ type UserControlPingRequest struct {
 }
 
 func (m *UserControlPingRequest) unmarshal(raw *rawmessage.Message) error {
-	// Use flexible chunk stream ID validation for better camera compatibility
-	// Standard RTMP uses ControlChunkStreamID (2), but some cameras use other IDs like 4
-	if !isControlChunkStreamID(raw.ChunkStreamID) {
-		return fmt.Errorf("unexpected chunk stream ID: %d", raw.ChunkStreamID)
-	}
-
 	if len(raw.Body) != 6 {
 		return fmt.Errorf("invalid body size")
 	}

internal/protocols/rtmp/message/msg_user_control_ping_response.go

@@ -12,12 +12,6 @@ type UserControlPingResponse struct {
 }
 
 func (m *UserControlPingResponse) unmarshal(raw *rawmessage.Message) error {
-	// Use flexible chunk stream ID validation for better camera compatibility
-	// Standard RTMP uses ControlChunkStreamID (2), but some cameras use other IDs like 4
-	if !isControlChunkStreamID(raw.ChunkStreamID) {
-		return fmt.Errorf("6666 unexpected chunk stream ID: %d", raw.ChunkStreamID)
-	}
-
 	if len(raw.Body) != 6 {
 		return fmt.Errorf("invalid body size")
 	}

internal/protocols/rtmp/message/msg_user_control_set_buffer_length.go

@@ -13,12 +13,6 @@ type UserControlSetBufferLength struct {
 }
 
 func (m *UserControlSetBufferLength) unmarshal(raw *rawmessage.Message) error {
-	// Use flexible chunk stream ID validation for better camera compatibility
-	// Standard RTMP uses ControlChunkStreamID (2), but some cameras use other IDs like 4
-	if !isControlChunkStreamID(raw.ChunkStreamID) {
-		return fmt.Errorf("7777 unexpected chunk stream ID: %d", raw.ChunkStreamID)
-	}
-
 	if len(raw.Body) != 10 {
 		return fmt.Errorf("invalid body size")
 	}

internal/protocols/rtmp/message/msg_user_control_stream_begin.go

@@ -12,12 +12,6 @@ type UserControlStreamBegin struct {
 }
 
 func (m *UserControlStreamBegin) unmarshal(raw *rawmessage.Message) error {
-	// Use flexible chunk stream ID validation for better camera compatibility
-	// Standard RTMP uses ControlChunkStreamID (2), but some cameras use other IDs like 4
-	if !isControlChunkStreamID(raw.ChunkStreamID) {
-		return fmt.Errorf("unexpected chunk stream ID: %d", raw.ChunkStreamID)
-	}
-
 	if len(raw.Body) != 6 {
 		return fmt.Errorf("invalid body size")
 	}

internal/protocols/rtmp/message/msg_user_control_stream_dry.go

@@ -12,12 +12,6 @@ type UserControlStreamDry struct {
 }
 
 func (m *UserControlStreamDry) unmarshal(raw *rawmessage.Message) error {
-	// Use flexible chunk stream ID validation for better camera compatibility
-	// Standard RTMP uses ControlChunkStreamID (2), but some cameras use other IDs like 4
-	if !isControlChunkStreamID(raw.ChunkStreamID) {
-		return fmt.Errorf("9999 unexpected chunk stream ID: %d", raw.ChunkStreamID)
-	}
-
 	if len(raw.Body) != 6 {
 		return fmt.Errorf("invalid body size")
 	}