From 87d2c3c063efe76a5646ed15425dd91b0e23ce40 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Fri, 17 Jul 2015 14:09:05 -0700 Subject: [PATCH] Removed vp9_ prefix from vpx_dsp/bitreader file names Change-Id: I0426126d0a65f13f9250983e44cc366b1b1a9c4a --- test/vp9_boolcoder_test.cc | 2 +- vp9/common/vp9_entropy.h | 2 +- vp9/common/vp9_entropymv.h | 2 +- vp9/common/vp9_seg_common.h | 2 +- vp9/decoder/vp9_decodeframe.c | 4 ++-- vp9/decoder/vp9_decodemv.h | 2 +- vp9/decoder/vp9_decoder.h | 2 +- vp9/decoder/vp9_detokenize.h | 3 +-- vp9/decoder/vp9_dsubexp.h | 2 +- vp9/encoder/vp9_cost.h | 2 +- vp9/encoder/vp9_subexp.h | 2 +- vp9/encoder/vp9_writer.h | 2 +- vp9/vp9_dx_iface.c | 2 +- vpx_dsp/{vp9_reader.c => bitreader.c} | 4 ++-- vpx_dsp/{vp9_reader.h => bitreader.h} | 8 ++++---- .../{vp9_read_bit_buffer.c => bitreader_buffer.c} | 2 +- .../{vp9_read_bit_buffer.h => bitreader_buffer.h} | 6 +++--- vpx_dsp/{vp9_prob.c => prob.c} | 2 +- vpx_dsp/{vp9_prob.h => prob.h} | 6 +++--- vpx_dsp/vpx_dsp.mk | 12 ++++++------ 20 files changed, 34 insertions(+), 35 deletions(-) rename vpx_dsp/{vp9_reader.c => bitreader.c} (97%) rename vpx_dsp/{vp9_reader.h => bitreader.h} (96%) rename vpx_dsp/{vp9_read_bit_buffer.c => bitreader_buffer.c} (97%) rename vpx_dsp/{vp9_read_bit_buffer.h => bitreader_buffer.h} (88%) rename vpx_dsp/{vp9_prob.c => prob.c} (98%) rename vpx_dsp/{vp9_prob.h => prob.h} (97%) diff --git a/test/vp9_boolcoder_test.cc b/test/vp9_boolcoder_test.cc index 44557d738..28da30319 100644 --- a/test/vp9_boolcoder_test.cc +++ b/test/vp9_boolcoder_test.cc @@ -15,7 +15,7 @@ #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" diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h index 42dab91d0..55d2176b6 100644 --- a/vp9/common/vp9_entropy.h +++ b/vp9/common/vp9_entropy.h @@ -12,7 +12,7 @@ #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" diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h index 00890ab62..a9c6dc40a 100644 --- a/vp9/common/vp9_entropymv.h +++ b/vp9/common/vp9_entropymv.h @@ -14,7 +14,7 @@ #include "./vpx_config.h" -#include "vpx_dsp/vp9_prob.h" +#include "vpx_dsp/prob.h" #include "vp9/common/vp9_mv.h" diff --git a/vp9/common/vp9_seg_common.h b/vp9/common/vp9_seg_common.h index 99b83c656..29b45c189 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 "vpx_dsp/vp9_prob.h" +#include "vpx_dsp/prob.h" #ifdef __cplusplus extern "C" { diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 9b70d4694..9de44a80a 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -14,8 +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_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" diff --git a/vp9/decoder/vp9_decodemv.h b/vp9/decoder/vp9_decodemv.h index 0024598c1..01c2e2989 100644 --- a/vp9/decoder/vp9_decodemv.h +++ b/vp9/decoder/vp9_decodemv.h @@ -11,7 +11,7 @@ #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" diff --git a/vp9/decoder/vp9_decoder.h b/vp9/decoder/vp9_decoder.h index 9eb4b4c4d..4eaf270b9 100644 --- a/vp9/decoder/vp9_decoder.h +++ b/vp9/decoder/vp9_decoder.h @@ -14,7 +14,7 @@ #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" diff --git a/vp9/decoder/vp9_detokenize.h b/vp9/decoder/vp9_detokenize.h index c67bb0661..09020537c 100644 --- a/vp9/decoder/vp9_detokenize.h +++ b/vp9/decoder/vp9_detokenize.h @@ -12,8 +12,7 @@ #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" diff --git a/vp9/decoder/vp9_dsubexp.h b/vp9/decoder/vp9_dsubexp.h index 1197194a4..dd00d21aa 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 "vpx_dsp/vp9_reader.h" +#include "vpx_dsp/bitreader.h" #ifdef __cplusplus extern "C" { diff --git a/vp9/encoder/vp9_cost.h b/vp9/encoder/vp9_cost.h index 12adad7d7..375f21b4d 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 "vpx_dsp/vp9_prob.h" +#include "vpx_dsp/prob.h" #ifdef __cplusplus extern "C" { diff --git a/vp9/encoder/vp9_subexp.h b/vp9/encoder/vp9_subexp.h index b749f04b6..9776f6176 100644 --- a/vp9/encoder/vp9_subexp.h +++ b/vp9/encoder/vp9_subexp.h @@ -16,7 +16,7 @@ extern "C" { #endif -#include "vpx_dsp/vp9_prob.h" +#include "vpx_dsp/prob.h" struct vp9_writer; diff --git a/vp9/encoder/vp9_writer.h b/vp9/encoder/vp9_writer.h index 590396432..4526216e9 100644 --- a/vp9/encoder/vp9_writer.h +++ b/vp9/encoder/vp9_writer.h @@ -13,7 +13,7 @@ #include "vpx_ports/mem.h" -#include "vpx_dsp/vp9_prob.h" +#include "vpx_dsp/prob.h" #ifdef __cplusplus extern "C" { diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index b86b1ca9d..12d5d7cec 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -17,7 +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_dsp/bitreader_buffer.h" #include "vpx_util/vpx_thread.h" #include "vp9/common/vp9_alloccommon.h" diff --git a/vpx_dsp/vp9_reader.c b/vpx_dsp/bitreader.c similarity index 97% rename from vpx_dsp/vp9_reader.c rename to vpx_dsp/bitreader.c index d97c94a15..bc7ab3a9b 100644 --- a/vpx_dsp/vp9_reader.c +++ b/vpx_dsp/bitreader.c @@ -7,8 +7,8 @@ * 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" diff --git a/vpx_dsp/vp9_reader.h b/vpx_dsp/bitreader.h similarity index 96% rename from vpx_dsp/vp9_reader.h rename to vpx_dsp/bitreader.h index f022fb1cc..cdd1306f1 100644 --- a/vpx_dsp/vp9_reader.h +++ b/vpx_dsp/bitreader.h @@ -8,8 +8,8 @@ * 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 #include @@ -18,7 +18,7 @@ #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" { @@ -137,4 +137,4 @@ static INLINE int vp9_read_tree(vp9_reader *r, const vp9_tree_index *tree, } // extern "C" #endif -#endif // VP9_DECODER_VP9_READER_H_ +#endif // VPX_DSP_BITREADER_H_ diff --git a/vpx_dsp/vp9_read_bit_buffer.c b/vpx_dsp/bitreader_buffer.c similarity index 97% rename from vpx_dsp/vp9_read_bit_buffer.c rename to vpx_dsp/bitreader_buffer.c index c712a7f67..b49a2e2fc 100644 --- a/vpx_dsp/vp9_read_bit_buffer.c +++ b/vpx_dsp/bitreader_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_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; diff --git a/vpx_dsp/vp9_read_bit_buffer.h b/vpx_dsp/bitreader_buffer.h similarity index 88% rename from vpx_dsp/vp9_read_bit_buffer.h rename to vpx_dsp/bitreader_buffer.h index fc88bd70a..5289f3fe4 100644 --- a/vpx_dsp/vp9_read_bit_buffer.h +++ b/vpx_dsp/bitreader_buffer.h @@ -8,8 +8,8 @@ * 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 @@ -42,4 +42,4 @@ int vp9_rb_read_signed_literal(struct vp9_read_bit_buffer *rb, int bits); } // extern "C" #endif -#endif // VP9_DECODER_VP9_READ_BIT_BUFFER_H_ +#endif // VPX_DSP_BITREADER_BUFFER_H_ diff --git a/vpx_dsp/vp9_prob.c b/vpx_dsp/prob.c similarity index 98% rename from vpx_dsp/vp9_prob.c rename to vpx_dsp/prob.c index 92dd2d549..8f44e18ba 100644 --- a/vpx_dsp/vp9_prob.c +++ b/vpx_dsp/prob.c @@ -8,7 +8,7 @@ * 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, diff --git a/vpx_dsp/vp9_prob.h b/vpx_dsp/prob.h similarity index 97% rename from vpx_dsp/vp9_prob.h rename to vpx_dsp/prob.h index 09be34486..07a367ad5 100644 --- a/vpx_dsp/vp9_prob.h +++ b/vpx_dsp/prob.h @@ -8,8 +8,8 @@ * 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" @@ -100,4 +100,4 @@ DECLARE_ALIGNED(16, extern const uint8_t, vp9_norm[256]); } // extern "C" #endif -#endif // VP9_COMMON_VP9_PROB_H_ +#endif // VPX_DSP_PROB_H_ diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk index f7d99e483..278cc17d2 100644 --- a/vpx_dsp/vpx_dsp.mk +++ b/vpx_dsp/vpx_dsp.mk @@ -14,14 +14,14 @@ 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 +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 -- 2.40.0