zishuo/ipchub
1
0
Fork 0
mirror of https://github.com/cnotch/ipchub.git synced 2025-09-26 19:41:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update peek return type(uint32 -> uint64)

Browse Source
This commit is contained in:
notch
2021-01-15 08:44:45 +08:00
parent 0e3b400911
commit d3c4ab4012
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
av/codec/aac/asc.go
View File

@@ -81,7 +81,7 @@ func (asc *AudioSpecificConfig) Decode(config []byte) (err error) {
if asc.ObjectType == AOT_ALS { if asc.ObjectType == AOT_ALS {
r.Skip(5) r.Skip(5)
if r.Peek(24) != binary.BigEndian.Uint32([]byte{0, 'A', 'L', 'S'}) { if uint32(r.Peek(24)) != binary.BigEndian.Uint32([]byte{0, 'A', 'L', 'S'}) {
r.Skip(24) r.Skip(24)
} }

6
av/codec/hevc/vps.go
View File

@@ -36,6 +36,7 @@ type H265RawProfileTierLevel struct {
General_profile_idc uint8 General_profile_idc uint8
General_profile_compatibility_flag [32]uint8 General_profile_compatibility_flag [32]uint8
GeneralProfileCompatibilityFlags uint32 // shortcut flags 32bits
General_progressive_source_flag uint8 General_progressive_source_flag uint8
General_interlaced_source_flag uint8 General_interlaced_source_flag uint8
@@ -53,7 +54,8 @@ type H265RawProfileTierLevel struct {
General_lower_bit_rate_constraint_flag uint8 General_lower_bit_rate_constraint_flag uint8
General_max_14bit_constraint_flag uint8 General_max_14bit_constraint_flag uint8
General_inbld_flag uint8 General_inbld_flag uint8
GeneralConstraintIndicatorFlags uint64 // shortcut flags 48bits
General_level_idc uint8 General_level_idc uint8
@@ -103,10 +105,12 @@ func (ptl *H265RawProfileTierLevel) decode(r *bits.Reader,
ptl.General_tier_flag = r.ReadBit() ptl.General_tier_flag = r.ReadBit()
ptl.General_profile_idc = r.ReadUint8(5) ptl.General_profile_idc = r.ReadUint8(5)
ptl.GeneralProfileCompatibilityFlags = uint32(r.Peek(32))
for j := 0; j < 32; j++ { for j := 0; j < 32; j++ {
ptl.General_profile_compatibility_flag[j] = r.ReadBit() ptl.General_profile_compatibility_flag[j] = r.ReadBit()
} }
ptl.GeneralConstraintIndicatorFlags = r.Peek(48)
ptl.General_progressive_source_flag = r.ReadBit() ptl.General_progressive_source_flag = r.ReadBit()
ptl.General_interlaced_source_flag = r.ReadBit() ptl.General_interlaced_source_flag = r.ReadBit()
ptl.General_non_packed_constraint_flag = r.ReadBit() ptl.General_non_packed_constraint_flag = r.ReadBit()

4
utils/bits/reader.go
View File

@@ -29,9 +29,9 @@ func (r *Reader) Skip(n int) {
} }
// Peek peek the uint32 of n bits. // Peek peek the uint32 of n bits.
func (r *Reader) Peek(n int) uint32 { func (r *Reader) Peek(n int) uint64 {
clone := *r clone := *r
return uint32(clone.readUint64(n, 32)) return clone.readUint64(n, 64)
} }
// Read read the uint32 of n bits. // Read read the uint32 of n bits.