Port renaming changes from AOMedia
Cherry-Picked the following commits:
0defd8f Changed "WebM" to "AOMedia" & "webm" to "aomedia"
54e6676 Replace "VPx" by "AVx"
5082a36 Change "Vpx" to "Avx"
7df44f1 Replace "Vp9" w/ "Av1"
967f722 Remove kVp9CodecId
828f30c Change "Vp8" to "AOM"
030b5ff AUTHORS regenerated
2524cae Add ref-mv experimental flag
016762b Change copyright notice to AOMedia form
81e5526 Replace vp9 w/ av1
9b94565 Add missing files
fa8ca9f Change "vp9" to "av1"
ec838b7 Convert "vp8" to "aom"
80edfa0 Change "VP9" to "AV1"
d1a11fb Change "vp8" to "aom"
7b58251 Point to WebM test data
dd1a5c8 Replace "VP8" with "AOM"
ff00fc0 Change "VPX" to "AOM"
01dee0b Change "vp10" to "av1" in source code
cebe6f0 Convert "vpx" to "aom"
17b0567 rename vp10*.mk to av1_*.mk
fe5f8a8 rename files vp10_* to av1_*
Change-Id: I6fc3d18eb11fc171e46140c836ad5339cf6c9419
diff --git a/aom_dsp/prob.h b/aom_dsp/prob.h
index 3de6463..e00cd7c 100644
--- a/aom_dsp/prob.h
+++ b/aom_dsp/prob.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VPX_DSP_PROB_H_
-#define VPX_DSP_PROB_H_
+#ifndef AOM_DSP_PROB_H_
+#define AOM_DSP_PROB_H_
-#include "./vpx_config.h"
-#include "./vpx_dsp_common.h"
+#include "./aom_config.h"
+#include "./aom_dsp_common.h"
#include "aom_ports/mem.h"
@@ -20,51 +20,51 @@
extern "C" {
#endif
-typedef uint8_t vpx_prob;
+typedef uint8_t aom_prob;
#define MAX_PROB 255
-#define vpx_prob_half ((vpx_prob)128)
+#define aom_prob_half ((aom_prob)128)
-typedef int8_t vpx_tree_index;
+typedef int8_t aom_tree_index;
#define TREE_SIZE(leaf_count) (2 * (leaf_count)-2)
-#define vpx_complement(x) (255 - x)
+#define aom_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 vpx_tree_indices.
+ Each node of the tree is a pair of aom_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 vpx_tree_index vpx_tree[];
+typedef const aom_tree_index aom_tree[];
-static INLINE vpx_prob clip_prob(int p) {
+static INLINE aom_prob clip_prob(int p) {
return (p > 255) ? 255 : (p < 1) ? 1 : p;
}
-static INLINE vpx_prob get_prob(int num, int den) {
+static INLINE aom_prob get_prob(int num, int den) {
return (den == 0) ? 128u : clip_prob(((int64_t)num * 256 + (den >> 1)) / den);
}
-static INLINE vpx_prob get_binary_prob(int n0, int n1) {
+static INLINE aom_prob get_binary_prob(int n0, int n1) {
return get_prob(n0, n0 + n1);
}
/* This function assumes prob1 and prob2 are already within [1,255] range. */
-static INLINE vpx_prob weighted_prob(int prob1, int prob2, int factor) {
+static INLINE aom_prob weighted_prob(int prob1, int prob2, int factor) {
return ROUND_POWER_OF_TWO(prob1 * (256 - factor) + prob2 * factor, 8);
}
-static INLINE vpx_prob merge_probs(vpx_prob pre_prob, const unsigned int ct[2],
+static INLINE aom_prob merge_probs(aom_prob pre_prob, const unsigned int ct[2],
unsigned int count_sat,
unsigned int max_update_factor) {
- const vpx_prob prob = get_binary_prob(ct[0], ct[1]);
- const unsigned int count = VPXMIN(ct[0] + ct[1], count_sat);
+ const aom_prob prob = get_binary_prob(ct[0], ct[1]);
+ const unsigned int count = AOMMIN(ct[0] + ct[1], count_sat);
const unsigned int factor = max_update_factor * count / count_sat;
return weighted_prob(pre_prob, prob, factor);
}
@@ -75,27 +75,27 @@
70, 76, 83, 89, 96, 102, 108, 115, 121, 128
};
-static INLINE vpx_prob mode_mv_merge_probs(vpx_prob pre_prob,
+static INLINE aom_prob mode_mv_merge_probs(aom_prob pre_prob,
const unsigned int ct[2]) {
const unsigned int den = ct[0] + ct[1];
if (den == 0) {
return pre_prob;
} else {
- const unsigned int count = VPXMIN(den, MODE_MV_COUNT_SAT);
+ const unsigned int count = AOMMIN(den, MODE_MV_COUNT_SAT);
const unsigned int factor = count_to_update_factor[count];
- const vpx_prob prob =
+ const aom_prob prob =
clip_prob(((int64_t)(ct[0]) * 256 + (den >> 1)) / den);
return weighted_prob(pre_prob, prob, factor);
}
}
-void vpx_tree_merge_probs(const vpx_tree_index *tree, const vpx_prob *pre_probs,
- const unsigned int *counts, vpx_prob *probs);
+void aom_tree_merge_probs(const aom_tree_index *tree, const aom_prob *pre_probs,
+ const unsigned int *counts, aom_prob *probs);
-DECLARE_ALIGNED(16, extern const uint8_t, vpx_norm[256]);
+DECLARE_ALIGNED(16, extern const uint8_t, aom_norm[256]);
#ifdef __cplusplus
} // extern "C"
#endif
-#endif // VPX_DSP_PROB_H_
+#endif // AOM_DSP_PROB_H_
