MyouProject/pixie
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #422 from guzba/master

Browse source 
some jpeg
This commit is contained in:
treeform 2022-05-16 17:21:45 -07:00 committed by GitHub
commit 3f2fefb43d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/pixie/fileformats/jpeg.nim
View file

@ -79,7 +79,7 @@ type
componentOrder: seq[int] componentOrder: seq[int]
progressive: bool progressive: bool
restartInterval: int restartInterval: int
todo: int todoBeforeRestart: int
eobRun: int eobRun: int
when defined(release): when defined(release):
@ -91,7 +91,11 @@ template failInvalid(reason = "unable to load") =
template clampByte(x: int32): uint8 = template clampByte(x: int32): uint8 =
## Clamp integer into byte range. ## Clamp integer into byte range.
clamp(x, 0, 0xFF).uint8 # clamp(x, 0, 0xFF).uint8
let
signBit = (cast[uint32](x) shr 31)
value = cast[uint32](x) and (signBit - 1)
min(value, 255).uint8
proc readUint8(state: var DecoderState): uint8 = proc readUint8(state: var DecoderState): uint8 =
## Reads a byte from the input stream. ## Reads a byte from the input stream.
@ -117,7 +121,7 @@ proc skipChunk(state: var DecoderState) =
proc decodeDRI(state: var DecoderState) = proc decodeDRI(state: var DecoderState) =
## Decode Define Restart Interval ## Decode Define Restart Interval
var len = state.readUint16be() - 2 let len = state.readUint16be() - 2
if len != 2: if len != 2:
failInvalid("invalid DRI length") failInvalid("invalid DRI length")
state.restartInterval = state.readUint16be().int state.restartInterval = state.readUint16be().int
@ -212,7 +216,7 @@ proc decodeDHT(state: var DecoderState) =
proc decodeSOF0(state: var DecoderState) = proc decodeSOF0(state: var DecoderState) =
## Decode start of Frame ## Decode start of Frame
var len = state.readUint16be() - 2 var len = state.readUint16be().int - 2
let precision = state.readUint8() let precision = state.readUint8()
if precision != 8: if precision != 8:
@ -230,6 +234,8 @@ proc decodeSOF0(state: var DecoderState) =
if numComponents notin {1, 3}: if numComponents notin {1, 3}:
failInvalid("unsupported component count, must be 1 or 3") failInvalid("unsupported component count, must be 1 or 3")
len -= 6
for i in 0 ..< numComponents: for i in 0 ..< numComponents:
var component = Component() var component = Component()
component.id = state.readUint8() component.id = state.readUint8()
@ -250,6 +256,8 @@ proc decodeSOF0(state: var DecoderState) =
component.quantizationTableId = quantizationTableId component.quantizationTableId = quantizationTableId
state.components.add(component) state.components.add(component)
len -= 3 * numComponents
for component in state.components.mitems: for component in state.components.mitems:
state.maxXScale = max(state.maxXScale, component.xScale) state.maxXScale = max(state.maxXScale, component.xScale)
state.maxYScale = max(state.maxYScale, component.yScale) state.maxYScale = max(state.maxYScale, component.yScale)
@ -292,6 +300,9 @@ proc decodeSOF0(state: var DecoderState) =
component.widthStride * component.heightStride component.widthStride * component.heightStride
) )
if len != 0:
failInvalid()
proc decodeSOF1(state: var DecoderState) = proc decodeSOF1(state: var DecoderState) =
failInvalid("unsupported extended sequential DCT format") failInvalid("unsupported extended sequential DCT format")
@ -302,16 +313,16 @@ proc decodeSOF2(state: var DecoderState) =
state.progressive = true state.progressive = true
proc reset(state: var DecoderState) = proc reset(state: var DecoderState) =
## Rests the decoder state need for reset markers. ## Rests the decoder state need for restart markers.
state.bitBuffer = 0 state.bitBuffer = 0
state.bitsBuffered = 0 state.bitsBuffered = 0
for component in 0 ..< state.components.len: for component in 0 ..< state.components.len:
state.components[component].dcPred = 0 state.components[component].dcPred = 0
state.hitEnd = false state.hitEnd = false
if state.restartInterval != 0: if state.restartInterval != 0:
state.todo = state.restartInterval state.todoBeforeRestart = state.restartInterval
else: else:
state.todo = 0x7fffffff state.todoBeforeRestart = int.high
state.eobRun = 0 state.eobRun = 0
proc decodeSOS(state: var DecoderState) = proc decodeSOS(state: var DecoderState) =
@ -474,9 +485,8 @@ proc decodeRegularBlock(
) = ) =
## Decodes a whole block. ## Decodes a whole block.
let t = state.huffmanDecode(0, state.components[component].huffmanDC).int let t = state.huffmanDecode(0, state.components[component].huffmanDC).int
if t < 0: if t > 15:
failInvalid() failInvalid("bad huffman code")
let let
diff = diff =
if t == 0: if t == 0:
@ -488,7 +498,7 @@ proc decodeRegularBlock(
data[0] = cast[int16](dc) data[0] = cast[int16](dc)
var i = 1 var i = 1
while true: while i < 64:
let let
rs = state.huffmanDecode(1, state.components[component].huffmanAC) rs = state.huffmanDecode(1, state.components[component].huffmanAC)
s = rs and 15 s = rs and 15
@ -499,15 +509,12 @@ proc decodeRegularBlock(
i += 16 i += 16
else: else:
i += r.int i += r.int
if i notin 0 ..< 64: if i >= 64:
failInvalid() failInvalid()
let zig = deZigZag[i] let zig = deZigZag[i]
data[zig] = cast[int16](state.getBitsAsSignedInt(s.int)) data[zig] = cast[int16](state.getBitsAsSignedInt(s.int))
inc i inc i
if not(i < 64):
break
proc decodeProgressiveBlock( proc decodeProgressiveBlock(
state: var DecoderState, component: int, data: var array[64, int16] state: var DecoderState, component: int, data: var array[64, int16]
) = ) =
@ -517,18 +524,17 @@ proc decodeProgressiveBlock(
if state.successiveApproxHigh == 0: if state.successiveApproxHigh == 0:
let t = state.huffmanDecode(0, state.components[component].huffmanDC).int let t = state.huffmanDecode(0, state.components[component].huffmanDC).int
if t < 0 or t > 15: if t > 15:
failInvalid() failInvalid("bad huffman code")
let let
diff = if t != 0: diff =
if t > 0:
state.getBitsAsSignedInt(t) state.getBitsAsSignedInt(t)
else: else:
0 0
let
dc = state.components[component].dcPred + diff dc = state.components[component].dcPred + diff
state.components[component].dcPred = dc state.components[component].dcPred = dc
data[0] = cast[int16](dc * (1 shl state.successiveApproxLow)) data[0] = cast[int16](dc * (1 shl state.successiveApproxLow))
else: else:
if getBit(state) != 0: if getBit(state) != 0:
data[0] = cast[int16](data[0] + (1 shl state.successiveApproxLow)) data[0] = cast[int16](data[0] + (1 shl state.successiveApproxLow))
@ -548,12 +554,9 @@ proc decodeProgressiveContinuationBlock(
return return
var k = state.spectralStart var k = state.spectralStart
while true: while k <= state.spectralEnd:
let let
rs = state.huffmanDecode(1, state.components[component].huffmanAC) rs = state.huffmanDecode(1, state.components[component].huffmanAC)
if rs < 0:
failInvalid("bad huffman code")
let
s = rs and 15 s = rs and 15
r = rs.int shr 4 r = rs.int shr 4
if s == 0: if s == 0:
@ -566,7 +569,7 @@ proc decodeProgressiveContinuationBlock(
k += 16 k += 16
else: else:
k += r.int k += r.int
if k notin 0 ..< 64: if k >= 64:
failInvalid() failInvalid()
let zig = deZigZag[k] let zig = deZigZag[k]
inc k inc k
@ -574,9 +577,6 @@ proc decodeProgressiveContinuationBlock(
failInvalid() failInvalid()
data[zig] = cast[int16](state.getBitsAsSignedInt(s.int) * (1 shl shift)) data[zig] = cast[int16](state.getBitsAsSignedInt(s.int) * (1 shl shift))
if not(k <= state.spectralEnd):
break
else: else:
var bit = 1 shl state.successiveApproxLow var bit = 1 shl state.successiveApproxLow
@ -593,11 +593,8 @@ proc decodeProgressiveContinuationBlock(
data[zig] = cast[int16](data[zig] - bit) data[zig] = cast[int16](data[zig] - bit)
else: else:
var k = state.spectralStart var k = state.spectralStart
while true: while k <= state.spectralEnd:
let let rs = state.huffmanDecode(1, state.components[component].huffmanAC)
rs = state.huffmanDecode(1, state.components[component].huffmanAC)
if rs < 0:
failInvalid("bad huffman code")
var var
s = rs.int and 15 s = rs.int and 15
r = rs.int shr 4 r = rs.int shr 4
@ -633,9 +630,6 @@ proc decodeProgressiveContinuationBlock(
break break
dec r dec r
if not (k <= state.spectralEnd):
break
template idct1D(s0, s1, s2, s3, s4, s5, s6, s7: int32) = template idct1D(s0, s1, s2, s3, s4, s5, s6, s7: int32) =
## Inverse discrete cosine transform 1D ## Inverse discrete cosine transform 1D
template f2f(x: float32): int32 = (x * 4096 + 0.5).int32 template f2f(x: float32): int32 = (x * 4096 + 0.5).int32
@ -766,18 +760,18 @@ proc decodeBlock(state: var DecoderState, comp, row, column: int) =
else: else:
state.decodeRegularBlock(comp, data) state.decodeRegularBlock(comp, data)
proc checkReset(state: var DecoderState) = proc checkRestart(state: var DecoderState) =
## Check if we might have run into a reset marker, then deal with it. ## Check if we might have run into a restart marker, then deal with it.
dec state.todo dec state.todoBeforeRestart
if state.todo <= 0: if state.todoBeforeRestart <= 0:
if state.bitsBuffered < 24: if state.bitsBuffered < 24:
state.fillBitBuffer() state.fillBitBuffer()
if state.buffer[state.pos] == 0xFF.char: if state.buffer[state.pos] == 0xFF.char:
if state.buffer[state.pos+1] in {0xD0.char .. 0xD7.char}: if state.buffer[state.pos + 1] in {0xD0.char .. 0xD7.char}:
state.pos += 2 state.pos += 2
else: else:
failInvalid("did not get expected reset marker") failInvalid("did not get expected restart marker")
state.reset() state.reset()
proc decodeBlocks(state: var DecoderState) = proc decodeBlocks(state: var DecoderState) =
@ -791,7 +785,7 @@ proc decodeBlocks(state: var DecoderState) =
for column in 0 ..< h: for column in 0 ..< h:
for row in 0 ..< w: for row in 0 ..< w:
state.decodeBlock(comp, row, column) state.decodeBlock(comp, row, column)
state.checkReset() state.checkRestart()
else: else:
# Interleaved regular component pass. # Interleaved regular component pass.
for mcuY in 0 ..< state.numMcuHigh: for mcuY in 0 ..< state.numMcuHigh:
@ -803,7 +797,7 @@ proc decodeBlocks(state: var DecoderState) =
row = (mcuX * state.components[comp].yScale + compX) row = (mcuX * state.components[comp].yScale + compX)
col = (mcuY * state.components[comp].xScale + compY) col = (mcuY * state.components[comp].xScale + compY)
state.decodeBlock(comp, row, col) state.decodeBlock(comp, row, col)
state.checkReset() state.checkRestart()
proc quantizationAndIDCTPass(state: var DecoderState) = proc quantizationAndIDCTPass(state: var DecoderState) =
## Does quantization and IDCT. ## Does quantization and IDCT.
@ -811,16 +805,14 @@ proc quantizationAndIDCTPass(state: var DecoderState) =
let let
w = (state.components[comp].width + 7) shr 3 w = (state.components[comp].width + 7) shr 3
h = (state.components[comp].height + 7) shr 3 h = (state.components[comp].height + 7) shr 3
for column in 0 ..< h: qTableId = state.components[comp].quantizationTableId
for row in 0 ..< w:
var data = state.components[comp].blocks[row][column]
for i in 0 ..< 64:
let qTableId = state.components[comp].quantizationTableId
if qTableId.int notin 0 ..< state.quantizationTables.len: if qTableId.int notin 0 ..< state.quantizationTables.len:
failInvalid() failInvalid()
for column in 0 ..< h:
for row in 0 ..< w:
var data {.byaddr.} = state.components[comp].blocks[row][column]
for i in 0 ..< 64:
data[i] = cast[int16](data[i] * state.quantizationTables[qTableId][i].int32) data[i] = cast[int16](data[i] * state.quantizationTables[qTableId][i].int32)
state.components[comp].idctBlock( state.components[comp].idctBlock(
state.components[comp].widthStride * column * 8 + row * 8, state.components[comp].widthStride * column * 8 + row * 8,
data data
@ -909,15 +901,11 @@ proc buildImage(state: var DecoderState): Image =
cb.unsafe[x, y], cb.unsafe[x, y],
cr.unsafe[x, y], cr.unsafe[x, y],
) )
elif state.components.len == 1: elif state.components.len == 1:
let let cy = state.components[0].channel
cy = state.components[0].channel
for y in 0 ..< state.imageHeight: for y in 0 ..< state.imageHeight:
for x in 0 ..< state.imageWidth: for x in 0 ..< state.imageWidth:
result.unsafe[x, y] = grayScaleToRgbx( result.unsafe[x, y] = grayScaleToRgbx(cy.unsafe[x, y])
cy.unsafe[x, y],
)
else: else:
failInvalid() failInvalid()
@ -952,8 +940,8 @@ proc decodeJpeg*(data: string): Image {.raises: [PixieError].} =
# EOI - End of Image # EOI - End of Image
break break
of 0xD0 .. 0xD7: of 0xD0 .. 0xD7:
# Reset markers # Restart markers
failInvalid("invalid reset marker") failInvalid("invalid restart marker")
of 0xDB: of 0xDB:
# Define Quantization Table(s) # Define Quantization Table(s)
state.decodeDQT() state.decodeDQT()