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

reset marker -> restart marker

Browse source
This commit is contained in:
Ryan Oldenburg 2022-05-16 18:32:53 -05:00
parent 4984513e22
commit 30fc7c73c9
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
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):
@ -117,7 +117,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
@ -302,16 +302,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 = int.high state.todoBeforeRestart = int.high
state.eobRun = 0 state.eobRun = 0
proc decodeSOS(state: var DecoderState) = proc decodeSOS(state: var DecoderState) =
@ -749,10 +749,10 @@ 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()
@ -760,7 +760,7 @@ proc checkReset(state: var DecoderState) =
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) =
@ -774,7 +774,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:
@ -786,7 +786,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.
@ -932,8 +932,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()