Skip to content

Commit b2a827f

Browse files
winlinvipwinlinvip
authored
Refine code and add tests for #4289. v7.0.45 (#4412)
Use AI to understand, add comments, add utests, refactor code for PR #4289
1 parent c5b6b72 commit b2a827f

File tree

202 files changed

+6565
-2177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+6565
-2177
lines changed

‎trunk/3rdparty/srs-bench/gb28181/h265reader.go

Lines changed: 38 additions & 214 deletions
Original file line numberDiff line numberDiff line change
@@ -1,226 +1,50 @@
1-
// Package h265reader implements a H265 Annex-B Reader
1+
// Package gb28181 provides GB28181 protocol support
22
package gb28181
33

44
import (
5-
"bytes"
6-
"errors"
75
"io"
8-
)
9-
10-
type NalUnitType uint8
11-
12-
// Enums for NalUnitTypes
13-
const (
14-
NaluTypeSliceTrailN NalUnitType = 0 // 0x0
15-
NaluTypeSliceTrailR NalUnitType = 1 // 0x01
16-
NaluTypeSliceTsaN NalUnitType = 2 // 0x02
17-
NaluTypeSliceTsaR NalUnitType = 3 // 0x03
18-
NaluTypeSliceStsaN NalUnitType = 4 // 0x04
19-
NaluTypeSliceStsaR NalUnitType = 5 // 0x05
20-
NaluTypeSliceRadlN NalUnitType = 6 // 0x06
21-
NaluTypeSliceRadlR NalUnitType = 7 // 0x07
22-
NaluTypeSliceRaslN NalUnitType = 8 // 0x06
23-
NaluTypeSliceRaslR NalUnitType = 9 // 0x09
24-
25-
NaluTypeSliceBlaWlp NalUnitType = 16 // 0x10
26-
NaluTypeSliceBlaWradl NalUnitType = 17 // 0x11
27-
NaluTypeSliceBlaNlp NalUnitType = 18 // 0x12
28-
NaluTypeSliceIdr NalUnitType = 19 // 0x13
29-
NaluTypeSliceIdrNlp NalUnitType = 20 // 0x14
30-
NaluTypeSliceCranut NalUnitType = 21 // 0x15
31-
NaluTypeSliceRsvIrapVcl22 NalUnitType = 22 // 0x16
32-
NaluTypeSliceRsvIrapVcl23 NalUnitType = 23 // 0x17
33-
34-
NaluTypeVps NalUnitType = 32 // 0x20
35-
NaluTypeSps NalUnitType = 33 // 0x21
36-
NaluTypePps NalUnitType = 34 // 0x22
37-
NaluTypeAud NalUnitType = 35 // 0x23
38-
NaluTypeSei NalUnitType = 39 // 0x27
39-
NaluTypeSeiSuffix NalUnitType = 40 // 0x28
406

41-
NaluTypeUnspecified NalUnitType = 48 // 0x30
7+
"github.com/pion/webrtc/v4/pkg/media/h265reader"
428
)
439

44-
// H265Reader reads data from stream and constructs h265 nal units
45-
type H265Reader struct {
46-
stream io.Reader
47-
nalBuffer []byte
48-
countOfConsecutiveZeroBytes int
49-
nalPrefixParsed bool
50-
readBuffer []byte
51-
}
10+
// Type aliases for compatibility with existing code
11+
type H265Reader = h265reader.H265Reader
12+
type NAL = h265reader.NAL
13+
type NalUnitType = h265reader.NalUnitType
5214

