zgaetano/datarhei-dragonfork-core
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 4 Packages Wiki Activity Actions

Update RTMP server (datarhei/restreamer#385)

Browse source
This commit is contained in:
Ingo Oppermann 2022-07-28 20:27:27 +02:00
parent f8ac5e22e7
commit 542653d3e2
No known key found for this signature in database
GPG key ID: 2AB32426E9DD229E
34 changed files with 730 additions and 702 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -6,7 +6,7 @@ require (
github.com/99designs/gqlgen v0.17.12
github.com/atrox/haikunatorgo/v2 v2.0.1
github.com/datarhei/gosrt v0.1.2
github.com/datarhei/joy4 v0.0.0-20210125162555-2102a8289cce
github.com/datarhei/joy4 v0.0.0-20220728180719-f752080f4a36
github.com/go-playground/validator/v10 v10.11.0
github.com/golang-jwt/jwt/v4 v4.4.2
github.com/google/uuid v1.3.0

4
go.sum
View file

@ -76,8 +76,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/datarhei/gosrt v0.1.2 h1:rGOP2Xkbi52z4tLzBwCBw2TKt7BrfTO2LmEVY+yWf1M=
github.com/datarhei/gosrt v0.1.2/go.mod h1:IftDbZGIIC9OvQO5on5ZpU0iB/JX/PFOqGXORbwHYQM=
github.com/datarhei/joy4 v0.0.0-20210125162555-2102a8289cce h1:bg/OE9GfGK6d/XbqiMq8YaGQzw1Ul3Y3qiGMzU1G4HQ=
github.com/datarhei/joy4 v0.0.0-20210125162555-2102a8289cce/go.mod h1:Jcw/6jZDQQmPx8A7INEkXmuEF7E9jjBbSTfVSLwmiQw=
github.com/datarhei/joy4 v0.0.0-20220728180719-f752080f4a36 h1:ppjcv7wazy4d7vANREERXkSAUnhV/nfT2a+13u4ZijQ=
github.com/datarhei/joy4 v0.0.0-20220728180719-f752080f4a36/go.mod h1:Jcw/6jZDQQmPx8A7INEkXmuEF7E9jjBbSTfVSLwmiQw=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

14
vendor/github.com/datarhei/joy4/av/av.go generated vendored
View file

@ -1,4 +1,3 @@
// Package av defines basic interfaces and data structures of container demux/mux and audio encode/decode.
package av
@ -294,12 +293,12 @@ type AudioEncoder interface {
CodecData() (AudioCodecData, error) // encoder's codec data can put into container
Encode(AudioFrame) ([][]byte, error) // encode raw audio frame into compressed pakcet(s)
Close() // close encoder, free cgo contexts
SetSampleRate(int) (error) // set encoder sample rate
SetChannelLayout(ChannelLayout) (error) // set encoder channel layout
SetSampleFormat(SampleFormat) (error) // set encoder sample format
SetBitrate(int) (error) // set encoder bitrate
SetOption(string,interface{}) (error) // encoder setopt, in ffmpeg is av_opt_set_dict()
GetOption(string,interface{}) (error) // encoder getopt
SetSampleRate(int) error // set encoder sample rate
SetChannelLayout(ChannelLayout) error // set encoder channel layout
SetSampleFormat(SampleFormat) error // set encoder sample format
SetBitrate(int) error // set encoder bitrate
SetOption(string, interface{}) error // encoder setopt, in ffmpeg is av_opt_set_dict()
GetOption(string, interface{}) error // encoder getopt
}
// AudioDecoder can decode compressed audio packets into raw audio frame.
@ -313,4 +312,3 @@ type AudioDecoder interface {
type AudioResampler interface {
Resample(AudioFrame) (AudioFrame, error) // convert raw audio frames
}

13
vendor/github.com/datarhei/joy4/av/avutil/avutil.go generated vendored
View file

@ -1,14 +1,15 @@
package avutil
import (
"io"
"strings"
"fmt"
"bytes"
"github.com/datarhei/joy4/av"
"fmt"
"io"
"net/url"
"os"
"path"
"strings"
"github.com/datarhei/joy4/av"
)
type HandlerDemuxer struct {
@ -108,7 +109,7 @@ func (self *Handlers) NewAudioEncoder(typ av.CodecType) (enc av.AudioEncoder, er
}
}
}
err = fmt.Errorf("avutil: encoder", typ, "not found")
err = fmt.Errorf("avutil: encoder %s not found", typ)
return
}
@ -120,7 +121,7 @@ func (self *Handlers) NewAudioDecoder(codec av.AudioCodecData) (dec av.AudioDeco
}
}
}
err = fmt.Errorf("avutil: decoder", codec.Type(), "not found")
err = fmt.Errorf("avutil: decoder %s not found", codec.Type())
return
}

