Remove vp9_ prefix from bit writer files

Change-Id: I07647c7482b9ec498fbad3a9c9901f72b2336500

diff --git a/test/vp9_boolcoder_test.cc b/test/vp9_boolcoder_test.cc
index 1829a862868ca60574fded38008066f57fe845b4..b0431d870b3d42f1c6db8723065b1ca4e4ef22ed 100644 (file)
--- 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 0ab5e8c85eeafae784186e3c305ba74394088fac..01e5e13c77be660861c98eea919a1aa9b5d268f4 100644 (file)
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -13,7 +13,7 @@
 #include <limits.h>
 
 #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 7b5202b90b009870e36a73c69212ef9dcc25a23d..98f5057b09421b1b91210e4dc73ef5c537bffcd1 100644 (file)
--- 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 22f7415621d6d853fe9b7cdeeda04eedbab28d94..e46ae39bd60cbaa4c3df0579fec6f1e1f7cd4cbb 100644 (file)
--- 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 9652e10093969406c63326b251414c074026f14b..1d34935319ade75ed200322e0cb1a84049aca48a 100644 (file)
--- a/vpx_dsp/vp9_writer.c
+++ b/vpx_dsp/bitwriter.c
@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#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 4526216e924dfb23684d52ea7c2e04aa8b7f3059..08acfa436e5fcccb571a194180d50aa7fc05e6ed 100644 (file)
--- 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 f5369134ff874892aaa2bd2c5455096c47988d4d..3f7733d28fd2d1b9a6f8de6787823943eeabfb74 100644 (file)
--- a/vpx_dsp/vp9_write_bit_buffer.c
+++ b/vpx_dsp/bitwriter_buffer.c
@@ -10,7 +10,7 @@
 
 #include <limits.h>
 
-#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 59f9bbe30f3f9d9dd6d38dfda29d18feec0ec99c..faa46c47afc1d2ab0e3fe81f942da86060bacaf0 100644 (file)
--- 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 0cfbbdc2ede2cb498df527b8706ed3dc7cc8335a..2efc945f7f92ca67e82fe08ffec3a079d99e31cc 100644 (file)
--- 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)