53-
var (
54-
errNilReader = errors.New("stream is nil")
55-
errDataIsNotH265Stream = errors.New("data is not a H265 bitstream")
15+
// NAL unit type constants for compatibility with existing code
16+
const (
17+
NaluTypeSliceTrailN = h265reader.NalUnitTypeTrailN
18+
NaluTypeSliceTrailR = h265reader.NalUnitTypeTrailR
19+
NaluTypeSliceTsaN = h265reader.NalUnitTypeTsaN
20+
NaluTypeSliceTsaR = h265reader.NalUnitTypeTsaR
21+
NaluTypeSliceStsaN = h265reader.NalUnitTypeStsaN
22+
NaluTypeSliceStsaR = h265reader.NalUnitTypeStsaR
23+
NaluTypeSliceRadlN = h265reader.NalUnitTypeRadlN
24+
NaluTypeSliceRadlR = h265reader.NalUnitTypeRadlR
25+
NaluTypeSliceRaslN = h265reader.NalUnitTypeRaslN
26+
NaluTypeSliceRaslR = h265reader.NalUnitTypeRaslR
27+
28+
NaluTypeSliceBlaWlp = h265reader.NalUnitTypeBlaWLp
29+
NaluTypeSliceBlaWradl = h265reader.NalUnitTypeBlaWRadl
30+
NaluTypeSliceBlaNlp = h265reader.NalUnitTypeBlaNLp
31+
NaluTypeSliceIdr = h265reader.NalUnitTypeIdrWRadl
32+
NaluTypeSliceIdrNlp = h265reader.NalUnitTypeIdrNLp
33+
NaluTypeSliceCranut = h265reader.NalUnitTypeCraNut
34+
NaluTypeSliceRsvIrapVcl22 = h265reader.NalUnitTypeReserved41 // Approximate mapping
35+
NaluTypeSliceRsvIrapVcl23 = h265reader.NalUnitTypeReserved47 // Approximate mapping
36+
37+
NaluTypeVps = h265reader.NalUnitTypeVps
38+
NaluTypeSps = h265reader.NalUnitTypeSps
39+
NaluTypePps = h265reader.NalUnitTypePps
40+
NaluTypeAud = h265reader.NalUnitTypeAud
41+
NaluTypeSei = h265reader.NalUnitTypePrefixSei
42+
NaluTypeSeiSuffix = h265reader.NalUnitTypeSuffixSei
43+
44+
NaluTypeUnspecified = h265reader.NalUnitTypeUnspec48
5645
)
5746

58-
// NewReader creates new H265Reader
47+
// NewReader creates new H265Reader using Pion's implementation
5948
func NewReader(in io.Reader) (*H265Reader, error) {
60-
if in == nil {
61-
return nil, errNilReader
62-
}
63-
64-
reader := &H265Reader{
65-
stream: in,
66-
nalBuffer: make([]byte, 0),
67-
nalPrefixParsed: false,
68-
readBuffer: make([]byte, 0),
69-
}
70-
71-
return reader, nil
72-
}
73-
74-
// NAL H.265 Network Abstraction Layer
75-
type NAL struct {
76-
PictureOrderCount uint32
77-
78-
// NAL header
79-
ForbiddenZeroBit bool
80-
UnitType NalUnitType
81-
NuhLayerId uint8
82-
NuhTemporalIdPlus1 uint8
83-
84-
Data []byte // header byte + rbsp
85-
}
86-
87-
func (reader *H265Reader) read(numToRead int) (data []byte) {
88-
for len(reader.readBuffer) < numToRead {
89-
buf := make([]byte, 4096)
90-
n, err := reader.stream.Read(buf)
91-
if n == 0 || err != nil {
92-
break
93-
}
94-
buf = buf[0:n]
95-
reader.readBuffer = append(reader.readBuffer, buf...)
96-
}
97-
var numShouldRead int
98-
if numToRead <= len(reader.readBuffer) {
99-
numShouldRead = numToRead
100-
} else {
101-
numShouldRead = len(reader.readBuffer)
102-
}
103-
data = reader.readBuffer[0:numShouldRead]
104-
reader.readBuffer = reader.readBuffer[numShouldRead:]
105-
return data
106-
}
107-
108-
func (reader *H265Reader) bitStreamStartsWithH265Prefix() (prefixLength int, e error) {
109-
nalPrefix3Bytes := []byte{0, 0, 1}
110-
nalPrefix4Bytes := []byte{0, 0, 0, 1}
111-
112-
prefixBuffer := reader.read(4)
113-
114-
n := len(prefixBuffer)
115-
116-
if n == 0 {
117-
return 0, io.EOF
118-
}
119-
120-
if n < 3 {
121-
return 0, errDataIsNotH265Stream
122-
}
123-
124-
nalPrefix3BytesFound := bytes.Equal(nalPrefix3Bytes, prefixBuffer[:3])
125-
if n == 3 {
126-
if nalPrefix3BytesFound {
127-
return 0, io.EOF
128-
}
129-
return 0, errDataIsNotH265Stream
130-
}
131-
132-
// n == 4
133-
if nalPrefix3BytesFound {
134-
reader.nalBuffer = append(reader.nalBuffer, prefixBuffer[3])
135-
return 3, nil
136-
}
137-
138-
nalPrefix4BytesFound := bytes.Equal(nalPrefix4Bytes, prefixBuffer)
139-
if nalPrefix4BytesFound {
140-
return 4, nil
141-
}
142-
return 0, errDataIsNotH265Stream
143-
}
144-
145-
// NextNAL reads from stream and returns then next NAL,
146-
// and an error if there is incomplete frame data.
147-
// Returns all nil values when no more NALs are available.
148-
func (reader *H265Reader) NextNAL() (*NAL, error) {
149-
if !reader.nalPrefixParsed {
150-
_, err := reader.bitStreamStartsWithH265Prefix()
151-
if err != nil {
152-
return nil, err
153-
}
154-
155-
reader.nalPrefixParsed = true
156-
}
157-
158-
for {
159-
buffer := reader.read(1)
160-
n := len(buffer)
161-
162-
if n != 1 {
163-
break
164-
}
165-
readByte := buffer[0]
166-
nalFound := reader.processByte(readByte)
167-
if nalFound {
168-
nal := newNal(reader.nalBuffer)
169-
nal.parseHeader()
170-
if nal.UnitType == NaluTypeSeiSuffix || nal.UnitType == NaluTypeSei {
171-
reader.nalBuffer = nil
172-
continue
173-
} else {
174-
break
175-
}
176-
}
177-
178-
reader.nalBuffer = append(reader.nalBuffer, readByte)
179-
}
180-
181-
if len(reader.nalBuffer) == 0 {
182-
return nil, io.EOF
183-
}
184-
185-
nal := newNal(reader.nalBuffer)
186-
reader.nalBuffer = nil
187-
nal.parseHeader()
188-
189-
return nal, nil
190-
}
191-
192-
func (reader *H265Reader) processByte(readByte byte) (nalFound bool) {
193-
nalFound = false
194-
195-
switch readByte {
196-
case 0:
197-
reader.countOfConsecutiveZeroBytes++
198-
case 1:
199-
if reader.countOfConsecutiveZeroBytes >= 2 {
200-
countOfConsecutiveZeroBytesInPrefix := 2
201-
if reader.countOfConsecutiveZeroBytes > 2 {
202-
countOfConsecutiveZeroBytesInPrefix = 3
203-
}
204-
nalUnitLength := len(reader.nalBuffer) - countOfConsecutiveZeroBytesInPrefix
205-
reader.nalBuffer = reader.nalBuffer[0:nalUnitLength]
206-
reader.countOfConsecutiveZeroBytes = 0
207-
nalFound = true
208-
} else {
209-
reader.countOfConsecutiveZeroBytes = 0
210-
}
211-
default:
212-
reader.countOfConsecutiveZeroBytes = 0
213-
}
214-
215-
return nalFound
216-
}
217-
218-
func newNal(data []byte) *NAL {
219-
return &NAL{PictureOrderCount: 0, ForbiddenZeroBit: false, UnitType: NaluTypeUnspecified, Data: data}
220-
}
221-
222-
func (h *NAL) parseHeader() {
223-
firstByte := h.Data[0]
224-
h.ForbiddenZeroBit = (((firstByte & 0x80) >> 7) == 1) // 0x80 = 0b10000000
225-
h.UnitType = NalUnitType((firstByte & 0x7E) >> 1) // 0x1F = 0b01111110
49+
return h265reader.NewReader(in)
22650
}

‎trunk/3rdparty/srs-bench/gb28181/ingester.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -456,13 +456,13 @@ func (v *PSIngester) writeH265(ctx context.Context, pack *PSPackStream, h265 *H2
456456

457457
videoFrames = append(videoFrames, frame)
458458
logger.If(ctx, "NALU %v PictureOrderCount=%v, ForbiddenZeroBit=%v, %v bytes",
459-
frame.UnitType, frame.PictureOrderCount, frame.ForbiddenZeroBit, len(frame.Data))
459+
frame.NalUnitType, frame.PictureOrderCount, frame.ForbiddenZeroBit, len(frame.Data))
460460

461-
if frame.UnitType == NaluTypeVps {
461+
if frame.NalUnitType == NaluTypeVps {
462462
vps = frame
463-
} else if frame.UnitType == NaluTypeSps {
463+
} else if frame.NalUnitType == NaluTypeSps {
464464
sps = frame
465-
} else if frame.UnitType == NaluTypePps {
465+
} else if frame.NalUnitType == NaluTypePps {
466466
pps = frame
467467
} else {
468468
break

‎trunk/3rdparty/srs-bench/go.mod

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module github.com/ossrs/srs-bench
22

3-
go 1.21
3+
go 1.23.0
44

55
require (
66
github.com/ghettovoice/gosip v0.0.0-20220929080231-de8ba881be83
77
github.com/google/gopacket v1.1.19
88
github.com/haivision/srtgo v0.0.0-20230627061225-a70d53fcd618
99
github.com/ossrs/go-oryx-lib v0.0.9
1010
github.com/pion/ice/v4 v4.0.10
11-
github.com/pion/interceptor v0.1.37
12-
github.com/pion/logging v0.2.3
11+
github.com/pion/interceptor v0.1.40
12+
github.com/pion/logging v0.2.4
1313
github.com/pion/rtcp v1.2.15
14-
github.com/pion/rtp v1.8.15
15-
github.com/pion/sdp/v3 v3.0.11
14+
github.com/pion/rtp v1.8.20
15+
github.com/pion/sdp/v3 v3.0.14
1616
github.com/pion/transport/v3 v3.0.7
17-
github.com/pion/webrtc/v4 v4.1.1
17+
github.com/pion/webrtc/v4 v4.1.3
1818
github.com/pkg/errors v0.9.1
1919
github.com/yapingcat/gomedia/codec v0.0.0-20220617074658-94762898dc25
2020
github.com/yapingcat/gomedia/mpeg2 v0.0.0-20220617074658-94762898dc25
@@ -35,16 +35,16 @@ require (
3535
github.com/pion/mdns/v2 v2.0.7 // indirect
3636
github.com/pion/randutil v0.1.0 // indirect
3737
github.com/pion/sctp v1.8.39 // indirect
38-
github.com/pion/srtp/v3 v3.0.4 // indirect
38+
github.com/pion/srtp/v3 v3.0.6 // indirect
3939
github.com/pion/stun/v3 v3.0.0 // indirect
40-
github.com/pion/turn/v4 v4.0.0 // indirect
40+
github.com/pion/turn/v4 v4.0.2 // indirect
4141
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
4242
github.com/sirupsen/logrus v1.4.2 // indirect
4343
github.com/tevino/abool v0.0.0-20170917061928-9b9efcf221b5 // indirect
4444
github.com/wlynxg/anet v0.0.5 // indirect
4545
github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect
46-
golang.org/x/crypto v0.33.0 // indirect
47-
golang.org/x/net v0.35.0 // indirect
48-
golang.org/x/sys v0.30.0 // indirect
49-
golang.org/x/term v0.29.0 // indirect
46+
golang.org/x/crypto v0.39.0 // indirect
47+
golang.org/x/net v0.41.0 // indirect
48+
golang.org/x/sys v0.33.0 // indirect
49+
golang.org/x/term v0.32.0 // indirect
5050
)

0 commit comments

Comments
 (0)