Commit a5e3bc0f authored by Debargha Mukherjee's avatar Debargha Mukherjee Committed by Gerrit Code Review
Browse files

Merge "Fix compile error with --enable-ans + --enable-accounting" into nextgenv2

parents 030527c5 01b16baa
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
#include "aom_dsp/prob.h" #include "aom_dsp/prob.h"
#include "aom_dsp/ans.h" #include "aom_dsp/ans.h"
#include "aom_ports/mem_ops.h" #include "aom_ports/mem_ops.h"
#if CONFIG_ACCOUNTING
#include "av1/common/accounting.h"
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -29,6 +32,9 @@ struct AnsDecoder { ...@@ -29,6 +32,9 @@ struct AnsDecoder {
const uint8_t *buf; const uint8_t *buf;
int buf_offset; int buf_offset;
uint32_t state; uint32_t state;
#if CONFIG_ACCOUNTING
Accounting *accounting;
#endif
}; };
static INLINE int uabs_read(struct AnsDecoder *ans, AnsP8 p0) { static INLINE int uabs_read(struct AnsDecoder *ans, AnsP8 p0) {
...@@ -119,6 +125,9 @@ static INLINE int ans_read_init(struct AnsDecoder *const ans, ...@@ -119,6 +125,9 @@ static INLINE int ans_read_init(struct AnsDecoder *const ans,
// 110xxxxx implies this byte is a superframe marker // 110xxxxx implies this byte is a superframe marker
return 1; return 1;
} }
#if CONFIG_ACCOUNTING
ans->accounting = NULL;
#endif
ans->state += L_BASE; ans->state += L_BASE;
if (ans->state >= L_BASE * IO_BASE) return 1; if (ans->state >= L_BASE * IO_BASE) return 1;
return 0; return 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment