diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2013-12-16 12:53:09 -0800 |
---|---|---|
committer | Dmitry Kovalev <dkovalev@google.com> | 2013-12-16 12:53:09 -0800 |
commit | b5c9261832d18651e254210246730468af03baec (patch) | |
tree | afad422a46268c55dda8ae7ba7570e69e75fe9e0 | |
parent | 1a23a34419f30ffdcab1059a1308fa27e2ae557d (diff) | |
download | libvpx-b5c9261832d18651e254210246730468af03baec.tar libvpx-b5c9261832d18651e254210246730468af03baec.tar.gz libvpx-b5c9261832d18651e254210246730468af03baec.tar.bz2 libvpx-b5c9261832d18651e254210246730468af03baec.zip |
Converting vp9_treecoder.h to vp9_prob.{h, c}
Moving vp9_norm probability table from vp9_entropy.c to vp9_prob.c
Change-Id: Ie757b73860c6f43130790c332b292e2a1a81b788
-rw-r--r-- | vp9/common/vp9_blockd.h | 1 | ||||
-rw-r--r-- | vp9/common/vp9_entropy.c | 19 | ||||
-rw-r--r-- | vp9/common/vp9_entropy.h | 1 | ||||
-rw-r--r-- | vp9/common/vp9_entropymode.h | 1 | ||||
-rw-r--r-- | vp9/common/vp9_entropymv.h | 1 | ||||
-rw-r--r-- | vp9/common/vp9_findnearmv.h | 1 | ||||
-rw-r--r-- | vp9/common/vp9_pred_common.c | 1 | ||||
-rw-r--r-- | vp9/common/vp9_prob.c | 30 | ||||
-rw-r--r-- | vp9/common/vp9_prob.h (renamed from vp9/common/vp9_treecoder.h) | 12 | ||||
-rw-r--r-- | vp9/common/vp9_seg_common.h | 2 | ||||
-rw-r--r-- | vp9/decoder/vp9_dboolhuff.h | 4 | ||||
-rw-r--r-- | vp9/encoder/vp9_bitstream.c | 1 | ||||
-rw-r--r-- | vp9/encoder/vp9_boolhuff.h | 4 | ||||
-rw-r--r-- | vp9/encoder/vp9_treewriter.h | 1 | ||||
-rw-r--r-- | vp9/vp9_common.mk | 3 |
15 files changed, 44 insertions, 38 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 93f96c8bc..a932df8e2 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -24,7 +24,6 @@ #include "vp9/common/vp9_mv.h" #include "vp9/common/vp9_scale.h" #include "vp9/common/vp9_seg_common.h" -#include "vp9/common/vp9_treecoder.h" #define BLOCK_SIZE_GROUPS 4 #define MBSKIP_CONTEXTS 3 diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c index adab33f74..13e954efe 100644 --- a/vp9/common/vp9_entropy.c +++ b/vp9/common/vp9_entropy.c @@ -16,25 +16,6 @@ #include "vpx/vpx_integer.h" -DECLARE_ALIGNED(16, const uint8_t, vp9_norm[256]) = { - 0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - DECLARE_ALIGNED(16, const uint8_t, vp9_coefband_trans_8x8plus[1024]) = { 0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h index 65b679ad2..0ed06b4b0 100644 --- a/vp9/common/vp9_entropy.h +++ b/vp9/common/vp9_entropy.h @@ -16,7 +16,6 @@ #include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_common.h" #include "vp9/common/vp9_scan.h" -#include "vp9/common/vp9_treecoder.h" #include "vp9/common/vp9_entropymode.h" #define DIFF_UPDATE_PROB 252 diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h index df58bea3c..5312553c7 100644 --- a/vp9/common/vp9_entropymode.h +++ b/vp9/common/vp9_entropymode.h @@ -12,7 +12,6 @@ #define VP9_COMMON_VP9_ENTROPYMODE_H_ #include "vp9/common/vp9_blockd.h" -#include "vp9/common/vp9_treecoder.h" #define TX_SIZE_CONTEXTS 2 #define SWITCHABLE_FILTERS 3 // number of switchable filters diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h index 3175a1e49..48cb82db1 100644 --- a/vp9/common/vp9_entropymv.h +++ b/vp9/common/vp9_entropymv.h @@ -12,7 +12,6 @@ #ifndef VP9_COMMON_VP9_ENTROPYMV_H_ #define VP9_COMMON_VP9_ENTROPYMV_H_ -#include "vp9/common/vp9_treecoder.h" #include "./vpx_config.h" #include "vp9/common/vp9_blockd.h" diff --git a/vp9/common/vp9_findnearmv.h b/vp9/common/vp9_findnearmv.h index 5028af77c..5af961a77 100644 --- a/vp9/common/vp9_findnearmv.h +++ b/vp9/common/vp9_findnearmv.h @@ -14,7 +14,6 @@ #include "vp9/common/vp9_mv.h" #include "vp9/common/vp9_blockd.h" -#include "vp9/common/vp9_treecoder.h" #include "vp9/common/vp9_onyxc_int.h" #define LEFT_TOP_MARGIN ((VP9BORDERINPIXELS - VP9_INTERP_EXTEND) << 3) diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c index 40cfc8146..6a9a36c2b 100644 --- a/vp9/common/vp9_pred_common.c +++ b/vp9/common/vp9_pred_common.c @@ -14,7 +14,6 @@ #include "vp9/common/vp9_common.h" #include "vp9/common/vp9_pred_common.h" #include "vp9/common/vp9_seg_common.h" -#include "vp9/common/vp9_treecoder.h" static INLINE const MB_MODE_INFO *get_above_mbmi(const MODE_INFO *const above) { return (above != NULL) ? &above->mbmi : NULL; diff --git a/vp9/common/vp9_prob.c b/vp9/common/vp9_prob.c new file mode 100644 index 000000000..884884e0b --- /dev/null +++ b/vp9/common/vp9_prob.c @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2013 The WebM project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include "vp9/common/vp9_prob.h" + +DECLARE_ALIGNED(16, const uint8_t, vp9_norm[256]) = { + 0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; diff --git a/vp9/common/vp9_treecoder.h b/vp9/common/vp9_prob.h index ed8c74ae0..d1bd37ab3 100644 --- a/vp9/common/vp9_treecoder.h +++ b/vp9/common/vp9_prob.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. + * Copyright (c) 2013 The WebM project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -8,11 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef VP9_COMMON_VP9_TREECODER_H_ -#define VP9_COMMON_VP9_TREECODER_H_ +#ifndef VP9_COMMON_VP9_PROB_H_ +#define VP9_COMMON_VP9_PROB_H_ #include "./vpx_config.h" + +#include "vpx_ports/mem.h" #include "vpx/vpx_integer.h" + #include "vp9/common/vp9_common.h" typedef uint8_t vp9_prob; @@ -107,5 +110,6 @@ static void tree_merge_probs(const vp9_tree_index *tree, count_sat, max_update_factor, probs); } +DECLARE_ALIGNED(16, extern const uint8_t, vp9_norm[256]); -#endif // VP9_COMMON_VP9_TREECODER_H_ +#endif // VP9_COMMON_VP9_PROB_H_ diff --git a/vp9/common/vp9_seg_common.h b/vp9/common/vp9_seg_common.h index eb38c06be..d7aca3747 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 "vp9/common/vp9_treecoder.h" +#include "vp9/common/vp9_prob.h" #define SEGMENT_DELTADATA 0 #define SEGMENT_ABSDATA 1 diff --git a/vp9/decoder/vp9_dboolhuff.h b/vp9/decoder/vp9_dboolhuff.h index 8339c2701..645252461 100644 --- a/vp9/decoder/vp9_dboolhuff.h +++ b/vp9/decoder/vp9_dboolhuff.h @@ -18,14 +18,12 @@ #include "vpx_ports/mem.h" #include "vpx/vpx_integer.h" -#include "vp9/common/vp9_treecoder.h" +#include "vp9/common/vp9_prob.h" typedef size_t BD_VALUE; #define BD_VALUE_SIZE ((int)sizeof(BD_VALUE) * CHAR_BIT) -DECLARE_ALIGNED(16, extern const uint8_t, vp9_norm[256]); - typedef struct { const uint8_t *buffer_end; const uint8_t *buffer; diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 88e25ebf2..eef4d3457 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -23,7 +23,6 @@ #include "vp9/common/vp9_pred_common.h" #include "vp9/common/vp9_entropy.h" #include "vp9/common/vp9_mvref_common.h" -#include "vp9/common/vp9_treecoder.h" #include "vp9/common/vp9_systemdependent.h" #include "vp9/common/vp9_pragmas.h" diff --git a/vp9/encoder/vp9_boolhuff.h b/vp9/encoder/vp9_boolhuff.h index a0fff3861..343c1bb9b 100644 --- a/vp9/encoder/vp9_boolhuff.h +++ b/vp9/encoder/vp9_boolhuff.h @@ -21,6 +21,8 @@ #include "vpx_ports/mem.h" +#include "vp9/common/vp9_prob.h" + typedef struct { unsigned int lowvalue; unsigned int range; @@ -39,8 +41,6 @@ extern const unsigned int vp9_prob_cost[256]; void vp9_start_encode(vp9_writer *bc, uint8_t *buffer); void vp9_stop_encode(vp9_writer *bc); -DECLARE_ALIGNED(16, extern const unsigned char, vp9_norm[256]); - static void vp9_write(vp9_writer *br, int bit, int probability) { unsigned int split; int count = br->count; diff --git a/vp9/encoder/vp9_treewriter.h b/vp9/encoder/vp9_treewriter.h index 703272c64..913b5f0ca 100644 --- a/vp9/encoder/vp9_treewriter.h +++ b/vp9/encoder/vp9_treewriter.h @@ -11,7 +11,6 @@ #ifndef VP9_ENCODER_VP9_TREEWRITER_H_ #define VP9_ENCODER_VP9_TREEWRITER_H_ -#include "vp9/common/vp9_treecoder.h" #include "vp9/encoder/vp9_boolhuff.h" /* for now */ #define vp9_cost_zero(prob) (vp9_prob_cost[prob]) diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index 01c55a4ad..0587f3cc8 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -39,6 +39,8 @@ VP9_COMMON_SRCS-yes += common/vp9_mv.h VP9_COMMON_SRCS-yes += common/vp9_onyxc_int.h VP9_COMMON_SRCS-yes += common/vp9_pred_common.h VP9_COMMON_SRCS-yes += common/vp9_pred_common.c +VP9_COMMON_SRCS-yes += common/vp9_prob.h +VP9_COMMON_SRCS-yes += common/vp9_prob.c VP9_COMMON_SRCS-yes += common/vp9_quant_common.h VP9_COMMON_SRCS-yes += common/vp9_reconinter.h VP9_COMMON_SRCS-yes += common/vp9_reconintra.h @@ -52,7 +54,6 @@ VP9_COMMON_SRCS-yes += common/vp9_systemdependent.h VP9_COMMON_SRCS-yes += common/vp9_textblit.h VP9_COMMON_SRCS-yes += common/vp9_tile_common.h VP9_COMMON_SRCS-yes += common/vp9_tile_common.c -VP9_COMMON_SRCS-yes += common/vp9_treecoder.h VP9_COMMON_SRCS-yes += common/vp9_loopfilter.c VP9_COMMON_SRCS-yes += common/vp9_loopfilter_filters.c VP9_COMMON_SRCS-yes += common/vp9_mvref_common.c |