From 23e03eeddcae399ecbf349b3d0211f6e27258fa7 Mon Sep 17 00:00:00 2001 From: saxon Date: Tue, 29 Jan 2019 16:47:55 +1030 Subject: [PATCH] cmd: removed ts-repair - which shouldn't have been on this branch --- cmd/ts-repair/main.go | 217 ------------------------------------------ 1 file changed, 217 deletions(-) delete mode 100644 cmd/ts-repair/main.go diff --git a/cmd/ts-repair/main.go b/cmd/ts-repair/main.go deleted file mode 100644 index f3f73bb2..00000000 --- a/cmd/ts-repair/main.go +++ /dev/null @@ -1,217 +0,0 @@ -package main - -import ( - "errors" - "flag" - "fmt" - "io" - "os" - - "bitbucket.org/ausocean/av/stream/mts" - "github.com/Comcast/gots/packet" -) - -// Various errors that we can encounter. -const ( - errBadInPath = "No file path provided, or file does not exist" - errCantCreateOut = "Can't create output file" - errCantGetPid = "Can't get pid from packet" - errReadFail = "Read failed" - errWriteFail = "Write to file failed" - errBadMode = "Bad fix mode" - errAdaptationPresent = "Adaptation field is already present in packet" - errNoAdaptationField = "No adaptation field in this packet" -) - -// Consts describing flag usage. -const ( - inUsage = "The path to the file to be repaired" - outUsage = "Output file path" - modeUsage = "Fix mode: 0 = cc-shift, 1 = di-update" -) - -// Repair modes. -const ( - ccShift = iota - diUpdate -) - -var ccMap = map[int]byte{ - mts.PatPid: 16, - mts.PmtPid: 16, - mts.VideoPid: 16, -} - -// packetNo will keep track of the ts packet number for reference. -var packetNo int - -// Option defines a func that performs an action on p in order to change a ts option. -type Option func(p *Packet) - -// Packet is a byte array of size mts.PacketSize i.e. 188 bytes. We define this -// to allow us to write receiver funcs for the [mts.PacketSize]byte type. -type Packet [mts.PacketSize]byte - -// CC returns the CC of p. -func (p *Packet) CC() byte { - return (*p)[3] & 0x0f -} - -// setCC sets the CC of p. -func (p *Packet) setCC(cc byte) { - (*p)[3] |= cc & 0xf -} - -// setDI sets the discontinuity counter of p. -func (p *Packet) setDI(di bool) { - if di { - p[5] |= 0x80 - } else { - p[5] &= 0x7f - } -} - -// addAdaptationField adds an adaptation field to p, and applys the passed options to this field. -// TODO: this will probably break if we already have adaptation field. -func (p *Packet) addAdaptationField(options ...Option) error { - if p.hasAdaptation() { - return errors.New(errAdaptationPresent) - } - // Create space for adaptation field. - copy(p[mts.HeadSize+mts.DefaultAdaptationSize:], p[mts.HeadSize:len(p)-mts.DefaultAdaptationSize]) - - // TODO: seperate into own function - // Update adaptation field control. - p[mts.AdaptationControlIdx] &= 0xff ^ mts.AdaptationControlMask - p[mts.AdaptationControlIdx] |= mts.AdaptationControlMask - // Default the adaptationfield. - p.resetAdaptation() - - // Apply and options that have bee passed. - for _, option := range options { - option(p) - } - return nil -} - -// resetAdaptation sets fields in ps adaptation field to 0 if the adaptation field -// exists, otherwise an error is returned. -func (p *Packet) resetAdaptation() error { - if !p.hasAdaptation() { - return errors.New(errNoAdaptationField) - } - p[mts.AdaptationIdx] = mts.DefaultAdaptationBodySize - p[mts.AdaptationBodyIdx] = 0x00 - return nil -} - -// hasAdaptation returns true if p has an adaptation field and false otherwise. -func (p *Packet) hasAdaptation() bool { - afc := p[mts.AdaptationControlIdx] & mts.AdaptationControlMask - if afc == 0x20 || afc == 0x30 { - return true - } else { - return false - } -} - -// DiscontinuityIndicator returns and Option that will set p's discontinuity -// indicator according to f. -func DiscontinuityIndicator(f bool) Option { - return func(p *Packet) { - set := byte(mts.DiscontinuityIndicatorMask) - if !f { - set = 0x00 - } - p[mts.DiscontinuityIndicatorIdx] &= 0xff ^ mts.DiscontinuityIndicatorMask - p[mts.DiscontinuityIndicatorIdx] |= mts.DiscontinuityIndicatorMask & set - } -} - -func main() { - // Deal with input flags - inPtr := flag.String("in", "", inUsage) - outPtr := flag.String("out", "out.ts", outUsage) - modePtr := flag.Int("mode", diUpdate, modeUsage) - flag.Parse() - - // Try and open the given input file, otherwise panic - we can't do anything - inFile, err := os.Open(*inPtr) - defer inFile.Close() - if err != nil { - panic(errBadInPath) - } - - // Try and create output file, otherwise panic - we can't do anything - outFile, err := os.Create(*outPtr) - defer outFile.Close() - if err != nil { - panic(errCantCreateOut) - } - - // Read each packet from the input file reader - var p Packet - for { - // If we get an end of file then return, otherwise we panic - can't do anything else - if _, err := inFile.Read(p[:mts.PacketSize]); err == io.EOF { - return - } else if err != nil { - panic(errReadFail + ": " + err.Error()) - } - packetNo++ - - // Get the pid from the packet - pid, err := packet.Pid((*packet.Packet)(&p)) - if err != nil { - panic(errCantGetPid) - } - - // Get the cc from the packet and also the expected cc (if exists) - cc := p.CC() - expect, exists := expectedCC(int(pid)) - if !exists { - updateCCMap(int(pid), cc) - } else { - switch *modePtr { - // ccShift mode shifts all CC regardless of presence of Discontinuities or not - case ccShift: - p.setCC(expect) - // diUpdate mode finds discontinuities and sets the discontinuity indicator to true. - // If we have a pat or pmt then we need to add an adaptation field and then set the DI. - case diUpdate: - if cc != expect { - fmt.Printf("***** Discontinuity found (packetNo: %v pid: %v, cc: %v, expect: %v)\n", packetNo, pid, cc, expect) - if p.hasAdaptation() { - p.setDI(true) - } else { - p.addAdaptationField(DiscontinuityIndicator(true)) - } - updateCCMap(int(pid), p.CC()) - } - default: - panic(errBadMode) - } - } - - // Write this packet to the output file. - if _, err := outFile.Write(p[:]); err != nil { - panic(errWriteFail + ": " + err.Error()) - } - } -} - -// expectedCC returns the expected cc for the given pid. If the cc hasn't been -// used yet, then 16 and false is returned. -func expectedCC(pid int) (byte, bool) { - cc := ccMap[pid] - if cc == 16 { - return 16, false - } - ccMap[pid] = (cc + 1) & 0xf - return cc, true -} - -// updateCCMap updates the cc for the passed pid. -func updateCCMap(pid int, cc byte) { - ccMap[pid] = (cc + 1) & 0xf -}