Commit 97279ed2 authored by Yaowu Xu's avatar Yaowu Xu

Move bit reader files to vpx_dsp

Change-Id: Ib1cb1fbe92a39ff5312cee069559be6d3ea458d0
parent 55e80a3c
......@@ -14,11 +14,12 @@
#include "third_party/googletest/src/include/gtest/gtest.h"
#include "vp9/decoder/vp9_reader.h"
#include "vpx/vpx_integer.h"
#include "vpx_dsp/vp9_reader.h"
#include "vp9/encoder/vp9_writer.h"
#include "test/acm_random.h"
#include "vpx/vpx_integer.h"
using libvpx_test::ACMRandom;
......
......@@ -12,10 +12,10 @@
#define VP9_COMMON_VP9_ENTROPY_H_
#include "vpx/vpx_integer.h"
#include "vpx_dsp/vp9_prob.h"
#include "vp9/common/vp9_common.h"
#include "vp9/common/vp9_enums.h"
#include "vp9/common/vp9_prob.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -14,8 +14,9 @@
#include "./vpx_config.h"
#include "vpx_dsp/vp9_prob.h"
#include "vp9/common/vp9_mv.h"
#include "vp9/common/vp9_prob.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -11,7 +11,7 @@
#ifndef VP9_COMMON_VP9_SEG_COMMON_H_
#define VP9_COMMON_VP9_SEG_COMMON_H_
#include "vp9/common/vp9_prob.h"
#include "vpx_dsp/vp9_prob.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -14,6 +14,8 @@
#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_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
#include "vpx_ports/mem_ops.h"
......@@ -38,8 +40,6 @@
#include "vp9/decoder/vp9_decodemv.h"
#include "vp9/decoder/vp9_decoder.h"
#include "vp9/decoder/vp9_dsubexp.h"
#include "vp9/decoder/vp9_read_bit_buffer.h"
#include "vp9/decoder/vp9_reader.h"
#define MAX_VP9_HEADER_SIZE 80
......
......@@ -21,7 +21,6 @@
#include "vp9/decoder/vp9_decodemv.h"
#include "vp9/decoder/vp9_decodeframe.h"
#include "vp9/decoder/vp9_reader.h"
static PREDICTION_MODE read_intra_mode(vp9_reader *r, const vp9_prob *p) {
return (PREDICTION_MODE)vp9_read_tree(r, vp9_intra_mode_tree, p);
......
......@@ -11,8 +11,9 @@
#ifndef VP9_DECODER_VP9_DECODEMV_H_
#define VP9_DECODER_VP9_DECODEMV_H_
#include "vpx_dsp/vp9_reader.h"
#include "vp9/decoder/vp9_decoder.h"
#include "vp9/decoder/vp9_reader.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -14,6 +14,7 @@
#include "./vpx_config.h"
#include "vpx/vpx_codec.h"
#include "vpx_dsp/vp9_reader.h"
#include "vpx_scale/yv12config.h"
#include "vpx_util/vpx_thread.h"
......@@ -21,7 +22,6 @@
#include "vp9/common/vp9_onyxc_int.h"
#include "vp9/common/vp9_ppflags.h"
#include "vp9/decoder/vp9_dthread.h"
#include "vp9/decoder/vp9_reader.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -12,8 +12,9 @@
#ifndef VP9_DECODER_VP9_DETOKENIZE_H_
#define VP9_DECODER_VP9_DETOKENIZE_H_
#include "vpx_dsp/vp9_reader.h"
#include "vp9/decoder/vp9_decoder.h"
#include "vp9/decoder/vp9_reader.h"
#include "vp9/common/vp9_scan.h"
#ifdef __cplusplus
......
......@@ -12,7 +12,7 @@
#ifndef VP9_DECODER_VP9_DSUBEXP_H_
#define VP9_DECODER_VP9_DSUBEXP_H_
#include "vp9/decoder/vp9_reader.h"
#include "vpx_dsp/vp9_reader.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -7,6 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include <assert.h>
#include "vp9/encoder/vp9_cost.h"
......
......@@ -11,7 +11,7 @@
#ifndef VP9_ENCODER_VP9_COST_H_
#define VP9_ENCODER_VP9_COST_H_
#include "vp9/common/vp9_prob.h"
#include "vpx_dsp/vp9_prob.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -16,7 +16,7 @@
extern "C" {
#endif
#include "vp9/common/vp9_prob.h"
#include "vpx_dsp/vp9_prob.h"
struct vp9_writer;
......
......@@ -13,7 +13,7 @@
#include "vpx_ports/mem.h"
#include "vp9/common/vp9_prob.h"
#include "vpx_dsp/vp9_prob.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -38,8 +38,6 @@ VP9_COMMON_SRCS-yes += common/vp9_mv.h
VP9_COMMON_SRCS-yes += common/vp9_onyxc_int.h
VP9_COMMON_SRCS-yes += common/vp9_pred_common.h
VP9_COMMON_SRCS-yes += common/vp9_pred_common.c
VP9_COMMON_SRCS-yes += common/vp9_prob.h
VP9_COMMON_SRCS-yes += common/vp9_prob.c
VP9_COMMON_SRCS-yes += common/vp9_quant_common.h
VP9_COMMON_SRCS-yes += common/vp9_reconinter.h
VP9_COMMON_SRCS-yes += common/vp9_reconintra.h
......
......@@ -17,6 +17,7 @@
#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_util/vpx_thread.h"
#include "vp9/common/vp9_alloccommon.h"
......@@ -24,7 +25,6 @@
#include "vp9/decoder/vp9_decoder.h"
#include "vp9/decoder/vp9_decodeframe.h"
#include "vp9/decoder/vp9_read_bit_buffer.h"
#include "vp9/vp9_iface_common.h"
......
......@@ -21,10 +21,6 @@ VP9_DX_SRCS-yes += decoder/vp9_decodemv.c
VP9_DX_SRCS-yes += decoder/vp9_decodeframe.c
VP9_DX_SRCS-yes += decoder/vp9_decodeframe.h
VP9_DX_SRCS-yes += decoder/vp9_detokenize.c
VP9_DX_SRCS-yes += decoder/vp9_reader.h
VP9_DX_SRCS-yes += decoder/vp9_reader.c
VP9_DX_SRCS-yes += decoder/vp9_read_bit_buffer.c
VP9_DX_SRCS-yes += decoder/vp9_read_bit_buffer.h
VP9_DX_SRCS-yes += decoder/vp9_decodemv.h
VP9_DX_SRCS-yes += decoder/vp9_detokenize.h
VP9_DX_SRCS-yes += decoder/vp9_dthread.c
......
......@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vp9/common/vp9_prob.h"
#include "./vp9_prob.h"
const uint8_t vp9_norm[256] = {
0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
......
......@@ -12,11 +12,10 @@
#define VP9_COMMON_VP9_PROB_H_
#include "./vpx_config.h"
#include "./vpx_dsp_common.h"
#include "vpx_ports/mem.h"
#include "vp9/common/vp9_common.h"
#ifdef __cplusplus
extern "C" {
#endif
......
......@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vp9/decoder/vp9_read_bit_buffer.h"
#include "./vp9_read_bit_buffer.h"
size_t vp9_rb_bytes_read(struct vp9_read_bit_buffer *rb) {
return (rb->bit_offset + 7) >> 3;
......
......@@ -7,12 +7,12 @@
* 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 "vpx_ports/mem.h"
#include "vpx_mem/vpx_mem.h"
#include "vp9/decoder/vp9_reader.h"
int vp9_reader_init(vp9_reader *r,
const uint8_t *buffer,
size_t size,
......
......@@ -18,8 +18,7 @@
#include "vpx_ports/mem.h"
#include "vpx/vp8dx.h"
#include "vpx/vpx_integer.h"
#include "vp9/common/vp9_prob.h"
#include "vpx_dsp/vp9_prob.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -13,6 +13,17 @@ DSP_SRCS-yes += vpx_dsp_common.h
DSP_SRCS-$(HAVE_MSA) += mips/macros_msa.h
# bit reader
DSP_SRCS-yes += vp9_prob.h
DSP_SRCS-yes += vp9_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
endif
# loop filters
DSP_SRCS-yes += loopfilter.c
......
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