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

Simplfy component ordering.

Browse source
This commit is contained in:
treeform 2022-05-07 12:03:03 -07:00
parent a2b6540f89
commit a6ea5fe6c2
2 changed files with 19 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -344,7 +344,7 @@ proc decodeSOS(state: var DecoderState) =
if state.scanComponents notin [1, 3]: if state.scanComponents notin [1, 3]:
failInvalid("unsupported scan component count") failInvalid("unsupported scan component count")
state.componentOrder = @[] state.componentOrder.setLen(0)
for i in 0 ..< state.scanComponents: for i in 0 ..< state.scanComponents:
let let
@ -799,9 +799,9 @@ template checkReset(state: var DecoderState) =
proc decodeBlocks(state: var DecoderState) = proc decodeBlocks(state: var DecoderState) =
## Decodes scan data blocks that follow a SOS block. ## Decodes scan data blocks that follow a SOS block.
if state.progressive:
if state.scanComponents == 1: if state.scanComponents == 1:
# Single component pass. # Single component pass.
let let
comp = state.componentOrder[0] comp = state.componentOrder[0]
w = (state.components[comp].width + 7) shr 3 w = (state.components[comp].width + 7) shr 3
@ -810,29 +810,17 @@ proc decodeBlocks(state: var DecoderState) =
for row in 0 ..< w: for row in 0 ..< w:
state.decodeBlock(comp, row, column) state.decodeBlock(comp, row, column)
state.checkReset() state.checkReset()
else:
# Interleaved component pass.
for y in 0 ..< state.numMcuHigh:
for x in 0 ..< state.numMcuWide:
for comp in state.componentOrder:
for j in 0 ..< state.components[comp].yScale:
for i in 0 ..< state.components[comp].xScale:
let
row = (x * state.components[comp].xScale + i)
column = (y * state.components[comp].yScale + j)
state.decodeBlock(comp, row, column)
state.checkReset()
else: else:
# Interleaved regular component pass. # Interleaved regular component pass.
for y in 0 ..< state.numMcuHigh: for mcuY in 0 ..< state.numMcuHigh:
for x in 0 ..< state.numMcuWide: for mcuX in 0 ..< state.numMcuWide:
for comp in state.componentOrder: for comp in state.componentOrder:
for j in 0 ..< state.components[comp].xScale: for compY in 0 ..< state.components[comp].xScale:
for i in 0 ..< state.components[comp].yScale: for compX in 0 ..< state.components[comp].yScale:
let let
row = (x * state.components[comp].yScale + i) row = (mcuX * state.components[comp].yScale + compX)
column = (y * state.components[comp].xScale + j) col = (mcuY * state.components[comp].xScale + compY)
state.decodeBlock(comp, row, column) state.decodeBlock(comp, row, col)
state.checkReset() state.checkReset()
proc quantizationAndIDCTPass(state: var DecoderState) = proc quantizationAndIDCTPass(state: var DecoderState) =

BIN
tests/fileformats/jpeg/master/cat_4_2_0_progressive.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 19 KiB