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/av1/encoder/subexp.h b/av1/encoder/subexp.h
index 82ce2e0..c829f2d 100644
--- a/av1/encoder/subexp.h
+++ b/av1/encoder/subexp.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP10_ENCODER_SUBEXP_H_
-#define VP10_ENCODER_SUBEXP_H_
+#ifndef AV1_ENCODER_SUBEXP_H_
+#define AV1_ENCODER_SUBEXP_H_
#ifdef __cplusplus
extern "C" {
@@ -17,30 +17,29 @@
#include "aom_dsp/prob.h"
-struct vp10_writer;
+struct aom_writer;
-void vp10_write_prob_diff_update(struct vp10_writer *w, vpx_prob newp,
- vpx_prob oldp);
+void av1_write_prob_diff_update(struct aom_writer *w, aom_prob newp,
+ aom_prob oldp);
-void vp10_cond_prob_diff_update(struct vp10_writer *w, vpx_prob *oldp,
- const unsigned int ct[2]);
+void av1_cond_prob_diff_update(struct aom_writer *w, aom_prob *oldp,
+ const unsigned int ct[2]);
-int vp10_prob_diff_update_savings_search(const unsigned int *ct, vpx_prob oldp,
- vpx_prob *bestp, vpx_prob upd);
+int av1_prob_diff_update_savings_search(const unsigned int *ct, aom_prob oldp,
+ aom_prob *bestp, aom_prob upd);
-int vp10_prob_diff_update_savings_search_model(const unsigned int *ct,
- const vpx_prob *oldp,
- vpx_prob *bestp, vpx_prob upd,
- int stepsize);
-int vp10_cond_prob_diff_update_savings(vpx_prob *oldp,
- const unsigned int ct[2]);
+int av1_prob_diff_update_savings_search_model(const unsigned int *ct,
+ const aom_prob *oldp,
+ aom_prob *bestp, aom_prob upd,
+ int stepsize);
+int av1_cond_prob_diff_update_savings(aom_prob *oldp, const unsigned int ct[2]);
#if CONFIG_ENTROPY
-int vp10_prob_update_search_subframe(unsigned int ct[][2], vpx_prob oldp,
- vpx_prob *bestp, vpx_prob upd, int n);
-int vp10_prob_update_search_model_subframe(
- unsigned int ct[ENTROPY_NODES][COEF_PROBS_BUFS][2], const vpx_prob *oldp,
- vpx_prob *bestp, vpx_prob upd, int stepsize, int n);
+int av1_prob_update_search_subframe(unsigned int ct[][2], aom_prob oldp,
+ aom_prob *bestp, aom_prob upd, int n);
+int av1_prob_update_search_model_subframe(
+ unsigned int ct[ENTROPY_NODES][COEF_PROBS_BUFS][2], const aom_prob *oldp,
+ aom_prob *bestp, aom_prob upd, int stepsize, int n);
#endif // CONFIG_ENTROPY
//
@@ -48,10 +47,10 @@
// 2 * 2^mag_bits + 1, symmetric around 0, where one bit is used to
// indicate 0 or non-zero, mag_bits bits are used to indicate magnitide
// and 1 more bit for the sign if non-zero.
-void vp10_write_primitive_symmetric(vp10_writer *w, int word,
- unsigned int mag_bits);
+void aom_write_primitive_symmetric(aom_writer *w, int word,
+ unsigned int mag_bits);
#ifdef __cplusplus
} // extern "C"
#endif
-#endif // VP10_ENCODER_SUBEXP_H_
+#endif // AV1_ENCODER_SUBEXP_H_
