Commit 83fbd577 authored by Luc Trudeau's avatar Luc Trudeau

[Code Cleanup] Move accounting.[ch] to decoder

Bit accounting is really a decoder thing

BUG=aomedia:450

Change-Id: Ib0229064caa98f742e2df08fd79c0451b0d8c09e
parent 0d08afdc
......@@ -24,7 +24,7 @@
#include "aom_dsp/ans.h"
#include "aom_ports/mem_ops.h"
#if CONFIG_ACCOUNTING
#include "av1/common/accounting.h"
#include "av1/decoder/accounting.h"
#endif
#ifdef __cplusplus
......
......@@ -33,7 +33,7 @@
#include "av1/common/odintrin.h"
#if CONFIG_ACCOUNTING
#include "av1/common/accounting.h"
#include "av1/decoder/accounting.h"
#define ACCT_STR_NAME acct_str
#define ACCT_STR_PARAM , const char *ACCT_STR_NAME
#define ACCT_STR_ARG(s) , s
......
......@@ -16,7 +16,7 @@
#include "aom_dsp/entdec.h"
#include "aom_dsp/prob.h"
#if CONFIG_ACCOUNTING
#include "av1/common/accounting.h"
#include "av1/decoder/accounting.h"
#endif
#if CONFIG_BITSTREAM_DEBUG
#include <stdio.h>
......
......@@ -28,7 +28,7 @@
#include "aom/aom_integer.h"
#include "aom_dsp/prob.h"
#if CONFIG_ACCOUNTING
#include "av1/common/accounting.h"
#include "av1/decoder/accounting.h"
#endif
#ifdef __cplusplus
......
......@@ -206,13 +206,6 @@ set(AOM_AV1_ENCODER_MSA_INTRIN
"${AOM_ROOT}/av1/encoder/mips/msa/fdct_msa.h"
"${AOM_ROOT}/av1/encoder/mips/msa/temporal_filter_msa.c")
if (CONFIG_ACCOUNTING)
set(AOM_AV1_COMMON_SOURCES
${AOM_AV1_COMMON_SOURCES}
"${AOM_ROOT}/av1/common/accounting.c"
"${AOM_ROOT}/av1/common/accounting.h")
endif ()
if (CONFIG_HIGHBITDEPTH)
set(AOM_AV1_COMMON_SSE4_1_INTRIN
${AOM_AV1_COMMON_SSE4_1_INTRIN}
......@@ -293,6 +286,13 @@ if (CONFIG_FILTER_INTRA)
"${AOM_ROOT}/av1/common/x86/filterintra_sse4.c")
endif ()
if (CONFIG_ACCOUNTING)
set(AOM_AV1_DECODER_SOURCES
${AOM_AV1_DECODER_SOURCES}
"${AOM_ROOT}/av1/decoder/accounting.c"
"${AOM_ROOT}/av1/decoder/accounting.h")
endif ()
if (CONFIG_INSPECTION)
set(AOM_AV1_DECODER_SOURCES
${AOM_AV1_DECODER_SOURCES}
......
......@@ -106,10 +106,6 @@ AV1_COMMON_SRCS-yes += common/od_dering_simd.h
AV1_COMMON_SRCS-yes += common/cdef.c
AV1_COMMON_SRCS-yes += common/cdef.h
endif
ifeq ($(CONFIG_ACCOUNTING),yes)
AV1_COMMON_SRCS-yes += common/accounting.h
AV1_COMMON_SRCS-yes += common/accounting.c
endif
AV1_COMMON_SRCS-yes += common/odintrin.c
AV1_COMMON_SRCS-yes += common/odintrin.h
......
......@@ -33,6 +33,11 @@ AV1_DX_SRCS-yes += decoder/decoder.h
AV1_DX_SRCS-yes += decoder/dsubexp.c
AV1_DX_SRCS-yes += decoder/dsubexp.h
ifeq ($(CONFIG_ACCOUNTING),yes)
AV1_DX_SRCS-yes += decoder/accounting.h
AV1_DX_SRCS-yes += decoder/accounting.c
endif
ifeq ($(CONFIG_INSPECTION),yes)
AV1_DX_SRCS-yes += decoder/inspection.c
AV1_DX_SRCS-yes += decoder/inspection.h
......
......@@ -23,7 +23,7 @@
#include "av1/common/onyxc_int.h"
#include "av1/decoder/dthread.h"
#if CONFIG_ACCOUNTING
#include "av1/common/accounting.h"
#include "av1/decoder/accounting.h"
#endif
#if CONFIG_INSPECTION
#include "av1/decoder/inspection.h"
......
......@@ -16,7 +16,7 @@ extern "C" {
#endif // __cplusplus
#if CONFIG_ACCOUNTING
#include "av1/common/accounting.h"
#include "av1/decoder/accounting.h"
#endif
typedef void (*aom_inspect_cb)(void *decoder, void *data);
......
......@@ -16,7 +16,7 @@
#include "./video_reader.h"
#include "aom/aom_decoder.h"
#include "aom/aomdx.h"
#include "av1/common/accounting.h"
#include "av1/decoder/accounting.h"
#include "av1/common/onyxc_int.h"
#include "av1/decoder/inspection.h"
......
......@@ -35,7 +35,7 @@
// #include "av1/av1_dx_iface.c"
#include "../av1/common/onyxc_int.h"
#if CONFIG_ACCOUNTING
#include "../av1/common/accounting.h"
#include "../av1/decoder/accounting.h"
#endif
#include "../av1/decoder/inspection.h"
......
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