4
vendor/github.com/datarhei/joy4/av/pktque/filters.go generated vendored
View file

@ -1,10 +1,9 @@
// Package pktque provides packet Filter interface and structures used by other components.
package pktque
import (
"time"
"github.com/datarhei/joy4/av"
"time"
)
type Filter interface {
@ -188,4 +187,3 @@ func (self *Walltime) ModifyPacket(pkt *av.Packet, streams []av.CodecData, video
}
return
}

1
vendor/github.com/datarhei/joy4/av/pktque/timeline.go generated vendored
View file

@ -58,4 +58,3 @@ func (self *Timeline) Pop(dur time.Duration) (tm time.Duration) {
return
}

6
vendor/github.com/datarhei/joy4/av/pubsub/queue.go generated vendored
View file

@ -2,11 +2,12 @@
package pubsub
import (
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/av/pktque"
"io"
"sync"
"time"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/av/pktque"
)
// time
@ -97,7 +98,6 @@ func (self *Queue) WritePacket(pkt av.Packet) (err error) {
break
}
}
//println("shrink", self.curgopcount, self.maxgopcount, self.buf.Head, self.buf.Tail, "count", self.buf.Count, "size", self.buf.Size)
self.cond.Broadcast()

9
vendor/github.com/datarhei/joy4/codec/aacparser/parser.go generated vendored
View file

@ -1,12 +1,12 @@
package aacparser
import (
"github.com/datarhei/joy4/utils/bits"
"github.com/datarhei/joy4/av"
"time"
"fmt"
"bytes"
"fmt"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/utils/bits"
"io"
"time"
)
// copied from libavcodec/mpeg4audio.h
@ -308,4 +308,3 @@ func NewCodecDataFromMPEG4AudioConfigBytes(config []byte) (self CodecData, err e
}
return
}

1
vendor/github.com/datarhei/joy4/codec/codec.go generated vendored
View file

@ -61,4 +61,3 @@ func NewSpeexCodecData(sr int, cl av.ChannelLayout) SpeexCodecData {
codec.ChannelLayout_ = cl
return codec
}

1
vendor/github.com/datarhei/joy4/codec/fake/fake.go generated vendored
View file

