From 1fcef81cb013299019970ccf0ab37fc04a430014 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Mon, 20 Jul 2015 11:18:57 -0700 Subject: [PATCH] Remove vp9_ prefix from bit writer files Change-Id: I07647c7482b9ec498fbad3a9c9901f72b2336500 --- test/vp9_boolcoder_test.cc | 2 +- vp9/encoder/vp9_bitstream.c | 2 +- vp9/encoder/vp9_subexp.c | 2 +- vp9/encoder/vp9_treewriter.h | 2 +- vpx_dsp/{vp9_writer.c => bitwriter.c} | 2 +- vpx_dsp/{vp9_writer.h => bitwriter.h} | 6 +++--- vpx_dsp/{vp9_write_bit_buffer.c => bitwriter_buffer.c} | 2 +- vpx_dsp/{vp9_write_bit_buffer.h => bitwriter_buffer.h} | 6 +++--- vpx_dsp/vpx_dsp.mk | 8 ++++---- 9 files changed, 16 insertions(+), 16 deletions(-) rename vpx_dsp/{vp9_writer.c => bitwriter.c} (97%) rename vpx_dsp/{vp9_writer.h => bitwriter.h} (95%) rename vpx_dsp/{vp9_write_bit_buffer.c => bitwriter_buffer.c} (96%) rename vpx_dsp/{vp9_write_bit_buffer.h => bitwriter_buffer.h} (85%) diff --git a/test/vp9_boolcoder_test.cc b/test/vp9_boolcoder_test.cc index 1829a8628..b0431d870 100644 --- a/test/vp9_boolcoder_test.cc +++ b/test/vp9_boolcoder_test.cc @@ -16,7 +16,7 @@ #include "vpx/vpx_integer.h" #include "vpx_dsp/bitreader.h" -#include "vpx_dsp/vp9_writer.h" +#include "vpx_dsp/bitwriter.h" #include "test/acm_random.h" diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 0ab5e8c85..01e5e13c7 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -13,7 +13,7 @@ #include #include "vpx/vpx_encoder.h" -#include "vpx_dsp/vp9_write_bit_buffer.h" +#include "vpx_dsp/bitwriter_buffer.h" #include "vpx_mem/vpx_mem.h" #include "vpx_ports/mem_ops.h" diff --git a/vp9/encoder/vp9_subexp.c b/vp9/encoder/vp9_subexp.c index 7b5202b90..98f5057b0 100644 --- a/vp9/encoder/vp9_subexp.c +++ b/vp9/encoder/vp9_subexp.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 "vpx_dsp/vp9_writer.h" +#include "vpx_dsp/bitwriter.h" #include "vp9/common/vp9_common.h" #include "vp9/common/vp9_entropy.h" diff --git a/vp9/encoder/vp9_treewriter.h b/vp9/encoder/vp9_treewriter.h index 22f741562..e46ae39bd 100644 --- a/vp9/encoder/vp9_treewriter.h +++ b/vp9/encoder/vp9_treewriter.h @@ -11,7 +11,7 @@ #ifndef VP9_ENCODER_VP9_TREEWRITER_H_ #define VP9_ENCODER_VP9_TREEWRITER_H_ -#include "vpx_dsp/vp9_writer.h" +#include "vpx_dsp/bitwriter.h" #ifdef __cplusplus extern "C" { diff --git a/vpx_dsp/vp9_writer.c b/vpx_dsp/bitwriter.c similarity index 97% rename from vpx_dsp/vp9_writer.c rename to vpx_dsp/bitwriter.c index 9652e1009..1d3493531 100644 --- a/vpx_dsp/vp9_writer.c +++ b/vpx_dsp/bitwriter.c @@ -10,7 +10,7 @@ #include -#include "./vp9_writer.h" +#include "./bitwriter.h" void vp9_start_encode(vp9_writer *br, uint8_t *source) { br->lowvalue = 0; diff --git a/vpx_dsp/vp9_writer.h b/vpx_dsp/bitwriter.h similarity index 95% rename from vpx_dsp/vp9_writer.h rename to vpx_dsp/bitwriter.h index 4526216e9..08acfa436 100644 --- a/vpx_dsp/vp9_writer.h +++ b/vpx_dsp/bitwriter.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_ENCODER_VP9_WRITER_H_ -#define VP9_ENCODER_VP9_WRITER_H_ +#ifndef VPX_DSP_BITWRITER_H_ +#define VPX_DSP_BITWRITER_H_ #include "vpx_ports/mem.h" @@ -95,4 +95,4 @@ static INLINE void vp9_write_literal(vp9_writer *w, int data, int bits) { } // extern "C" #endif -#endif // VP9_ENCODER_VP9_WRITER_H_ +#endif // VPX_DSP_BITWRITER_H_ diff --git a/vpx_dsp/vp9_write_bit_buffer.c b/vpx_dsp/bitwriter_buffer.c similarity index 96% rename from vpx_dsp/vp9_write_bit_buffer.c rename to vpx_dsp/bitwriter_buffer.c index f5369134f..3f7733d28 100644 --- a/vpx_dsp/vp9_write_bit_buffer.c +++ b/vpx_dsp/bitwriter_buffer.c @@ -10,7 +10,7 @@ #include -#include "./vp9_write_bit_buffer.h" +#include "./bitwriter_buffer.h" size_t vp9_wb_bytes_written(const struct vp9_write_bit_buffer *wb) { return wb->bit_offset / CHAR_BIT + (wb->bit_offset % CHAR_BIT > 0); diff --git a/vpx_dsp/vp9_write_bit_buffer.h b/vpx_dsp/bitwriter_buffer.h similarity index 85% rename from vpx_dsp/vp9_write_bit_buffer.h rename to vpx_dsp/bitwriter_buffer.h index 59f9bbe30..faa46c47a 100644 --- a/vpx_dsp/vp9_write_bit_buffer.h +++ b/vpx_dsp/bitwriter_buffer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_ -#define VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_ +#ifndef VPX_DSP_BITWRITER_BUFFER_H_ +#define VPX_DSP_BITWRITER_BUFFER_H_ #include "vpx/vpx_integer.h" @@ -33,4 +33,4 @@ void vp9_wb_write_literal(struct vp9_write_bit_buffer *wb, int data, int bits); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_ +#endif // VPX_DSP_BITWRITER_BUFFER_H_ diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk index 0cfbbdc2e..2efc945f7 100644 --- a/vpx_dsp/vpx_dsp.mk +++ b/vpx_dsp/vpx_dsp.mk @@ -18,10 +18,10 @@ DSP_SRCS-yes += prob.h DSP_SRCS-yes += prob.c ifeq ($(CONFIG_ENCODERS),yes) -DSP_SRCS-yes += vp9_writer.h -DSP_SRCS-yes += vp9_writer.c -DSP_SRCS-yes += vp9_write_bit_buffer.c -DSP_SRCS-yes += vp9_write_bit_buffer.h +DSP_SRCS-yes += bitwriter.h +DSP_SRCS-yes += bitwriter.c +DSP_SRCS-yes += bitwriter_buffer.c +DSP_SRCS-yes += bitwriter_buffer.h endif ifeq ($(CONFIG_DECODERS),yes)