Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
libaec
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Mathis Rosenhauer
libaec
Commits
16cc61df
Commit
16cc61df
authored
Nov 29, 2012
by
Mathis Rosenhauer
Committed by
Thomas Jahns
Feb 19, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Write directly to output buffer
parent
cda68cb1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
60 deletions
+52
-60
src/decode.c
src/decode.c
+49
-57
src/decode.h
src/decode.h
+2
-2
tests/check_aec.h
tests/check_aec.h
+1
-1
No files found.
src/decode.c
View file @
16cc61df
...
...
@@ -73,13 +73,15 @@
#define FLUSH(KIND) \
static void flush_##KIND(struct aec_stream *strm) \
{ \
int i; \
int64_t x, d, th, lower, m; \
int64_t data; \
uint32_t *bp, *bend, *flush_end; \
struct internal_state *state = strm->state; \
\
flush_end = state->bufp; \
if (state->pp) { \
if (state->flush_start == 0 && state->buf_i > 0) { \
if (state->flush_start == state->buf \
&& state->bufp > state->buf) { \
state->last_out = state->buf[0]; \
\
if (strm->flags & AEC_DATA_SIGNED) { \
...
...
@@ -88,11 +90,11 @@
state->last_out = (state->last_out ^ m) - m; \
} \
put_##KIND(strm, state->last_out); \
state->flush_start
= 1;
\
state->flush_start
++;
\
} \
\
for (
i = state->flush_start; i < state->buf_i; i
++) { \
d =
state->buf[i];
\
for (
bp = state->flush_start; bp < flush_end; bp
++) { \
d =
*bp;
\
x = state->last_out; \
lower = x - state->xmin; \
th = MIN(lower, state->xmax - x); \
...
...
@@ -108,17 +110,17 @@
else \
data = x + th - d; \
} \
state->last_out = data; \
put_##KIND(strm, data); \
state->last_out = data; \
} \
} else { \
for (
i = state->flush_start; i < state->buf_i; i
++) \
put_##KIND(strm,
state->buf[i]);
\
for (
bp = state->flush_start; bp < flush_end; bp
++) \
put_##KIND(strm,
*bp);
\
} \
if (state->buf
_i == state->buf_size) {
\
state->flush_start =
0;
\
if (state->buf
p == state->buf + state->buf_size) {
\
state->flush_start =
state->buf;
\
} else { \
state->flush_start = state->buf
_i;
\
state->flush_start = state->buf
p;
\
} \
}
...
...
@@ -178,43 +180,27 @@ FLUSH(lsb_24);
FLUSH
(
lsb_16
);
FLUSH
(
8
);
static
inline
void
put_sample
(
struct
aec_stream
*
strm
,
uint32_t
s
)
static
inline
void
check_flush
(
struct
aec_stream
*
strm
)
{
/**
Update counters and flush output if necessary
*/
struct
internal_state
*
state
=
strm
->
state
;
state
->
buf
[
state
->
buf_i
++
]
=
s
;
strm
->
avail_out
-=
state
->
bytes_per_sample
;
strm
->
total_out
+=
state
->
bytes_per_sample
;
if
(
state
->
buf_i
==
state
->
buf_size
)
{
if
(
state
->
bufp
==
state
->
buf
+
state
->
buf_size
)
{
state
->
flush_output
(
strm
);
state
->
buf
_i
=
0
;
state
->
buf
p
=
state
->
buf
;
}
}
static
uint32_t
*
get_block_buffer
(
struct
aec_stream
*
strm
)
{
/**
Return a pointer to (the remaining part of) a block buffer
*/
return
strm
->
state
->
buf
+
strm
->
state
->
buf_i
;
}
static
void
flush_block_buffer
(
struct
aec_stream
*
strm
)
static
inline
void
put_sample
(
struct
aec_stream
*
strm
,
uint32_t
s
)
{
/**
Update counters and flush output if necessary
*/
struct
internal_state
*
state
=
strm
->
state
;
int
b
=
strm
->
block_size
-
state
->
buf_i
%
strm
->
block_size
;
state
->
buf_i
+=
b
;
strm
->
avail_out
-=
b
*
state
->
bytes_per_sample
;
strm
->
total_out
+=
b
*
state
->
bytes_per_sample
;
if
(
state
->
buf_i
==
state
->
buf_size
)
{
state
->
flush_output
(
strm
);
state
->
buf_i
=
0
;
}
*
state
->
bufp
++
=
s
;
strm
->
avail_out
-=
state
->
bytes_per_sample
;
strm
->
total_out
+=
state
->
bytes_per_sample
;
check_flush
(
strm
);
}
static
inline
void
fill_acc
(
struct
aec_stream
*
strm
)
...
...
@@ -342,7 +328,7 @@ static int m_id(struct aec_stream *strm)
{
struct
internal_state
*
state
=
strm
->
state
;
if
(
state
->
pp
&&
state
->
buf
_i
==
0
)
if
(
state
->
pp
&&
state
->
buf
p
==
state
->
buf
)
state
->
ref
=
1
;
else
state
->
ref
=
0
;
...
...
@@ -391,23 +377,23 @@ static int m_split_fs(struct aec_stream *strm)
static
int
m_split
(
struct
aec_stream
*
strm
)
{
int
i
,
k
;
uint32_t
*
block
;
struct
internal_state
*
state
=
strm
->
state
;
if
(
BUFFERSPACE
(
strm
))
{
k
=
state
->
id
-
1
;
block
=
get_block_buffer
(
strm
);
if
(
state
->
ref
)
block
[
0
]
=
direct_get
(
strm
,
strm
->
bits_per_sample
);
*
state
->
bufp
++
=
direct_get
(
strm
,
strm
->
bits_per_sample
);
for
(
i
=
state
->
ref
;
i
<
strm
->
block_size
;
i
++
)
block
[
i
]
=
direct_get_fs
(
strm
)
<<
k
;
for
(
i
=
0
;
i
<
strm
->
block_size
-
state
->
ref
;
i
++
)
state
->
bufp
[
i
]
=
direct_get_fs
(
strm
)
<<
k
;
for
(
i
=
state
->
ref
;
i
<
strm
->
block_size
;
i
++
)
block
[
i
]
+=
direct_get
(
strm
,
k
);
*
state
->
bufp
++
+=
direct_get
(
strm
,
k
);
flush_block_buffer
(
strm
);
strm
->
avail_out
-=
state
->
out_blklen
;
strm
->
total_out
+=
state
->
out_blklen
;
check_flush
(
strm
);
state
->
mode
=
m_id
;
return
M_CONTINUE
;
...
...
@@ -442,7 +428,7 @@ static int m_zero_output(struct aec_stream *strm)
static
int
m_zero_block
(
struct
aec_stream
*
strm
)
{
int
i
,
zero_blocks
,
b
;
int
i
,
zero_blocks
,
b
,
zero_bytes
;
struct
internal_state
*
state
=
strm
->
state
;
if
(
fs_ask
(
strm
)
==
0
)
...
...
@@ -451,7 +437,7 @@ static int m_zero_block(struct aec_stream *strm)
fs_drop
(
strm
);
if
(
zero_blocks
==
ROS
)
{
b
=
state
->
buf_i
/
strm
->
block_size
;
b
=
(
state
->
bufp
-
state
->
buf
)
/
strm
->
block_size
;
zero_blocks
=
MIN
(
strm
->
rsi
-
b
,
64
-
(
b
%
64
));
}
else
if
(
zero_blocks
>
ROS
)
{
zero_blocks
--
;
...
...
@@ -462,9 +448,14 @@ static int m_zero_block(struct aec_stream *strm)
else
i
=
zero_blocks
*
strm
->
block_size
;
if
(
strm
->
avail_out
>=
i
*
state
->
bytes_per_sample
)
{
while
(
i
--
)
put_sample
(
strm
,
0
);
zero_bytes
=
i
*
state
->
bytes_per_sample
;
if
(
strm
->
avail_out
>=
zero_bytes
)
{
memset
(
state
->
bufp
,
0
,
i
*
sizeof
(
uint32_t
));
state
->
bufp
+=
i
;
strm
->
avail_out
-=
zero_bytes
;
strm
->
total_out
+=
zero_bytes
;
check_flush
(
strm
);
state
->
mode
=
m_id
;
return
M_CONTINUE
;
}
...
...
@@ -576,14 +567,15 @@ static int m_uncomp_copy(struct aec_stream *strm)
static
int
m_uncomp
(
struct
aec_stream
*
strm
)
{
int
i
;
uint32_t
*
block
;
struct
internal_state
*
state
=
strm
->
state
;
if
(
BUFFERSPACE
(
strm
))
{
block
=
get_block_buffer
(
strm
);
for
(
i
=
0
;
i
<
strm
->
block_size
;
i
++
)
block
[
i
]
=
direct_get
(
strm
,
strm
->
bits_per_sample
);
flush_block_buffer
(
strm
);
*
state
->
bufp
++
=
direct_get
(
strm
,
strm
->
bits_per_sample
);
strm
->
avail_out
-=
state
->
out_blklen
;
strm
->
total_out
+=
state
->
out_blklen
;
check_flush
(
strm
);
state
->
mode
=
m_id
;
return
M_CONTINUE
;
}
...
...
@@ -697,8 +689,8 @@ int aec_decode_init(struct aec_stream *strm)
strm
->
total_in
=
0
;
strm
->
total_out
=
0
;
state
->
buf
_i
=
0
;
state
->
flush_start
=
0
;
state
->
buf
p
=
state
->
buf
;
state
->
flush_start
=
state
->
buf
;
state
->
bitp
=
0
;
state
->
fs
=
0
;
state
->
pp
=
strm
->
flags
&
AEC_DATA_PREPROCESS
;
...
...
src/decode.h
View file @
16cc61df
...
...
@@ -91,9 +91,9 @@ struct internal_state {
int
bytes_per_sample
;
int
*
se_table
;
uint32_t
*
buf
;
uint32_t
buf_i
;
uint32_t
*
bufp
;
uint32_t
buf_size
;
uint32_t
flush_start
;
uint32_t
*
flush_start
;
}
decode_state
;
#endif
/* DECODE_H */
tests/check_aec.h
View file @
16cc61df
...
...
@@ -22,5 +22,5 @@ int update_state(struct test_state *state);
int
encode_decode_small
(
struct
test_state
*
state
);
int
encode_decode_large
(
struct
test_state
*
state
);
#define CHECK_OK ""
#endif
/* CHECK_AEC_H */
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