Merge "Removed vp9_ prefix from vpx_dsp/bitreader file names"

This commit is contained in:
Yaowu Xu 2015-07-20 17:12:08 +00:00 committed by Gerrit Code Review
commit 345ff1a2f2
20 changed files with 34 additions and 35 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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" {

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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" {

View File

@ -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" {

View File

@ -16,7 +16,7 @@
extern "C" {
#endif
#include "vpx_dsp/vp9_prob.h"
#include "vpx_dsp/prob.h"
struct vp9_writer;

View File

@ -13,7 +13,7 @@
#include "vpx_ports/mem.h"
#include "vpx_dsp/vp9_prob.h"
#include "vpx_dsp/prob.h"
#ifdef __cplusplus
extern "C" {

View File

@ -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"

View File

@ -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"

View File

@ -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 <stddef.h>
#include <limits.h>
@ -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_

View File

@ -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;

View File

@ -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 <limits.h>
@ -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_

View File

@ -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,

View File

@ -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_

View File

@ -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