patch

pkg/base/avpacket.go

@@ -65,7 +65,7 @@ func (packet *AvPacket) IsVideo() bool {
 
 func (packet *AvPacket) DebugString() string {
 	return fmt.Sprintf("[%p] type=%s, timestamp=%d, pts=%d, len=%d, payload=%s",
-		packet, packet.PayloadType.ReadableString(), packet.Timestamp, packet.Pts, len(packet.Payload), hex.Dump(nazabytes.Prefix(packet.Payload, 32)))
+		packet, packet.PayloadType.ReadableString(), packet.Timestamp, packet.Pts, len(packet.Payload), hex.Dump(nazabytes.Prefix(packet.Payload, 64)))
 }
 
 // ---------------------------------------------------------------------------------------------------------------------

pkg/base/t_http_an__.go

@@ -43,14 +43,13 @@ type StatGroup struct {
 }
 
 type StatSession struct {
-	SessionId string `json:"session_id"`
-	Protocol  string `json:"protocol"`
-	BaseType  string `json:"base_type"`
+	SessionId  string `json:"session_id"`
+	Protocol   string `json:"protocol"`
+	BaseType   string `json:"base_type"`
+	RemoteAddr string `json:"remote_addr"`
 
 	StartTime string `json:"start_time"`
 
-	RemoteAddr string `json:"remote_addr"`
-
 	ReadBytesSum      uint64 `json:"read_bytes_sum"`
 	WroteBytesSum     uint64 `json:"wrote_bytes_sum"`
 	BitrateKbits      int    `json:"bitrate_kbits"`

pkg/base/t_http_an__notify.go

@@ -34,6 +34,7 @@ type SessionEventCommonInfo struct {
 	HasInSession  bool `json:"has_in_session"`
 	HasOutSession bool `json:"has_out_session"`
 
+	// TODO(chef): [opt] 这两个字段，实际需求出发点是有业务方需要在stop事件做流量统计，但是现在的实现为所有session事件都添加了，是否合适 202208
 	ReadBytesSum  uint64 `json:"read_bytes_sum"`
 	WroteBytesSum uint64 `json:"wrote_bytes_sum"`
 }

pkg/logic/group__core_streaming.go

@@ -90,6 +90,8 @@ func (group *Group) OnAvPacketFromPsPubSession(pkt *base.AvPacket) {
 	group.mutex.Lock()
 	defer group.mutex.Unlock()
 
+	//Log.Debugf("Group::OnAvPacketFromPsPubSession. pkt=%s", pkt.DebugString())
+
 	if group.rtsp2RtmpRemuxer != nil {
 		group.rtsp2RtmpRemuxer.OnAvPacket(*pkt)
 	}
@@ -168,6 +170,8 @@ func (group *Group) OnFragmentOpen() {
 // @param msg 调用结束后，内部不持有msg.Payload内存块
 //
 func (group *Group) broadcastByRtmpMsg(msg base.RtmpMsg) {
+	//Log.Debugf("> broadcastByRtmpMsg. %s", msg.DebugString())
+
 	if msg.Header.MsgLen != uint32(len(msg.Payload)) {
 		Log.Errorf("[%s] diff. msgLen=%d, payload len=%d, %+v", group.UniqueKey, msg.Header.MsgLen, len(msg.Payload), msg.Header)
 	}