summaryrefslogtreecommitdiff
path: root/vpx_dsp/prob.h
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2015-07-20 14:04:21 -0700
committerYaowu Xu <yaowu@google.com>2015-07-20 18:13:04 -0700
commit70ad66805608f711f493a31e19554992206a8f31 (patch)
treeec63db4ec4bf1e3867770eebe04dd3b5a1a46344 /vpx_dsp/prob.h
parentcbce0037126d02ecad9e653a56fa56add5259595 (diff)
downloadlibvpx-70ad66805608f711f493a31e19554992206a8f31.tar
libvpx-70ad66805608f711f493a31e19554992206a8f31.tar.gz
libvpx-70ad66805608f711f493a31e19554992206a8f31.tar.bz2
libvpx-70ad66805608f711f493a31e19554992206a8f31.zip
vpx_dsp/prob.h: vp9_ -> vpx_
change prefix vp9_ to vpx_ for non codec specific functions and data structures. Change-Id: I97c7e6422eceea99212b93f4942bc2187763a07c
Diffstat (limited to 'vpx_dsp/prob.h')
-rw-r--r--vpx_dsp/prob.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/vpx_dsp/prob.h b/vpx_dsp/prob.h
index 812d0f832..729f90a55 100644
--- a/vpx_dsp/prob.h
+++ b/vpx_dsp/prob.h
@@ -26,22 +26,22 @@ typedef uint8_t vpx_prob;
#define vpx_prob_half ((vpx_prob) 128)
-typedef int8_t vp9_tree_index;
+typedef int8_t vpx_tree_index;
#define TREE_SIZE(leaf_count) (2 * (leaf_count) - 2)
-#define vp9_complement(x) (255 - x)
+#define vpx_complement(x) (255 - x)
#define MODE_MV_COUNT_SAT 20
/* We build coding trees compactly in arrays.
- Each node of the tree is a pair of vp9_tree_indices.
+ Each node of the tree is a pair of vpx_tree_indices.
Array index often references a corresponding probability table.
Index <= 0 means done encoding/decoding and value = -Index,
Index > 0 means need another bit, specification at index.
Nonnegative indices are always even; processing begins at node 0. */
-typedef const vp9_tree_index vp9_tree[];
+typedef const vpx_tree_index vpx_tree[];
static INLINE vpx_prob clip_prob(int p) {
return (p > 255) ? 255 : (p < 1) ? 1 : p;
@@ -90,11 +90,11 @@ static INLINE vpx_prob mode_mv_merge_probs(vpx_prob pre_prob,
}
}
-void vp9_tree_merge_probs(const vp9_tree_index *tree, const vpx_prob *pre_probs,
+void vpx_tree_merge_probs(const vpx_tree_index *tree, const vpx_prob *pre_probs,
const unsigned int *counts, vpx_prob *probs);
-DECLARE_ALIGNED(16, extern const uint8_t, vp9_norm[256]);
+DECLARE_ALIGNED(16, extern const uint8_t, vpx_norm[256]);
#ifdef __cplusplus
} // extern "C"