Consolidate adaptationfield

cli/parsefile.go

@@ -35,7 +35,6 @@ import (
 
 	"github.com/Comcast/gots/ebp"
 	"github.com/Comcast/gots/packet"
-	"github.com/Comcast/gots/packet/adaptationfield"
 	"github.com/Comcast/gots/psi"
 	"github.com/Comcast/gots/scte35"
 )
@@ -138,7 +137,7 @@ func main() {
 
 		}
 		if *showEbp {
-			ebpBytes, err := adaptationfield.EncoderBoundaryPoint(&pkt)
+			ebpBytes, err := packet.EncoderBoundaryPointBytes(&pkt)
 			if err != nil {
 				// Not an EBP
 				continue

ebp/ebp.go

@@ -26,9 +26,10 @@ package ebp
 
 import (
 	"encoding/binary"
-	"github.com/Comcast/gots"
 	"io"
 	"time"
+
+	"github.com/Comcast/gots"
 )
 
 // EBP tags

packet/adaptationfield.go

@@ -28,7 +28,7 @@ import (
 	"github.com/Comcast/gots"
 )
 
-// NewPacket creates a new packet with a Null ID, sync byte, and with the adaptation field control set to payload only.
+// NewAdaptationField creates a new *AdaptationField with the flag set for AdaptationField and no payload
 // This function is error free.
 func NewAdaptationField() *AdaptationField {
 	p := New()
@@ -305,8 +305,7 @@ func (af *AdaptationField) ElementaryStreamPriority() (bool, error) {
 	return af.getBit(5, 0x20), nil
 }
 
-// SetHasPCR sets HasPCR
-// HasPCR determines if the packet has a PCR
+// SetHasPCR sets HasPCR flag
 func (af *AdaptationField) SetHasPCR(value bool) error {
 	if err := af.valid(); err != nil {
 		return err
@@ -320,7 +319,7 @@ func (af *AdaptationField) SetHasPCR(value bool) error {
 	return nil
 }
 
-// HasPCR returns if the packet has a PCR
+// HasPCR returns true if the packet has a PCR
 func (af *AdaptationField) HasPCR() (bool, error) {
 	if err := af.valid(); err != nil {
 		return false, err
@@ -564,3 +563,27 @@ func (af *AdaptationField) AdaptationFieldExtension() ([]byte, error) {
 	}
 	return af[af.adaptationExtensionStart():af.stuffingStart()], nil
 }
+
+// EncoderBoundaryPointBytes returns the byte array located in the optional TransportPrivateData of the (also optional)
+// AdaptationField of the Packet. If either of these optional fields are missing an empty byte array is returned with an error
+func EncoderBoundaryPointBytes(packet *Packet) ([]byte, error) {
+
+	af, err := packet.AdaptationField()
+	if err != nil {
+		return nil, err
+	}
+
+	hasTransPriv, err := af.HasTransportPrivateData()
+	if err != nil {
+		return nil, err
+	}
+
+	if af.Length() > 0 && hasTransPriv {
+		ebp, err := af.TransportPrivateData()
+		if err != nil {
+			return nil, err
+		}
+		return ebp, nil
+	}
+	return nil, gots.ErrNoEBP
+}

packet/doc.go

@@ -49,8 +49,8 @@ const (
 type AdaptationFieldControlOptions byte
 
 const (
-	PayloadFlag                   AdaptationFieldControlOptions = 1 // 10
-	AdaptationFieldFlag           AdaptationFieldControlOptions = 2 // 01
+	PayloadFlag                   AdaptationFieldControlOptions = 1 // 01
+	AdaptationFieldFlag           AdaptationFieldControlOptions = 2 // 10
 	PayloadAndAdaptationFieldFlag AdaptationFieldControlOptions = 3 // 11
 )
 

packet/packet.go

@@ -24,7 +24,9 @@ SOFTWARE.
 
 package packet
 
-import "github.com/Comcast/gots"
+import (
+	"github.com/Comcast/gots"
+)
 
 // PayloadUnitStartIndicator (PUSI) is a flag that indicates the start of PES data
 // or PSI  (Program-Specific Information) such as AT, CAT, PMT or NIT.  The PUSI
@@ -36,7 +38,7 @@ func payloadUnitStartIndicator(packet *Packet) bool {
 	return packet[1]&0x040 != 0
 }
 
-// PID is the Packet Identifier.  Each table or elementary stream in the
+// Pid is the Packet Identifier.  Each table or elementary stream in the
 // transport stream is identified by a PID.  The PID is contained in the 13
 // bits that span the last 5 bits of second byte and all bits in the byte.
 func Pid(packet *Packet) (uint16, error) {
@@ -148,7 +150,7 @@ func SetCC(packet *Packet, newCC uint8) (*Packet, error) {
 	return &newPacket, nil
 }
 
-// Returns a byte slice containing the PES header if the Packet contains one,
+// PESHeader Returns a byte slice containing the PES header if the Packet contains one,
 // otherwise returns an error
 func PESHeader(packet *Packet) ([]byte, error) {
 	if containsPayload(packet) && payloadUnitStartIndicator(packet) {