Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
a5e3bc0f
Commit
a5e3bc0f
authored
Oct 27, 2016
by
Debargha Mukherjee
Committed by
Gerrit Code Review
Oct 27, 2016
Browse files
Merge "Fix compile error with --enable-ans + --enable-accounting" into nextgenv2
parents
030527c5
01b16baa
Changes
1
Hide whitespace changes
Inline
Side-by-side
aom_dsp/ansreader.h
View file @
a5e3bc0f
...
...
@@ -20,6 +20,9 @@
#include
"aom_dsp/prob.h"
#include
"aom_dsp/ans.h"
#include
"aom_ports/mem_ops.h"
#if CONFIG_ACCOUNTING
#include
"av1/common/accounting.h"
#endif
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -29,6 +32,9 @@ struct AnsDecoder {
const
uint8_t
*
buf
;
int
buf_offset
;
uint32_t
state
;
#if CONFIG_ACCOUNTING
Accounting
*
accounting
;
#endif
};
static
INLINE
int
uabs_read
(
struct
AnsDecoder
*
ans
,
AnsP8
p0
)
{
...
...
@@ -119,6 +125,9 @@ static INLINE int ans_read_init(struct AnsDecoder *const ans,
// 110xxxxx implies this byte is a superframe marker
return
1
;
}
#if CONFIG_ACCOUNTING
ans
->
accounting
=
NULL
;
#endif
ans
->
state
+=
L_BASE
;
if
(
ans
->
state
>=
L_BASE
*
IO_BASE
)
return
1
;
return
0
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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