diff options
24 files changed, 37 insertions, 30 deletions
diff --git a/test/vp9_boolcoder_test.cc b/test/vp9_boolcoder_test.cc index c7f0cd80f..44557d738 100644 --- a/test/vp9_boolcoder_test.cc +++ b/test/vp9_boolcoder_test.cc @@ -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; diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h index 2fc97c3f9..42dab91d0 100644 --- a/vp9/common/vp9_entropy.h +++ b/vp9/common/vp9_entropy.h @@ -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" { diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h index 637f45158..00890ab62 100644 --- a/vp9/common/vp9_entropymv.h +++ b/vp9/common/vp9_entropymv.h @@ -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" { diff --git a/vp9/common/vp9_seg_common.h b/vp9/common/vp9_seg_common.h index 95c991830..99b83c656 100644 --- a/vp9/common/vp9_seg_common.h +++ b/vp9/common/vp9_seg_common.h @@ -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" { diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 8f7457e2f..9b70d4694 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.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 diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index d42a654ef..7b102ef05 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -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); diff --git a/vp9/decoder/vp9_decodemv.h b/vp9/decoder/vp9_decodemv.h index 53bac8c61..0024598c1 100644 --- a/vp9/decoder/vp9_decodemv.h +++ b/vp9/decoder/vp9_decodemv.h @@ -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" { diff --git a/vp9/decoder/vp9_decoder.h b/vp9/decoder/vp9_decoder.h index af47f8560..9eb4b4c4d 100644 --- a/vp9/decoder/vp9_decoder.h +++ b/vp9/decoder/vp9_decoder.h @@ -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" { diff --git a/vp9/decoder/vp9_detokenize.h b/vp9/decoder/vp9_detokenize.h index cf0e48ac0..c67bb0661 100644 --- a/vp9/decoder/vp9_detokenize.h +++ b/vp9/decoder/vp9_detokenize.h @@ -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 diff --git a/vp9/decoder/vp9_dsubexp.h b/vp9/decoder/vp9_dsubexp.h index 436f434fb..1197194a4 100644 --- a/vp9/decoder/vp9_dsubexp.h +++ b/vp9/decoder/vp9_dsubexp.h @@ -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" { diff --git a/vp9/encoder/vp9_cost.c b/vp9/encoder/vp9_cost.c index 1c3c3d248..01ee5536a 100644 --- a/vp9/encoder/vp9_cost.c +++ b/vp9/encoder/vp9_cost.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" diff --git a/vp9/encoder/vp9_cost.h b/vp9/encoder/vp9_cost.h index 6d2b9400d..12adad7d7 100644 --- a/vp9/encoder/vp9_cost.h +++ b/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" { diff --git a/vp9/encoder/vp9_subexp.h b/vp9/encoder/vp9_subexp.h index 6fbb747e7..b749f04b6 100644 --- a/vp9/encoder/vp9_subexp.h +++ b/vp9/encoder/vp9_subexp.h @@ -16,7 +16,7 @@ extern "C" { #endif -#include "vp9/common/vp9_prob.h" +#include "vpx_dsp/vp9_prob.h" struct vp9_writer; diff --git a/vp9/encoder/vp9_writer.h b/vp9/encoder/vp9_writer.h index e347ea414..590396432 100644 --- a/vp9/encoder/vp9_writer.h +++ b/vp9/encoder/vp9_writer.h @@ -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" { diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index 9e27257c6..e1463fc9f 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -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 diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index 5b62c3ecd..b86b1ca9d 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -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" diff --git a/vp9/vp9dx.mk b/vp9/vp9dx.mk index c105adb79..0e9cf1618 100644 --- a/vp9/vp9dx.mk +++ b/vp9/vp9dx.mk @@ -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 diff --git a/vp9/common/vp9_prob.c b/vpx_dsp/vp9_prob.c index 3b7b9bf3b..92dd2d549 100644 --- a/vp9/common/vp9_prob.c +++ b/vpx_dsp/vp9_prob.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, diff --git a/vp9/common/vp9_prob.h b/vpx_dsp/vp9_prob.h index c69c62c81..09be34486 100644 --- a/vp9/common/vp9_prob.h +++ b/vpx_dsp/vp9_prob.h @@ -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 diff --git a/vp9/decoder/vp9_read_bit_buffer.c b/vpx_dsp/vp9_read_bit_buffer.c index c3b38a9c7..c712a7f67 100644 --- a/vp9/decoder/vp9_read_bit_buffer.c +++ b/vpx_dsp/vp9_read_bit_buffer.c @@ -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; diff --git a/vp9/decoder/vp9_read_bit_buffer.h b/vpx_dsp/vp9_read_bit_buffer.h index fc88bd70a..fc88bd70a 100644 --- a/vp9/decoder/vp9_read_bit_buffer.h +++ b/vpx_dsp/vp9_read_bit_buffer.h diff --git a/vp9/decoder/vp9_reader.c b/vpx_dsp/vp9_reader.c index 2c96f74f4..d97c94a15 100644 --- a/vp9/decoder/vp9_reader.c +++ b/vpx_dsp/vp9_reader.c @@ -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, diff --git a/vp9/decoder/vp9_reader.h b/vpx_dsp/vp9_reader.h index 495998556..f022fb1cc 100644 --- a/vp9/decoder/vp9_reader.h +++ b/vpx_dsp/vp9_reader.h @@ -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" { diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk index 4a43c98ff..f7d99e483 100644 --- a/vpx_dsp/vpx_dsp.mk +++ b/vpx_dsp/vpx_dsp.mk @@ -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 |