thefoxon/joy4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix metadata conversion, allow to add additional metadata

Browse Source
This commit is contained in:
Ingo Oppermann 2024-06-03 21:08:08 +02:00
parent bd2982e917
commit b140734590
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
format/rtmp/rtmp.go
View File

@ -346,19 +346,19 @@ func (t *idleConn) SetIdleTimeout(d time.Duration) error {
} }
type txrxcount struct { type txrxcount struct {
io.ReadWriter io.ReadWriteCloser
txbytes uint64 txbytes uint64
rxbytes uint64 rxbytes uint64
} }
func (t *txrxcount) Read(p []byte) (int, error) { func (t *txrxcount) Read(p []byte) (int, error) {
n, err := t.ReadWriter.Read(p) n, err := t.ReadWriteCloser.Read(p)
t.rxbytes += uint64(n) t.rxbytes += uint64(n)
return n, err return n, err
} }
func (t *txrxcount) Write(p []byte) (int, error) { func (t *txrxcount) Write(p []byte) (int, error) {
n, err := t.ReadWriter.Write(p) n, err := t.ReadWriteCloser.Write(p)
t.txbytes += uint64(n) t.txbytes += uint64(n)
return n, err return n, err
} }
@ -373,7 +373,7 @@ func NewConn(netconn net.Conn) *Conn {
conn.readMaxChunkSize = 128 conn.readMaxChunkSize = 128
conn.writeMaxChunkSize = 128 conn.writeMaxChunkSize = 128
conn.readAckSize = 1048576 conn.readAckSize = 1048576
conn.txrxcount = &txrxcount{ReadWriter: conn.netconn} conn.txrxcount = &txrxcount{ReadWriteCloser: conn.netconn}
conn.bufr = bufio.NewReaderSize(conn.txrxcount, pio.RecommendBufioSize) conn.bufr = bufio.NewReaderSize(conn.txrxcount, pio.RecommendBufioSize)
conn.bufw = bufio.NewWriterSize(conn.txrxcount, pio.RecommendBufioSize) conn.bufw = bufio.NewWriterSize(conn.txrxcount, pio.RecommendBufioSize)
conn.writebuf = make([]byte, 4096) conn.writebuf = make([]byte, 4096)
@ -1135,6 +1135,16 @@ func (conn *Conn) WriteHeader(streams []av.CodecData) (err error) {
return return
} }
if conn.metadata != nil {
for key, value := range conn.metadata {
if _, hasKey := metadata[key]; hasKey {
continue
}
metadata[key] = value
}
}
// > onMetaData() // > onMetaData()
if err = conn.writeDataMsg(5, conn.avmsgsid, "onMetaData", metadata); err != nil { if err = conn.writeDataMsg(5, conn.avmsgsid, "onMetaData", metadata); err != nil {
return return
@ -1858,16 +1868,19 @@ func (conn *Conn) handleMsg(timestamp uint32, msgsid uint32, msgtypeid uint8, ms
} }
if metaindex != -1 && metaindex < len(conn.datamsgvals) { if metaindex != -1 && metaindex < len(conn.datamsgvals) {
conn.metadata = conn.datamsgvals[metaindex].(flvio.AMFMap) metadata, ok := conn.datamsgvals[metaindex].(flvio.AMFMap)
//fmt.Printf("onMetadata: %+v\n", conn.metadata) if ok {
if _, hasVideo := conn.metadata["videocodecid"]; hasVideo { conn.metadata = metadata
if _, hasVideo := metadata["videocodecid"]; hasVideo {
conn.prober.HasVideo = true conn.prober.HasVideo = true
} }
if _, hasAudio := conn.metadata["audiocodecid"]; hasAudio { if _, hasAudio := metadata["audiocodecid"]; hasAudio {
conn.prober.HasAudio = true conn.prober.HasAudio = true
} }
} }
}
case msgtypeidVideoMsg: case msgtypeidVideoMsg:
if len(msgdata) == 0 { if len(msgdata) == 0 {