#include "third_party/googletest/src/include/gtest/gtest.h"
#include "vpx/vpx_integer.h"
-#include "vpx_dsp/vp9_reader.h"
+#include "vpx_dsp/bitreader.h"
#include "vp9/encoder/vp9_writer.h"
#define VP9_COMMON_VP9_ENTROPY_H_
#include "vpx/vpx_integer.h"
-#include "vpx_dsp/vp9_prob.h"
+#include "vpx_dsp/prob.h"
#include "vp9/common/vp9_common.h"
#include "vp9/common/vp9_enums.h"
#include "./vpx_config.h"
-#include "vpx_dsp/vp9_prob.h"
+#include "vpx_dsp/prob.h"
#include "vp9/common/vp9_mv.h"
#ifndef VP9_COMMON_VP9_SEG_COMMON_H_
#define VP9_COMMON_VP9_SEG_COMMON_H_
-#include "vpx_dsp/vp9_prob.h"
+#include "vpx_dsp/prob.h"
#ifdef __cplusplus
extern "C" {
#include "./vp9_rtcd.h"
#include "./vpx_scale_rtcd.h"
-#include "vpx_dsp/vp9_read_bit_buffer.h"
-#include "vpx_dsp/vp9_reader.h"
+#include "vpx_dsp/bitreader_buffer.h"
+#include "vpx_dsp/bitreader.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
#include "vpx_ports/mem_ops.h"
#ifndef VP9_DECODER_VP9_DECODEMV_H_
#define VP9_DECODER_VP9_DECODEMV_H_
-#include "vpx_dsp/vp9_reader.h"
+#include "vpx_dsp/bitreader.h"
#include "vp9/decoder/vp9_decoder.h"
#include "./vpx_config.h"
#include "vpx/vpx_codec.h"
-#include "vpx_dsp/vp9_reader.h"
+#include "vpx_dsp/bitreader.h"
#include "vpx_scale/yv12config.h"
#include "vpx_util/vpx_thread.h"
#ifndef VP9_DECODER_VP9_DETOKENIZE_H_
#define VP9_DECODER_VP9_DETOKENIZE_H_
-#include "vpx_dsp/vp9_reader.h"
-
+#include "vpx_dsp/bitreader.h"
#include "vp9/decoder/vp9_decoder.h"
#include "vp9/common/vp9_scan.h"
#ifndef VP9_DECODER_VP9_DSUBEXP_H_
#define VP9_DECODER_VP9_DSUBEXP_H_
-#include "vpx_dsp/vp9_reader.h"
+#include "vpx_dsp/bitreader.h"
#ifdef __cplusplus
extern "C" {
#ifndef VP9_ENCODER_VP9_COST_H_
#define VP9_ENCODER_VP9_COST_H_
-#include "vpx_dsp/vp9_prob.h"
+#include "vpx_dsp/prob.h"
#ifdef __cplusplus
extern "C" {
extern "C" {
#endif
-#include "vpx_dsp/vp9_prob.h"
+#include "vpx_dsp/prob.h"
struct vp9_writer;
#include "vpx_ports/mem.h"
-#include "vpx_dsp/vp9_prob.h"
+#include "vpx_dsp/prob.h"
#ifdef __cplusplus
extern "C" {
#include "vpx/internal/vpx_codec_internal.h"
#include "vpx/vp8dx.h"
#include "vpx/vpx_decoder.h"
-#include "vpx_dsp/vp9_read_bit_buffer.h"
+#include "vpx_dsp/bitreader_buffer.h"
#include "vpx_util/vpx_thread.h"
#include "vp9/common/vp9_alloccommon.h"
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "./vp9_prob.h"
-#include "./vp9_reader.h"
+#include "./bitreader.h"
+#include "./prob.h"
#include "vpx_ports/mem.h"
#include "vpx_mem/vpx_mem.h"
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_DECODER_VP9_READER_H_
-#define VP9_DECODER_VP9_READER_H_
+#ifndef VPX_DSP_BITREADER_H_
+#define VPX_DSP_BITREADER_H_
#include <stddef.h>
#include <limits.h>
#include "vpx_ports/mem.h"
#include "vpx/vp8dx.h"
#include "vpx/vpx_integer.h"
-#include "vpx_dsp/vp9_prob.h"
+#include "vpx_dsp/prob.h"
#ifdef __cplusplus
extern "C" {
} // extern "C"
#endif
-#endif // VP9_DECODER_VP9_READER_H_
+#endif // VPX_DSP_BITREADER_H_
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "./vp9_read_bit_buffer.h"
+#include "./bitreader_buffer.h"
size_t vp9_rb_bytes_read(struct vp9_read_bit_buffer *rb) {
return (rb->bit_offset + 7) >> 3;
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_DECODER_VP9_READ_BIT_BUFFER_H_
-#define VP9_DECODER_VP9_READ_BIT_BUFFER_H_
+#ifndef VPX_DSP_BITREADER_BUFFER_H_
+#define VPX_DSP_BITREADER_BUFFER_H_
#include <limits.h>
} // extern "C"
#endif
-#endif // VP9_DECODER_VP9_READ_BIT_BUFFER_H_
+#endif // VPX_DSP_BITREADER_BUFFER_H_
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "./vp9_prob.h"
+#include "./prob.h"
const uint8_t vp9_norm[256] = {
0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_PROB_H_
-#define VP9_COMMON_VP9_PROB_H_
+#ifndef VPX_DSP_PROB_H_
+#define VPX_DSP_PROB_H_
#include "./vpx_config.h"
#include "./vpx_dsp_common.h"
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_PROB_H_
+#endif // VPX_DSP_PROB_H_
DSP_SRCS-$(HAVE_MSA) += mips/macros_msa.h
# bit reader
-DSP_SRCS-yes += vp9_prob.h
-DSP_SRCS-yes += vp9_prob.c
+DSP_SRCS-yes += prob.h
+DSP_SRCS-yes += prob.c
ifeq ($(CONFIG_DECODERS),yes)
-DSP_SRCS-yes += vp9_reader.h
-DSP_SRCS-yes += vp9_reader.c
-DSP_SRCS-yes += vp9_read_bit_buffer.c
-DSP_SRCS-yes += vp9_read_bit_buffer.h
+DSP_SRCS-yes += bitreader.h
+DSP_SRCS-yes += bitreader.c
+DSP_SRCS-yes += bitreader_buffer.c
+DSP_SRCS-yes += bitreader_buffer.h
endif
# loop filters