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

aom_dsp/blend_a64_vmask.c

diff --git a/aom_dsp/blend_a64_vmask.c b/aom_dsp/blend_a64_vmask.c
index b22dcd1..05745dc 100644
--- a/aom_dsp/blend_a64_vmask.c
+++ b/aom_dsp/blend_a64_vmask.c
@@ -10,14 +10,14 @@
 
 #include <assert.h>
 
-#include "aom/vpx_integer.h"
+#include "aom/aom_integer.h"
 #include "aom_ports/mem.h"
-#include "aom_dsp/vpx_dsp_common.h"
+#include "aom_dsp/aom_dsp_common.h"
 #include "aom_dsp/blend.h"
 
-#include "./vpx_dsp_rtcd.h"
+#include "./aom_dsp_rtcd.h"
 
-void vpx_blend_a64_vmask_c(uint8_t *dst, uint32_t dst_stride,
+void aom_blend_a64_vmask_c(uint8_t *dst, uint32_t dst_stride,
                            const uint8_t *src0, uint32_t src0_stride,
                            const uint8_t *src1, uint32_t src1_stride,
                            const uint8_t *mask, int h, int w) {
@@ -34,14 +34,14 @@
   for (i = 0; i < h; ++i) {
     const int m = mask[i];
     for (j = 0; j < w; ++j) {
-      dst[i * dst_stride + j] = VPX_BLEND_A64(m, src0[i * src0_stride + j],
+      dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
                                               src1[i * src1_stride + j]);
     }
   }
 }
 
-#if CONFIG_VP9_HIGHBITDEPTH
-void vpx_highbd_blend_a64_vmask_c(uint8_t *dst_8, uint32_t dst_stride,
+#if CONFIG_AOM_HIGHBITDEPTH
+void aom_highbd_blend_a64_vmask_c(uint8_t *dst_8, uint32_t dst_stride,
                                   const uint8_t *src0_8, uint32_t src0_stride,
                                   const uint8_t *src1_8, uint32_t src1_stride,
                                   const uint8_t *mask, int h, int w, int bd) {
@@ -63,9 +63,9 @@
   for (i = 0; i < h; ++i) {
     const int m = mask[i];
     for (j = 0; j < w; ++j) {
-      dst[i * dst_stride + j] = VPX_BLEND_A64(m, src0[i * src0_stride + j],
+      dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
                                               src1[i * src1_stride + j]);
     }
   }
 }
-#endif  // CONFIG_VP9_HIGHBITDEPTH
+#endif  // CONFIG_AOM_HIGHBITDEPTH