@ -26,4 +26,3 @@ func (self CodecData) ChannelLayout() av.ChannelLayout {
func (self CodecData) SampleRate() int {
return self.SampleRate_
}

6
vendor/github.com/datarhei/joy4/codec/h264parser/parser.go generated vendored
View file

@ -1,12 +1,11 @@
package h264parser
import (
"bytes"
"fmt"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/utils/bits"
"github.com/datarhei/joy4/utils/bits/pio"
"fmt"
"bytes"
)
const (
@ -740,4 +739,3 @@ func ParseSliceHeaderFromNALU(packet []byte) (sliceType SliceType, err error) {
return
}

13
vendor/github.com/datarhei/joy4/format/aac/aac.go generated vendored
View file

@ -1,14 +1,13 @@
package aac
import (
"github.com/datarhei/joy4/av/avutil"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/codec/aacparser"
"time"
"fmt"
"io"
"bufio"
"fmt"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/av/avutil"
"github.com/datarhei/joy4/codec/aacparser"
"io"
"time"
)
type Muxer struct {

2
vendor/github.com/datarhei/joy4/format/flv/flv.go generated vendored
View file

@ -3,7 +3,6 @@ package flv
import (
"bufio"
"fmt"
"github.com/datarhei/joy4/utils/bits/pio"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/av/avutil"
"github.com/datarhei/joy4/codec"
@ -11,6 +10,7 @@ import (
"github.com/datarhei/joy4/codec/fake"
"github.com/datarhei/joy4/codec/h264parser"
"github.com/datarhei/joy4/format/flv/flvio"
"github.com/datarhei/joy4/utils/bits/pio"
"io"
)

8
vendor/github.com/datarhei/joy4/format/flv/flvio/amf0.go generated vendored
View file

@ -1,11 +1,11 @@
package flvio
import (
"strings"
"math"
"fmt"
"time"
"github.com/datarhei/joy4/utils/bits/pio"
"math"
"strings"
"time"
)
type AMF0ParseError struct {
@ -278,7 +278,6 @@ func FillAMF0Val(b []byte, _val interface{}) (n int) {
return
}
func ParseAMF0Val(b []byte) (val interface{}, n int, err error) {
return parseAMF0Val(b, 0)
}
@ -465,4 +464,3 @@ func parseAMF0Val(b []byte, offset int) (val interface{}, n int, err error) {
return
}

2
vendor/github.com/datarhei/joy4/format/flv/flvio/flvio.go generated vendored
View file

@ -2,8 +2,8 @@ package flvio
import (
"fmt"
"github.com/datarhei/joy4/utils/bits/pio"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/utils/bits/pio"
"io"
"time"
)

9
vendor/github.com/datarhei/joy4/format/format.go generated vendored
View file

@ -1,13 +1,13 @@
package format
import (
"github.com/datarhei/joy4/av/avutil"
"github.com/datarhei/joy4/format/aac"
"github.com/datarhei/joy4/format/flv"
"github.com/datarhei/joy4/format/mp4"
"github.com/datarhei/joy4/format/ts"
"github.com/datarhei/joy4/format/rtmp"
"github.com/datarhei/joy4/format/rtsp"
"github.com/datarhei/joy4/format/flv"
"github.com/datarhei/joy4/format/aac"
"github.com/datarhei/joy4/av/avutil"
"github.com/datarhei/joy4/format/ts"
)
func RegisterAll() {
@ -18,4 +18,3 @@ func RegisterAll() {
avutil.DefaultHandlers.Add(flv.Handler)
avutil.DefaultHandlers.Add(aac.Handler)
}

3
vendor/github.com/datarhei/joy4/format/mp4/handler.go generated vendored
View file

@ -1,9 +1,9 @@
package mp4
import (
"io"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/av/avutil"
"io"
)
var CodecTypes = []av.CodecType{av.H264, av.AAC}
@ -29,4 +29,3 @@ func Handler(h *avutil.RegisterHandler) {
h.CodecTypes = CodecTypes
}

10
vendor/github.com/datarhei/joy4/format/mp4/mp4io/mp4io.go generated vendored
View file

@ -1,14 +1,13 @@
package mp4io
import (
"github.com/datarhei/joy4/utils/bits/pio"
"os"
"io"
"fmt"
"time"
"github.com/datarhei/joy4/utils/bits/pio"
"io"
"math"
"os"
"strings"
"time"
)
type ParseError struct {
@ -500,4 +499,3 @@ func (self *Track) GetElemStreamDesc() (esds *ElemStreamDesc) {
esds, _ = atom.(*ElemStreamDesc)
return
}

4
vendor/github.com/datarhei/joy4/format/mp4/muxer.go generated vendored
View file

@ -1,15 +1,15 @@
package mp4
import (
"bufio"
"fmt"
"time"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/codec/aacparser"
"github.com/datarhei/joy4/codec/h264parser"
"github.com/datarhei/joy4/format/mp4/mp4io"
"github.com/datarhei/joy4/utils/bits/pio"
"io"
"bufio"
"time"
)
type Muxer struct {

124
vendor/github.com/datarhei/joy4/format/rtmp/rtmp.go generated vendored
View file

@ -10,16 +10,17 @@ import (
"encoding/hex"
"errors"
"fmt"
"github.com/datarhei/joy4/utils/bits/pio"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/av/avutil"
"github.com/datarhei/joy4/format/flv"
"github.com/datarhei/joy4/format/flv/flvio"
"io"
"net"
"net/url"
"strings"
"time"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/av/avutil"
"github.com/datarhei/joy4/format/flv"
"github.com/datarhei/joy4/format/flv/flvio"
"github.com/datarhei/joy4/utils/bits/pio"
)
var Debug bool
@ -55,7 +56,7 @@ func DialTimeout(uri string, timeout time.Duration) (conn *Conn, err error) {
return
}
var ErrServerClosed = errors.New("rtmp: Server closed")
var ErrServerClosed = errors.New("server closed")
type Server struct {
Addr string
@ -98,7 +99,7 @@ func (self *Server) ListenAndServe() error {
listener, err := net.Listen("tcp", addr)
if err != nil {
return fmt.Errorf("rtmp: %w", err)
return err
}
return self.Serve(listener)
@ -112,7 +113,7 @@ func (self *Server) ListenAndServeTLS(certFile, keyFile string) error {
listener, err := net.Listen("tcp", addr)
if err != nil {
return fmt.Errorf("rtmp: %w", err)
return err
}
return self.ServeTLS(listener, certFile, keyFile)
@ -135,7 +136,7 @@ func (self *Server) ServeTLS(listener net.Listener, certFile, keyFile string) er
var err error
config.Certificates[0], err = tls.LoadX509KeyPair(certFile, keyFile)
if err != nil {
return fmt.Errorf("rtmp: %w", err)
return err
}
}
@ -179,8 +180,6 @@ func (self *Server) Serve(listener net.Listener) error {
}
}()
}
return nil
}
func (self *Server) Close() {
@ -322,6 +321,8 @@ const (
eventtypeStreamBegin = 0
eventtypeSetBufferLength = 3
eventtypeStreamIsRecorded = 4
eventtypePingRequest = 6
eventtypePingResponse = 7
)
func (self *Conn) NetConn() net.Conn {
@ -429,11 +430,11 @@ func (self *Conn) writeBasicConf() (err error) {
return
}
// > WindowAckSize
if err = self.writeWindowAckSize(5000000); err != nil {
if err = self.writeWindowAckSize(1024 * 1024 * 3); err != nil {
return
}
// > SetPeerBandwidth
if err = self.writeSetPeerBandwidth(5000000, 2); err != nil {
if err = self.writeSetPeerBandwidth(1024*1024*3, 0); err != nil {
return
}
return
@ -447,18 +448,18 @@ func (self *Conn) readConnect() (err error) {
return
}
if self.commandname != "connect" {
err = fmt.Errorf("rtmp: first command is not connect")
err = fmt.Errorf("first command is not connect")
return
}
if self.commandobj == nil {
err = fmt.Errorf("rtmp: connect command params invalid")
err = fmt.Errorf("connect command params invalid")
return
}
var ok bool
var _app, _tcurl interface{}
if _app, ok = self.commandobj["app"]; !ok {
err = fmt.Errorf("rtmp: `connect` params missing `app`")
err = fmt.Errorf("the `connect` params missing `app`")
return
}
connectpath, _ = _app.(string)
@ -521,7 +522,7 @@ func (self *Conn) readConnect() (err error) {
}
if len(self.commandparams) < 1 {
err = fmt.Errorf("rtmp: publish params invalid")
err = fmt.Errorf("publish params invalid")
return
}
publishpath, _ := self.commandparams[0].(string)
@ -547,7 +548,7 @@ func (self *Conn) readConnect() (err error) {
}
if cberr != nil {
err = fmt.Errorf("rtmp: OnPlayOrPublish check failed")
err = fmt.Errorf("OnPlayOrPublish check failed")
return
}
@ -564,7 +565,7 @@ func (self *Conn) readConnect() (err error) {
}
if len(self.commandparams) < 1 {
err = fmt.Errorf("rtmp: command play params invalid")
err = fmt.Errorf("command play params invalid")
return
}
playpath, _ := self.commandparams[0].(string)
@ -606,8 +607,6 @@ func (self *Conn) readConnect() (err error) {
}
}
return
}
func (self *Conn) checkConnectResult() (ok bool, errmsg string) {
@ -657,7 +656,7 @@ func (self *Conn) probe() (err error) {
}
if err = self.prober.PushTag(tag, int32(self.timestamp)); err != nil {
if Debug {
fmt.Printf("error probing tag: %s\n", err.Error())
fmt.Printf("rtmp: error probing tag: %s\n", err.Error())
}
}
}
@ -705,7 +704,7 @@ func (self *Conn) writeConnect(path string) (err error) {
var ok bool
var errmsg string
if ok, errmsg = self.checkConnectResult(); !ok {
err = fmt.Errorf("rtmp: command connect failed: %s", errmsg)
err = fmt.Errorf("command connect failed: %s", errmsg)
return
}
if Debug {
@ -718,9 +717,9 @@ func (self *Conn) writeConnect(path string) (err error) {
if len(self.msgdata) == 4 {
self.readAckSize = pio.U32BE(self.msgdata)
}
if err = self.writeWindowAckSize(0xffffffff); err != nil {
return
}
//if err = self.writeWindowAckSize(0xffffffff); err != nil {
// return
//}
}
}
}
@ -759,7 +758,7 @@ func (self *Conn) connectPublish() (err error) {
if self.commandname == "_result" {
var ok bool
if ok, self.avmsgsid = self.checkCreateStreamResult(); !ok {
err = fmt.Errorf("rtmp: createStream command failed")
err = fmt.Errorf("createStream command failed")
return
}
break
@ -819,7 +818,7 @@ func (self *Conn) connectPlay() (err error) {
if self.commandname == "_result" {
var ok bool
if ok, self.avmsgsid = self.checkCreateStreamResult(); !ok {
err = fmt.Errorf("rtmp: createStream command failed")
err = fmt.Errorf("createStream command failed")
return
}
break
@ -862,11 +861,9 @@ func (self *Conn) ReadPacket() (pkt av.Packet, err error) {
var ok bool
if pkt, ok = self.prober.TagToPacket(tag, int32(self.timestamp)); ok {
return
return pkt, nil
}
}
return
}
func (self *Conn) Prepare() (err error) {
@ -910,7 +907,7 @@ func (self *Conn) prepare(stage int, flags int) (err error) {
return
}
} else {
err = fmt.Errorf("rtmp: call WriteHeader() before WritePacket()")
err = fmt.Errorf("call WriteHeader() before WritePacket()")
return
}
}
@ -1135,6 +1132,17 @@ func (self *Conn) writeSetBufferLength(msgsid uint32, timestamp uint32) (err err
return
}
func (self *Conn) writePingResponse(timestamp uint32) (err error) {
b := self.tmpwbuf(chunkHeaderLength + 10)
n := self.fillChunkHeader(b, 2, 0, msgtypeidUserControl, 0, 6)
pio.PutU16BE(b[n:], eventtypePingResponse)
n += 2
pio.PutU32BE(b[n:], timestamp)
n += 4
_, err = self.bufw.Write(b[:n])
return
}
const chunkHeaderLength = 12
const FlvTimestampMax = 0xFFFFFF
@ -1203,13 +1211,13 @@ func (self *Conn) readChunk() (err error) {
default: // Chunk basic header 1
case 0: // Chunk basic header 2
if _, err = io.ReadFull(self.bufr, b[:1]); err != nil {
return
return fmt.Errorf("chunk basic header 2: %w", err)
}
n += 1
csid = uint32(b[0]) + 64
case 1: // Chunk basic header 3
if _, err = io.ReadFull(self.bufr, b[:2]); err != nil {
return
return fmt.Errorf("chunk basic header 3: %w", err)
}
n += 2
csid = uint32(pio.U16BE(b)) + 64
@ -1237,7 +1245,7 @@ func (self *Conn) readChunk() (err error) {
//
// Figure 9 Chunk Message Header – Type 0
if cs.msgdataleft != 0 {
err = fmt.Errorf("rtmp: chunk msgdataleft=%d invalid", cs.msgdataleft)
err = fmt.Errorf("chunk msgdataleft=%d invalid", cs.msgdataleft)
return
}
h := b[:11]
@ -1274,7 +1282,7 @@ func (self *Conn) readChunk() (err error) {
//
// Figure 10 Chunk Message Header – Type 1
if cs.msgdataleft != 0 {
err = fmt.Errorf("rtmp: chunk msgdataleft=%d invalid", cs.msgdataleft)
err = fmt.Errorf("chunk msgdataleft=%d invalid", cs.msgdataleft)
return
}
h := b[:7]
@ -1309,7 +1317,7 @@ func (self *Conn) readChunk() (err error) {
//
// Figure 11 Chunk Message Header – Type 2
if cs.msgdataleft != 0 {
err = fmt.Errorf("rtmp: chunk msgdataleft=%d invalid", cs.msgdataleft)
err = fmt.Errorf("chunk msgdataleft=%d invalid", cs.msgdataleft)
return
}
h := b[:3]
@ -1361,7 +1369,7 @@ func (self *Conn) readChunk() (err error) {
}
default:
err = fmt.Errorf("rtmp: invalid chunk msg header type=%d", msghdrtype)
err = fmt.Errorf("invalid chunk msg header type=%d", msghdrtype)
return
}
@ -1389,15 +1397,17 @@ func (self *Conn) readChunk() (err error) {
}
if err = self.handleMsg(cs.timenow, cs.msgsid, cs.msgtypeid, cs.msgdata); err != nil {
return
return fmt.Errorf("handleMsg: %w", err)
}
}
self.ackn += uint32(n)
if self.readAckSize != 0 && self.ackn > self.readAckSize {
if err = self.writeAck(self.ackn); err != nil {
return
return fmt.Errorf("writeACK: %w", err)
}
self.flushWrite()
self.ackn = 0
}
@ -1423,7 +1433,7 @@ func (self *Conn) handleCommandMsgAMF0(b []byte) (n int, err error) {
var ok bool
if self.commandname, ok = name.(string); !ok {
err = fmt.Errorf("rtmp: CommandMsgAMF0 command is not string")
err = fmt.Errorf("CommandMsgAMF0 command is not string")
return
}
self.commandtransid, _ = transid.(float64)
@ -1438,7 +1448,7 @@ func (self *Conn) handleCommandMsgAMF0(b []byte) (n int, err error) {
self.commandparams = append(self.commandparams, obj)
}
if n < len(b) {
err = fmt.Errorf("rtmp: CommandMsgAMF0 left bytes=%d", len(b)-n)
err = fmt.Errorf("CommandMsgAMF0 left bytes=%d", len(b)-n)
return
}
@ -1459,7 +1469,7 @@ func (self *Conn) handleMsg(timestamp uint32, msgsid uint32, msgtypeid uint8, ms
case msgtypeidCommandMsgAMF3:
if len(msgdata) < 1 {
err = fmt.Errorf("rtmp: short packet of CommandMsgAMF3")
err = fmt.Errorf("short packet of CommandMsgAMF3")
return
}
// skip first byte
@ -1469,11 +1479,21 @@ func (self *Conn) handleMsg(timestamp uint32, msgsid uint32, msgtypeid uint8, ms
case msgtypeidUserControl:
if len(msgdata) < 2 {
err = fmt.Errorf("rtmp: short packet of UserControl")
err = fmt.Errorf("short packet of UserControl")
return
}
self.eventtype = pio.U16BE(msgdata)
if self.eventtype == eventtypePingRequest {
if len(msgdata) != 6 {
err = fmt.Errorf("wrong length for UserControl.PingRequest")
return
}
pingtimestamp := pio.U32BE(msgdata[2:])
self.writePingResponse(pingtimestamp)
self.flushWrite()
}
case msgtypeidDataMsgAMF0:
b := msgdata
n := 0
@ -1487,7 +1507,7 @@ func (self *Conn) handleMsg(timestamp uint32, msgsid uint32, msgtypeid uint8, ms
self.datamsgvals = append(self.datamsgvals, obj)
}
if n < len(b) {
err = fmt.Errorf("rtmp: DataMsgAMF0 left bytes=%d", len(b)-n)
err = fmt.Errorf("DataMsgAMF0 left bytes=%d", len(b)-n)
return
}
@ -1537,11 +1557,17 @@ func (self *Conn) handleMsg(timestamp uint32, msgsid uint32, msgtypeid uint8, ms
case msgtypeidSetChunkSize:
if len(msgdata) < 4 {
err = fmt.Errorf("rtmp: short packet of SetChunkSize")
err = fmt.Errorf("short packet of SetChunkSize")
return
}
self.readMaxChunkSize = int(pio.U32BE(msgdata))
return
case msgtypeidWindowAckSize:
if len(self.msgdata) != 4 {
return fmt.Errorf("invalid packet of WindowAckSize")
}
self.readAckSize = pio.U32BE(self.msgdata)
return
}
self.gotmsg = true
@ -1660,7 +1686,7 @@ func (self *Conn) handshakeClient() (err error) {
}
if Debug {
fmt.Println("rtmp: handshakeClient: server version", S1[4], S1[5], S1[6], S1[7])
fmt.Println("handshakeClient: server version", S1[4], S1[5], S1[6], S1[7])
}
if ver := pio.U32BE(S1[4:8]); ver != 0 {
@ -1698,7 +1724,7 @@ func (self *Conn) handshakeServer() (err error) {
return
}
if C0[0] != 3 {
err = fmt.Errorf("rtmp: handshake version=%d invalid", C0[0])
err = fmt.Errorf("handshake version=%d invalid", C0[0])
return
}
@ -1713,7 +1739,7 @@ func (self *Conn) handshakeServer() (err error) {
var ok bool
var digest []byte
if ok, digest = hsParse1(C1, hsClientPartialKey, hsServerFullKey); !ok {
err = fmt.Errorf("rtmp: handshake server: C1 invalid")
err = fmt.Errorf("handshake server: C1 invalid")
return
}
hsCreate01(S0S1, srvtime, srvver, hsServerPartialKey)

3
vendor/github.com/datarhei/joy4/format/rtsp/client.go generated vendored
View file

@ -8,13 +8,13 @@ import (
"encoding/binary"
"encoding/hex"
"fmt"
"github.com/datarhei/joy4/utils/bits/pio"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/av/avutil"
"github.com/datarhei/joy4/codec"
"github.com/datarhei/joy4/codec/aacparser"
"github.com/datarhei/joy4/codec/h264parser"
"github.com/datarhei/joy4/format/rtsp/sdp"
"github.com/datarhei/joy4/utils/bits/pio"
"io"
"net"
"net/textproto"
@ -1236,4 +1236,3 @@ func Handler(h *avutil.RegisterHandler) {
return
}
}

1
vendor/github.com/datarhei/joy4/format/rtsp/stream.go generated vendored
View file

@ -26,4 +26,3 @@ type Stream struct {
lasttime time.Duration
}

6
vendor/github.com/datarhei/joy4/format/ts/demuxer.go generated vendored
View file

@ -3,13 +3,13 @@ package ts
import (
"bufio"
"fmt"
"time"
"github.com/datarhei/joy4/utils/bits/pio"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/format/ts/tsio"
"github.com/datarhei/joy4/codec/aacparser"
"github.com/datarhei/joy4/codec/h264parser"
"github.com/datarhei/joy4/format/ts/tsio"
"github.com/datarhei/joy4/utils/bits/pio"
"io"
"time"
)
type Demuxer struct {

3
vendor/github.com/datarhei/joy4/format/ts/handler.go generated vendored
View file

@ -1,9 +1,9 @@
package ts
import (
"io"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/av/avutil"
"io"
)
func Handler(h *avutil.RegisterHandler) {
@ -23,4 +23,3 @@ func Handler(h *avutil.RegisterHandler) {
h.CodecTypes = CodecTypes
}

3
vendor/github.com/datarhei/joy4/format/ts/stream.go generated vendored
View file

@ -1,9 +1,9 @@
package ts
import (
"time"
"github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/format/ts/tsio"
"time"
)
type Stream struct {
@ -24,4 +24,3 @@ type Stream struct {
data []byte
datalen int
}

1
vendor/github.com/datarhei/joy4/format/ts/tsio/checksum.go generated vendored
View file

@ -52,4 +52,3 @@ func calcCRC32(crc uint32, data []byte) uint32 {
}
return crc
}

6
vendor/github.com/datarhei/joy4/format/ts/tsio/tsio.go generated vendored
View file

@ -1,11 +1,10 @@
package tsio
import (
"io"
"time"
"fmt"
"github.com/datarhei/joy4/utils/bits/pio"
"io"
"time"
)
const (
@ -587,4 +586,3 @@ func ParseTSHeader(tshdr []byte) (pid uint16, start bool, iskeyframe bool, hdrle
}
return
}

2
vendor/github.com/datarhei/joy4/utils/bits/pio/pio.go generated vendored
View file

@ -1,5 +1,3 @@
package pio
var RecommendBufioSize = 1024 * 64

102
vendor/github.com/datarhei/joy4/utils/bits/pio/reader.go generated vendored
View file

@ -1,4 +1,3 @@
package pio
func U8(b []byte) (i uint8) {
@ -7,85 +6,116 @@ func U8(b []byte) (i uint8) {
func U16BE(b []byte) (i uint16) {
i = uint16(b[0])
i <<= 8; i |= uint16(b[1])
i <<= 8
i |= uint16(b[1])
return
}
func I16BE(b []byte) (i int16) {
i = int16(b[0])
i <<= 8; i |= int16(b[1])
i <<= 8
i |= int16(b[1])
return
}
func I24BE(b []byte) (i int32) {
i = int32(int8(b[0]))
i <<= 8; i |= int32(b[1])
i <<= 8; i |= int32(b[2])
i <<= 8
i |= int32(b[1])
i <<= 8
i |= int32(b[2])
return
}
func U24BE(b []byte) (i uint32) {
i = uint32(b[0])
i <<= 8; i |= uint32(b[1])
i <<= 8; i |= uint32(b[2])
i <<= 8
i |= uint32(b[1])
i <<= 8
i |= uint32(b[2])
return
}
func I32BE(b []byte) (i int32) {
i = int32(int8(b[0]))
i <<= 8; i |= int32(b[1])
i <<= 8; i |= int32(b[2])
i <<= 8; i |= int32(b[3])
i <<= 8
i |= int32(b[1])
i <<= 8
i |= int32(b[2])
i <<= 8
i |= int32(b[3])
return
}
func U32LE(b []byte) (i uint32) {
i = uint32(b[3])
i <<= 8; i |= uint32(b[2])
i <<= 8; i |= uint32(b[1])
i <<= 8; i |= uint32(b[0])
i <<= 8
i |= uint32(b[2])
i <<= 8
i |= uint32(b[1])
i <<= 8
i |= uint32(b[0])
return
}
func U32BE(b []byte) (i uint32) {
i = uint32(b[0])
i <<= 8; i |= uint32(b[1])
i <<= 8; i |= uint32(b[2])
i <<= 8; i |= uint32(b[3])
i <<= 8
i |= uint32(b[1])
i <<= 8
i |= uint32(b[2])
i <<= 8
i |= uint32(b[3])
return
}
func U40BE(b []byte) (i uint64) {
i = uint64(b[0])
i <<= 8; i |= uint64(b[1])
i <<= 8; i |= uint64(b[2])
i <<= 8; i |= uint64(b[3])
i <<= 8; i |= uint64(b[4])
i <<= 8
i |= uint64(b[1])
i <<= 8
i |= uint64(b[2])
i <<= 8
i |= uint64(b[3])
i <<= 8
i |= uint64(b[4])
return
}
func U64BE(b []byte) (i uint64) {
i = uint64(b[0])
i <<= 8; i |= uint64(b[1])
i <<= 8; i |= uint64(b[2])
i <<= 8; i |= uint64(b[3])
i <<= 8; i |= uint64(b[4])
i <<= 8; i |= uint64(b[5])
i <<= 8; i |= uint64(b[6])
i <<= 8; i |= uint64(b[7])
i <<= 8
i |= uint64(b[1])
i <<= 8
i |= uint64(b[2])
i <<= 8
i |= uint64(b[3])
i <<= 8
i |= uint64(b[4])
i <<= 8
i |= uint64(b[5])
i <<= 8
i |= uint64(b[6])
i <<= 8
i |= uint64(b[7])
return
}
func I64BE(b []byte) (i int64) {
i = int64(int8(b[0]))
i <<= 8; i |= int64(b[1])
i <<= 8; i |= int64(b[2])
i <<= 8; i |= int64(b[3])
i <<= 8; i |= int64(b[4])
i <<= 8; i |= int64(b[5])
i <<= 8; i |= int64(b[6])
i <<= 8; i |= int64(b[7])
i <<= 8
i |= int64(b[1])
i <<= 8
i |= int64(b[2])
i <<= 8
i |= int64(b[3])
i <<= 8
i |= int64(b[4])
i <<= 8
i |= int64(b[5])
i <<= 8
i |= int64(b[6])
i <<= 8
i |= int64(b[7])
return
}

1
vendor/github.com/datarhei/joy4/utils/bits/pio/vec.go generated vendored
View file

@ -66,4 +66,3 @@ func VecSlice(in [][]byte, s int, e int) (out [][]byte) {
out = out[:n]
return
}

2
vendor/github.com/datarhei/joy4/utils/bits/pio/writer.go generated vendored
View file

@ -1,4 +1,3 @@
package pio
func PutU8(b []byte, v uint8) {
@ -86,4 +85,3 @@ func PutI64BE(b []byte, v int64) {
b[6] = byte(v >> 8)
b[7] = byte(v)
}

2
vendor/modules.txt vendored
View file

@ -53,7 +53,7 @@ github.com/datarhei/gosrt/internal/congestion
github.com/datarhei/gosrt/internal/crypto
github.com/datarhei/gosrt/internal/net
github.com/datarhei/gosrt/internal/packet
# github.com/datarhei/joy4 v0.0.0-20210125162555-2102a8289cce
# github.com/datarhei/joy4 v0.0.0-20220728180719-f752080f4a36
## explicit; go 1.14
github.com/datarhei/joy4/av
github.com/datarhei/joy4/av/avutil