mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

codec/mjpeg/jpeg.go: removed 'mark' function

This commit is contained in:
Saxon 2020-01-02 15:42:15 +10:30
parent 210d368adb
commit d98da29596
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
codec/mjpeg/jpeg.go
View File

@ -271,7 +271,7 @@ func (c *Context) ParsePayload(p []byte, m bool) error {
if m {
// End of image marker.
mark(c.buf, codeEOI)
c.buf.put16(0xff00 | codeEOI)
_, err = c.buf.writeTo(c.dst)
if err != nil {
@ -287,10 +287,10 @@ func writeHeader(p *putBuffer, _type, width, height, nbqTab, dri int, qtable []b
height <<= 3
// Indicate start of image.
mark(p, codeSOI)
p.put16(0xff00 | codeSOI)
// Write JFIF header.
mark(p, codeAPP0)
p.put16(0xff00 | codeAPP0)
p.put16(jfifHeadLen)
p.putBytes([]byte(jfifLabel))
p.put16(jfifVer)
@ -302,13 +302,13 @@ func writeHeader(p *putBuffer, _type, width, height, nbqTab, dri int, qtable []b
// If we want to define restart interval then write that.
if dri != 0 {
mark(p, codeDRI)
p.put16(0xff00 | codeDRI)
p.put16(4)
p.put16(uint16(dri))
}
// Define quantization tables.
mark(p, codeDQT)
p.put16(0xff00 | codeDQT)
// Calculate table size and create slice for table.
ts := 2 + nbqTab*(1+64)
@ -320,7 +320,7 @@ func writeHeader(p *putBuffer, _type, width, height, nbqTab, dri int, qtable []b
}
// Define huffman table.
mark(p, codeDHT)
p.put16(0xff00 | codeDHT)
lenIdx := p.len
p.put16(0)
writeHuffman(p, 0, 0, bitsDCLum, valDC)
@ -330,7 +330,7 @@ func writeHeader(p *putBuffer, _type, width, height, nbqTab, dri int, qtable []b
p.put16At(uint16(p.len-lenIdx), lenIdx)
// Start of frame.
mark(p, codeSOF0)
p.put16(0xff00 | codeSOF0)
// Derive sample type.
sample := 1
@ -362,7 +362,7 @@ func writeHeader(p *putBuffer, _type, width, height, nbqTab, dri int, qtable []b
p.put8(uint8(mtxNo))
// Write start of scan.
mark(p, codeSOS)
p.put16(0xff00 | codeSOS)
p.put16(sosLen)
p.put8(sosComponentsInScan)
@ -378,12 +378,6 @@ func writeHeader(p *putBuffer, _type, width, height, nbqTab, dri int, qtable []b
p.put8(0)
}
// mark writes a marker with code c to the putBuffer p.
func mark(p *putBuffer, c byte) {
p.put8(0xff)
p.put8(c)
}
// writeHuffman write a JPEG huffman table to w.
func writeHuffman(p *putBuffer, class, id int, bits, values []byte) {
p.put8(uint8(class<<4 | id))