commit f883b42cabd100e575becdfb8f361f953942fe02
author Yaowu Xu <yaowu@google.com> Tue Aug 30 14:01:10 2016 -0700
committer Yaowu Xu <yaowu@google.com> Wed Aug 31 18:19:03 2016 -0700
tree 612f6c31e257ec26cd6e6ce32055a9182c91ad9a
parent c27fc14b02dd41f677290022b0de2d296f5e6dca

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

av1/encoder/buf_ans.h

diff --git a/av1/encoder/buf_ans.h b/av1/encoder/buf_ans.h
index 8a88c32..1ba6e6c 100644
--- a/av1/encoder/buf_ans.h
+++ b/av1/encoder/buf_ans.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef VP10_ENCODER_BUF_ANS_H_
-#define VP10_ENCODER_BUF_ANS_H_
+#ifndef AV1_ENCODER_BUF_ANS_H_
+#define AV1_ENCODER_BUF_ANS_H_
 // Buffered forward ANS writer.
 // Symbols are written to the writer in forward (decode) order and serialzed
 // backwards due to ANS's stack like behavior.
 
 #include <assert.h>
-#include "./vpx_config.h"
-#include "aom/vpx_integer.h"
+#include "./aom_config.h"
+#include "aom/aom_integer.h"
 #include "av1/common/ans.h"
 
 #ifdef __cplusplus
@@ -34,18 +34,18 @@
 };
 
 struct BufAnsCoder {
-  struct VP10Common *cm;
+  struct AV1Common *cm;
   struct buffered_ans_symbol *buf;
   int size;
   int offset;
 };
 
-void vp10_buf_ans_alloc(struct BufAnsCoder *c, struct VP10Common *cm,
-                        int size_hint);
+void av1_buf_ans_alloc(struct BufAnsCoder *c, struct AV1Common *cm,
+                       int size_hint);
 
-void vp10_buf_ans_free(struct BufAnsCoder *c);
+void av1_buf_ans_free(struct BufAnsCoder *c);
 
-void vp10_buf_ans_grow(struct BufAnsCoder *c);
+void av1_buf_ans_grow(struct BufAnsCoder *c);
 
 static INLINE void buf_ans_write_reset(struct BufAnsCoder *const c) {
   c->offset = 0;
@@ -55,7 +55,7 @@
                                   AnsP8 prob) {
   assert(c->offset <= c->size);
   if (c->offset == c->size) {
-    vp10_buf_ans_grow(c);
+    av1_buf_ans_grow(c);
   }
   c->buf[c->offset].method = ANS_METHOD_UABS;
   c->buf[c->offset].val_start = val;
@@ -67,7 +67,7 @@
                                   const struct rans_sym *const sym) {
   assert(c->offset <= c->size);
   if (c->offset == c->size) {
-    vp10_buf_ans_grow(c);
+    av1_buf_ans_grow(c);
   }
   c->buf[c->offset].method = ANS_METHOD_RANS;
   c->buf[c->offset].val_start = sym->cum_prob;
@@ -106,4 +106,4 @@
 #ifdef __cplusplus
 }  // extern "C"
 #endif  // __cplusplus
-#endif  // VP10_ENCODER_BUF_ANS_H_
+#endif  // AV1_ENCODER_BUF_ANS_H_