From f69b5609ff1040e35e225fa95d6efd99d613fe22 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Fri, 20 Dec 2013 11:22:25 -0800 Subject: [PATCH] Renaming vp9_dboolhuff.{h, c} to vp9_reader.{h, c}. Change-Id: I50c009ff8108bda1c57427f23d63a79c04f7e776 --- test/vp9_boolcoder_test.cc | 2 +- vp9/decoder/vp9_decodeframe.c | 2 +- vp9/decoder/vp9_decodemv.c | 2 +- vp9/decoder/vp9_decodemv.h | 2 +- vp9/decoder/vp9_detokenize.h | 2 +- vp9/decoder/vp9_dsubexp.h | 2 +- vp9/decoder/{vp9_dboolhuff.c => vp9_reader.c} | 2 +- vp9/decoder/{vp9_dboolhuff.h => vp9_reader.h} | 6 +++--- vp9/vp9dx.mk | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) rename vp9/decoder/{vp9_dboolhuff.c => vp9_reader.c} (98%) rename vp9/decoder/{vp9_dboolhuff.h => vp9_reader.h} (95%) diff --git a/test/vp9_boolcoder_test.cc b/test/vp9_boolcoder_test.cc index d9c3750df..1593c0267 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" extern "C" { -#include "vp9/decoder/vp9_dboolhuff.h" +#include "vp9/decoder/vp9_reader.h" #include "vp9/encoder/vp9_writer.h" } diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 5122243da..bc5d76ec3 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -29,13 +29,13 @@ #include "vp9/common/vp9_seg_common.h" #include "vp9/common/vp9_tile_common.h" -#include "vp9/decoder/vp9_dboolhuff.h" #include "vp9/decoder/vp9_decodeframe.h" #include "vp9/decoder/vp9_detokenize.h" #include "vp9/decoder/vp9_decodemv.h" #include "vp9/decoder/vp9_dsubexp.h" #include "vp9/decoder/vp9_onyxd_int.h" #include "vp9/decoder/vp9_read_bit_buffer.h" +#include "vp9/decoder/vp9_reader.h" #include "vp9/decoder/vp9_thread.h" typedef struct TileWorkerData { diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 305ed0d30..5f536773d 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -20,10 +20,10 @@ #include "vp9/common/vp9_reconinter.h" #include "vp9/common/vp9_seg_common.h" -#include "vp9/decoder/vp9_dboolhuff.h" #include "vp9/decoder/vp9_decodemv.h" #include "vp9/decoder/vp9_decodeframe.h" #include "vp9/decoder/vp9_onyxd_int.h" +#include "vp9/decoder/vp9_reader.h" static MB_PREDICTION_MODE read_intra_mode(vp9_reader *r, const vp9_prob *p) { return (MB_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 8e9ae4a54..95272bfb3 100644 --- a/vp9/decoder/vp9_decodemv.h +++ b/vp9/decoder/vp9_decodemv.h @@ -12,7 +12,7 @@ #define VP9_DECODER_VP9_DECODEMV_H_ #include "vp9/decoder/vp9_onyxd_int.h" -#include "vp9/decoder/vp9_dboolhuff.h" +#include "vp9/decoder/vp9_reader.h" struct TileInfo; diff --git a/vp9/decoder/vp9_detokenize.h b/vp9/decoder/vp9_detokenize.h index 2a8807379..1780a0fb5 100644 --- a/vp9/decoder/vp9_detokenize.h +++ b/vp9/decoder/vp9_detokenize.h @@ -13,7 +13,7 @@ #define VP9_DECODER_VP9_DETOKENIZE_H_ #include "vp9/decoder/vp9_onyxd_int.h" -#include "vp9/decoder/vp9_dboolhuff.h" +#include "vp9/decoder/vp9_reader.h" int vp9_decode_block_tokens(VP9_COMMON *cm, MACROBLOCKD *xd, int plane, int block, BLOCK_SIZE plane_bsize, diff --git a/vp9/decoder/vp9_dsubexp.h b/vp9/decoder/vp9_dsubexp.h index aeb9399d0..137f546b8 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_dboolhuff.h" +#include "vp9/decoder/vp9_reader.h" void vp9_diff_update_prob(vp9_reader *r, vp9_prob* p); diff --git a/vp9/decoder/vp9_dboolhuff.c b/vp9/decoder/vp9_reader.c similarity index 98% rename from vp9/decoder/vp9_dboolhuff.c rename to vp9/decoder/vp9_reader.c index 4f16e95b0..fb44c8898 100644 --- a/vp9/decoder/vp9_dboolhuff.c +++ b/vp9/decoder/vp9_reader.c @@ -11,7 +11,7 @@ #include "vpx_ports/mem.h" #include "vpx_mem/vpx_mem.h" -#include "vp9/decoder/vp9_dboolhuff.h" +#include "vp9/decoder/vp9_reader.h" // This is meant to be a large, positive constant that can still be efficiently // loaded as an immediate (on platforms like ARM, for example). diff --git a/vp9/decoder/vp9_dboolhuff.h b/vp9/decoder/vp9_reader.h similarity index 95% rename from vp9/decoder/vp9_dboolhuff.h rename to vp9/decoder/vp9_reader.h index 645252461..38cf0f621 100644 --- a/vp9/decoder/vp9_dboolhuff.h +++ b/vp9/decoder/vp9_reader.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_DECODER_VP9_DBOOLHUFF_H_ -#define VP9_DECODER_VP9_DBOOLHUFF_H_ +#ifndef VP9_DECODER_VP9_READER_H_ +#define VP9_DECODER_VP9_READER_H_ #include #include @@ -100,4 +100,4 @@ static int vp9_read_tree(vp9_reader *r, const vp9_tree_index *tree, return -i; } -#endif // VP9_DECODER_VP9_DBOOLHUFF_H_ +#endif // VP9_DECODER_VP9_READER_H_ diff --git a/vp9/vp9dx.mk b/vp9/vp9dx.mk index f43172170..b722200f7 100644 --- a/vp9/vp9dx.mk +++ b/vp9/vp9dx.mk @@ -17,12 +17,12 @@ VP9_DX_SRCS_REMOVE-no += $(VP9_COMMON_SRCS_REMOVE-no) VP9_DX_SRCS-yes += vp9_dx_iface.c -VP9_DX_SRCS-yes += decoder/vp9_dboolhuff.c 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_dboolhuff.h +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.h VP9_DX_SRCS-yes += decoder/vp9_decodemv.h VP9_DX_SRCS-yes += decoder/vp9_detokenize.h -- 2.40.0