#include "third_party/googletest/src/include/gtest/gtest.h"
extern "C" {
-#include "vp9/encoder/vp9_boolhuff.h"
#include "vp9/decoder/vp9_dboolhuff.h"
+#include "vp9/encoder/vp9_writer.h"
}
#include "test/acm_random.h"
#include "vp9/common/vp9_common.h"
#include "vp9/common/vp9_entropy.h"
-#include "vp9/encoder/vp9_boolhuff.h"
#include "vp9/encoder/vp9_treewriter.h"
+#include "vp9/encoder/vp9_writer.h"
#define vp9_cost_upd256 ((int)(vp9_cost_one(upd) - vp9_cost_zero(upd)))
#ifndef VP9_ENCODER_VP9_TREEWRITER_H_
#define VP9_ENCODER_VP9_TREEWRITER_H_
-#include "vp9/encoder/vp9_boolhuff.h" /* for now */
+#include "vp9/encoder/vp9_writer.h"
#define vp9_cost_zero(prob) (vp9_prob_cost[prob])
*/
#include <assert.h>
-#include "vp9/encoder/vp9_boolhuff.h"
+#include "vp9/encoder/vp9_writer.h"
#include "vp9/common/vp9_entropy.h"
#if defined(SECTIONBITS_OUTPUT)
* be found in the AUTHORS file in the root of the source tree.
*/
-
-/****************************************************************************
-*
-* Module Title : vp9_boolhuff.h
-*
-* Description : Bool Coder header file.
-*
-****************************************************************************/
-#ifndef VP9_ENCODER_VP9_BOOLHUFF_H_
-#define VP9_ENCODER_VP9_BOOLHUFF_H_
+#ifndef VP9_ENCODER_VP9_WRITER_H_
+#define VP9_ENCODER_VP9_WRITER_H_
#include "vpx_ports/mem.h"
// Variables used to track bit costs without outputing to the bitstream
unsigned int measure_cost;
- unsigned long bit_counter;
+ uint64_t bit_counter;
} vp9_writer;
extern const unsigned int vp9_prob_cost[256];
#define vp9_write_prob(w, v) vp9_write_literal((w), (v), 8)
-#endif // VP9_ENCODER_VP9_BOOLHUFF_H_
+#endif // VP9_ENCODER_VP9_WRITER_H_
VP9_CX_SRCS-yes += vp9_cx_iface.c
VP9_CX_SRCS-yes += encoder/vp9_bitstream.c
-VP9_CX_SRCS-yes += encoder/vp9_boolhuff.c
VP9_CX_SRCS-yes += encoder/vp9_dct.c
VP9_CX_SRCS-yes += encoder/vp9_dct.h
VP9_CX_SRCS-yes += encoder/vp9_encodeframe.c
VP9_CX_SRCS-yes += encoder/vp9_extend.c
VP9_CX_SRCS-yes += encoder/vp9_firstpass.c
VP9_CX_SRCS-yes += encoder/vp9_block.h
-VP9_CX_SRCS-yes += encoder/vp9_boolhuff.h
+VP9_CX_SRCS-yes += encoder/vp9_writer.h
+VP9_CX_SRCS-yes += encoder/vp9_writer.c
VP9_CX_SRCS-yes += encoder/vp9_write_bit_buffer.h
VP9_CX_SRCS-yes += encoder/vp9_bitstream.h
VP9_CX_SRCS-yes += encoder/vp9_encodemb.h