Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mathis Rosenhauer
libaec
Commits
8fe7d87e
Commit
8fe7d87e
authored
Jul 25, 2012
by
Mathis Rosenhauer
Browse files
removed some redundant states
parent
22673046
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/aed.c
View file @
8fe7d87e
...
...
@@ -33,7 +33,6 @@ typedef struct internal_state {
uint64_t
acc
;
/* accumulator for currently used bit sequence */
uint8_t
bitp
;
/* bit pointer to the next unused bit in accumulator */
uint32_t
fs
;
/* last fundamental sequence in accumulator */
uint32_t
delta1
;
/* interim result we need to keep for SE option */
}
decode_state
;
/* decoding table for the second-extension option */
...
...
@@ -53,7 +52,6 @@ enum
M_ID
=
0
,
M_SPLIT
,
M_SPLIT_FS
,
M_SPLIT_BITS
,
M_SPLIT_OUTPUT
,
M_LOW_ENTROPY
,
M_LOW_ENTROPY_REF
,
...
...
@@ -61,8 +59,6 @@ enum
M_ZERO_OUTPUT
,
M_SE
,
M_SE_DECODE
,
M_GAMMA_OUTPUT_0
,
M_GAMMA_OUTPUT_1
,
M_UNCOMP
,
M_UNCOMP_COPY
,
};
...
...
@@ -331,7 +327,7 @@ int ae_decode(ae_streamp strm, int flush)
*/
size_t
zero_blocks
;
uint32_t
gamma
,
beta
,
ms
;
uint32_t
gamma
,
beta
,
ms
,
delta1
;
int
k
;
decode_state
*
state
;
...
...
@@ -380,26 +376,18 @@ int ae_decode(ae_streamp strm, int flush)
while
(
--
state
->
i
);
state
->
i
=
state
->
n
;
state
->
mode
=
M_SPLIT_
BITS
;
state
->
mode
=
M_SPLIT_
OUTPUT
;
case
M_SPLIT_
BITS
:
case
M_SPLIT_
OUTPUT
:
k
=
state
->
id
-
1
;
do
{
ASK
(
k
);
state
->
block
[
state
->
i
]
+
=
GET
(
k
);
PUT
(
state
->
block
[
state
->
i
]
+
GET
(
k
)
)
;
DROP
(
k
);
}
while
(
--
state
->
i
);
state
->
i
=
state
->
n
;
state
->
mode
=
M_SPLIT_OUTPUT
;
case
M_SPLIT_OUTPUT
:
do
PUT
(
state
->
block
[
state
->
i
]);
while
(
--
state
->
i
);
state
->
mode
=
M_ID
;
break
;
...
...
@@ -468,35 +456,26 @@ int ae_decode(ae_streamp strm, int flush)
state
->
i
=
REFBLOCK
?
1
:
0
;
case
M_SE_DECODE
:
if
(
state
->
i
<
strm
->
bit_per_sample
)
while
(
state
->
i
<
strm
->
bit_per_sample
)
{
ASKFS
();
state
->
mode
=
M_GAMMA_OUTPUT_0
;
}
else
{
state
->
mode
=
M_ID
;
break
;
}
case
M_GAMMA_OUTPUT_0
:
gamma
=
GETFS
();
beta
=
second_extension
[
gamma
][
0
];
ms
=
second_extension
[
gamma
][
1
];
state
->
delta1
=
gamma
-
ms
;
if
((
state
->
i
&
1
)
==
0
)
{
PUT
(
beta
-
state
->
delta1
);
gamma
=
GETFS
();
beta
=
second_extension
[
gamma
][
0
];
ms
=
second_extension
[
gamma
][
1
];
delta1
=
gamma
-
ms
;
if
((
state
->
i
&
1
)
==
0
)
{
PUT
(
beta
-
delta1
);
state
->
i
++
;
}
PUT
(
delta1
);
state
->
i
++
;
DROPFS
();
}
DROPFS
();
state
->
mode
=
M_GAMMA_OUTPUT_1
;
case
M_GAMMA_OUTPUT_1
:
PUT
(
state
->
delta1
);
state
->
i
++
;
state
->
mode
=
M_SE_DECODE
;
state
->
mode
=
M_ID
;
break
;
case
M_UNCOMP
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment