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
e047ec68
Commit
e047ec68
authored
May 12, 2016
by
Mathis Rosenhauer
Browse files
Fix ROS detection in combination with incomplete RSI
parent
1e1919a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/encode.c
View file @
e047ec68
...
...
@@ -646,10 +646,10 @@ static int m_check_zero_block(struct aec_stream *strm)
state
->
zero_ref
=
state
->
ref
;
state
->
zero_ref_sample
=
state
->
ref_sample
;
}
if
(
state
->
blocks_avail
==
0
||
(
strm
->
rsi
-
state
->
blocks_avail
)
%
64
==
0
)
{
if
(
state
->
blocks_avail
==
0
||
state
->
blocks_dispensed
%
64
==
0
)
{
if
(
state
->
zero_blocks
>
4
)
state
->
zero_blocks
=
ROS
;
state
->
mode
=
m_encode_zero
;
return
M_CONTINUE
;
}
...
...
@@ -728,6 +728,7 @@ static int m_get_block(struct aec_stream *strm)
if
(
state
->
blocks_avail
==
0
)
{
state
->
blocks_avail
=
strm
->
rsi
-
1
;
state
->
block
=
state
->
data_pp
;
state
->
blocks_dispensed
=
1
;
if
(
strm
->
avail_in
>=
state
->
rsi_len
)
{
state
->
get_rsi
(
strm
);
...
...
@@ -745,6 +746,7 @@ static int m_get_block(struct aec_stream *strm)
state
->
uncomp_len
=
strm
->
block_size
*
strm
->
bits_per_sample
;
}
state
->
block
+=
strm
->
block_size
;
state
->
blocks_dispensed
++
;
state
->
blocks_avail
--
;
return
m_check_zero_block
(
strm
);
}
...
...
src/encode.h
View file @
e047ec68
...
...
@@ -94,6 +94,9 @@ struct internal_state {
/* remaining blocks in buffer */
int
blocks_avail
;
/* blocks encoded so far in RSI */
int
blocks_dispensed
;
/* current (preprocessed) input block */
uint32_t
*
block
;
...
...
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