commit e7e2b86dca1304f64b739b15f24f474b5cffedeb
parent ed85a4073c95e3bed55beb2d2b1b7a9beff62e51
Author: Oliver Lowe <o@olowe.co>
Date: Sat, 1 Jun 2024 15:37:57 +1000
scte35: again! use copy instead of manually assigning bytes
Resolves https://github.com/untangledco/streaming/issues/15
Diffstat:
3 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/scte35/break_duration.go b/scte35/break_duration.go
@@ -20,11 +20,7 @@ func packBreakDuration(b *BreakDuration) [5]byte {
pts := toPTS(b.Duration)
// 1 bit remaining in the first byte, so pack 1 bit from the timestamp
p[0] |= pts[0]
-
- p[1] = pts[1]
- p[2] = pts[2]
- p[3] = pts[3]
- p[4] = pts[4]
+ copy(p[1:], pts[1:])
return p
}
diff --git a/scte35/command.go b/scte35/command.go
@@ -238,8 +238,7 @@ func encodeInsert(ins *Insert) []byte {
}
buf = append(buf, byte(ins.ProgramID>>8))
buf = append(buf, byte(ins.ProgramID))
- buf = append(buf, byte(ins.AvailNum))
- buf = append(buf, byte(ins.AvailExpected))
+ buf = append(buf, byte(ins.AvailNum), byte(ins.AvailExpected))
}
return buf
}
diff --git a/scte35/splice.go b/scte35/splice.go
@@ -37,7 +37,7 @@ func (t SAPType) String() string {
}
type Splice struct {
- SAPType SAPType
+ SAPType SAPType
// If true, indicates that the contents of Command,
// Descriptors and CRC32 are encrypted with Cipher.
@@ -45,7 +45,7 @@ type Splice struct {
Encrypted bool
Cipher Cipher
// The control word (key) used to decrypt the message.
- CWIndex uint8
+ CWIndex uint8
// Holds a 33-bit unsigned integer representing the number of
// ticks of a 90KHz clock. The value is an offset added to
@@ -56,17 +56,17 @@ type Splice struct {
// Holds a 12-bit field representing an authorization tier. In
// most cases, its value should be 0x0fff for backwards
// compatibility. See 'tier' in SCTE 35 section 9.6.1.
- Tier uint16
+ Tier uint16
// Command points to this splice's specific instruction for splice devices.
- Command *Command
+ Command *Command
// Descriptors holds zero or more parameters to Command.
Descriptors []SpliceDescriptor
// A checksum of the encoded splice. Splices returned from
// Decode() will hold a non-zero value. Splices passed to
// Encode() will have their checksums calculated automatically.
- CRC32 uint32
+ CRC32 uint32
}
// fields of Splice Info Section which MUST have their values set...
@@ -172,10 +172,7 @@ func Decode(buf []byte) (*Splice, error) {
pts := make([]byte, 8)
pts[0] = buf[1] & (1 << 1)
- pts[1] = buf[2]
- pts[2] = buf[3]
- pts[3] = buf[4]
- pts[4] = buf[5]
+ copy(pts[1:], buf[2:6])
splice.PTSAdjustment = binary.BigEndian.Uint64(pts)
splice.CWIndex = uint8(buf[6])
@@ -223,10 +220,7 @@ func decodeCommand(buf []byte) (*Command, error) {
if buf[1]&0x80 == 1<<7 {
b := make([]byte, 8)
b[3] = buf[1] & 0x01 // ignoring flag and reserved bits
- b[4] = buf[2]
- b[5] = buf[3]
- b[6] = buf[4]
- b[7] = buf[5]
+ copy(b[4:], buf[2:6])
t := binary.BigEndian.Uint64(b)
cmd.TimeSignal = &t
}
