Commit bf4202ed authored by Yaowu Xu's avatar Yaowu Xu

Rename vpx to aom

Change-Id: Ibc7933fba85feeb30ef9b14b302d932aff19f54e
parent 15791332
......@@ -22,10 +22,10 @@
#include <string.h>
#define VPX_DISABLE_CTRL_TYPECHECKS 1
#include "./vpx_config.h"
#include "vpx/svc_context.h"
#include "vpx/vp8cx.h"
#include "vpx/vpx_encoder.h"
#include "vpx_mem/vpx_mem.h"
#include "aom/svc_context.h"
#include "aom/vp8cx.h"
#include "aom/vpx_encoder.h"
#include "aom_mem/vpx_mem.h"
#include "vp10/common/onyxc_int.h"
#ifdef __MINGW32__
......
......@@ -14,8 +14,8 @@
*/
#include <stdarg.h>
#include <stdlib.h>
#include "vpx/vpx_integer.h"
#include "vpx/internal/vpx_codec_internal.h"
#include "aom/vpx_integer.h"
#include "aom/internal/vpx_codec_internal.h"
#include "vpx_version.h"
#define SAVE_STATUS(ctx, var) (ctx ? (ctx->err = var) : var)
......
......@@ -13,7 +13,7 @@
*
*/
#include <string.h>
#include "vpx/internal/vpx_codec_internal.h"
#include "aom/internal/vpx_codec_internal.h"
#define SAVE_STATUS(ctx, var) (ctx ? (ctx->err = var) : var)
......
......@@ -15,7 +15,7 @@
#include <limits.h>
#include <string.h>
#include "vpx_config.h"
#include "vpx/internal/vpx_codec_internal.h"
#include "aom/internal/vpx_codec_internal.h"
#define SAVE_STATUS(ctx, var) (ctx ? (ctx->err = var) : var)
......@@ -171,7 +171,7 @@ vpx_codec_err_t vpx_codec_enc_config_default(vpx_codec_iface_t *iface,
/* On X86, disable the x87 unit's internal 80 bit precision for better
* consistency with the SSE unit's 64 bit precision.
*/
#include "vpx_ports/x86.h"
#include "aom_ports/x86.h"
#define FLOATING_POINT_INIT() \
do { \
unsigned short x87_orig_mode = x87_set_double_precision();
......
......@@ -11,9 +11,9 @@
#include <stdlib.h>
#include <string.h>
#include "vpx/vpx_image.h"
#include "vpx/vpx_integer.h"
#include "vpx_mem/vpx_mem.h"
#include "aom/vpx_image.h"
#include "aom/vpx_integer.h"
#include "aom_mem/vpx_mem.h"
static vpx_image_t *img_alloc_helper(vpx_image_t *img, vpx_img_fmt_t fmt,
unsigned int d_w, unsigned int d_h,
......
......@@ -10,7 +10,7 @@
#include <math.h>
#include "vpx/internal/vpx_psnr.h"
#include "aom/internal/vpx_psnr.h"
#define MAX_PSNR 100.0
......
......@@ -14,7 +14,7 @@
#include "./vpx_dsp_rtcd.h"
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
#include "aom/vpx_integer.h"
static INLINE unsigned int horizontal_add_u16x8(const uint16x8_t v_16x8) {
const uint32x4_t a = vpaddlq_u16(v_16x8);
......
......@@ -11,7 +11,7 @@
#include <arm_neon.h>
#include "./vpx_config.h"
#include "vpx_dsp/txfm_common.h"
#include "aom_dsp/txfm_common.h"
void vpx_fdct8x8_neon(const int16_t *input, int16_t *final_output, int stride) {
int i;
......
......@@ -10,8 +10,8 @@
#include <arm_neon.h>
#include "vpx_dsp/inv_txfm.h"
#include "vpx_ports/mem.h"
#include "aom_dsp/inv_txfm.h"
#include "aom_ports/mem.h"
void vpx_idct16x16_1_add_neon(int16_t *input, uint8_t *dest, int dest_stride) {
uint8x8_t d2u8, d3u8, d30u8, d31u8;
......
......@@ -11,7 +11,7 @@
#include <arm_neon.h>
#include "./vpx_config.h"
#include "vpx_dsp/txfm_common.h"
#include "aom_dsp/txfm_common.h"
static INLINE void TRANSPOSE8X8(int16x8_t *q8s16, int16x8_t *q9s16,
int16x8_t *q10s16, int16x8_t *q11s16,
......
......@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vpx_dsp/vpx_dsp_common.h"
#include "aom_dsp/vpx_dsp_common.h"
void vpx_idct16x16_256_add_neon_pass1(const int16_t *input, int16_t *output,
int output_stride);
......
......@@ -12,8 +12,8 @@
#include "./vpx_config.h"
#include "vpx_dsp/inv_txfm.h"
#include "vpx_ports/mem.h"
#include "aom_dsp/inv_txfm.h"
#include "aom_ports/mem.h"
static INLINE void LD_16x8(uint8_t *d, int d_stride, uint8x16_t *q8u8,
uint8x16_t *q9u8, uint8x16_t *q10u8,
......
......@@ -11,7 +11,7 @@
#include <arm_neon.h>
#include "./vpx_config.h"
#include "vpx_dsp/txfm_common.h"
#include "aom_dsp/txfm_common.h"
#define LOAD_FROM_TRANSPOSED(prev, first, second) \
q14s16 = vld1q_s16(trans_buf + first * 8); \
......
......@@ -10,8 +10,8 @@
#include <arm_neon.h>
#include "vpx_dsp/inv_txfm.h"
#include "vpx_ports/mem.h"
#include "aom_dsp/inv_txfm.h"
#include "aom_ports/mem.h"
void vpx_idct4x4_1_add_neon(int16_t *input, uint8_t *dest, int dest_stride) {
uint8x8_t d6u8;
......
......@@ -10,8 +10,8 @@
#include <arm_neon.h>
#include "vpx_dsp/inv_txfm.h"
#include "vpx_ports/mem.h"
#include "aom_dsp/inv_txfm.h"
#include "aom_ports/mem.h"
void vpx_idct8x8_1_add_neon(int16_t *input, uint8_t *dest, int dest_stride) {
uint8x8_t d2u8, d3u8, d30u8, d31u8;
......
......@@ -11,7 +11,7 @@
#include <arm_neon.h>
#include "./vpx_config.h"
#include "vpx_dsp/txfm_common.h"
#include "aom_dsp/txfm_common.h"
static INLINE void TRANSPOSE8X8(int16x8_t *q8s16, int16x8_t *q9s16,
int16x8_t *q10s16, int16x8_t *q11s16,
......
......@@ -12,7 +12,7 @@
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
#include "vpx/vpx_integer.h"
#include "aom/vpx_integer.h"
//------------------------------------------------------------------------------
// DC 4x4
......
......@@ -12,7 +12,7 @@
#include "./vpx_dsp_rtcd.h"
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
#include "aom/vpx_integer.h"
static INLINE void loop_filter_neon_16(uint8x16_t qblimit, // blimit
uint8x16_t qlimit, // limit
......
......@@ -12,7 +12,7 @@
#include "./vpx_dsp_rtcd.h"
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
#include "aom/vpx_integer.h"
void vpx_lpf_vertical_4_dual_neon(uint8_t *s, int p, const uint8_t *blimit0,
const uint8_t *limit0, const uint8_t *thresh0,
......
......@@ -12,7 +12,7 @@
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
#include "vpx/vpx_integer.h"
#include "aom/vpx_integer.h"
static INLINE unsigned int horizontal_long_add_16x8(const uint16x8_t vec_lo,
const uint16x8_t vec_hi) {
......
......@@ -12,7 +12,7 @@
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
#include "aom/vpx_integer.h"
unsigned int vpx_sad8x16_neon(unsigned char *src_ptr, int src_stride,
unsigned char *ref_ptr, int ref_stride) {
......
......@@ -10,8 +10,8 @@
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
#include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
#include "aom/vpx_integer.h"
#include "aom_ports/mem.h"
#if HAVE_MEDIA
static const int16_t bilinear_filters_media[8][2] = { { 128, 0 }, { 112, 16 },
......
......@@ -12,10 +12,10 @@
#include "./vpx_dsp_rtcd.h"
#include "./vpx_config.h"
#include "vpx_ports/mem.h"
#include "vpx/vpx_integer.h"
#include "aom_ports/mem.h"
#include "aom/vpx_integer.h"
#include "vpx_dsp/variance.h"
#include "aom_dsp/variance.h"
static const uint8_t bilinear_filters[8][2] = {
{ 128, 0 }, { 112, 16 }, { 96, 32 }, { 80, 48 },
......
......@@ -11,7 +11,7 @@
#include <arm_neon.h>
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
#include "aom/vpx_integer.h"
void vpx_subtract_block_neon(int rows, int cols, int16_t *diff,
ptrdiff_t diff_stride, const uint8_t *src,
......
......@@ -13,8 +13,8 @@
#include "./vpx_dsp_rtcd.h"
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
#include "aom/vpx_integer.h"
#include "aom_ports/mem.h"
static INLINE int horizontal_add_s16x8(const int16x8_t v_16x8) {
const int32x4_t a = vpaddlq_s16(v_16x8);
......
......@@ -13,8 +13,8 @@
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
#include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
#include "aom/vpx_integer.h"
#include "aom_ports/mem.h"
static INLINE int32x4_t MULTIPLY_BY_Q0(int16x4_t dsrc0, int16x4_t dsrc1,
int16x4_t dsrc2, int16x4_t dsrc3,
......
......@@ -13,8 +13,8 @@
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
#include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
#include "aom/vpx_integer.h"
#include "aom_ports/mem.h"
static INLINE int32x4_t MULTIPLY_BY_Q0(int16x4_t dsrc0, int16x4_t dsrc1,
int16x4_t dsrc2, int16x4_t dsrc3,
......
......@@ -11,7 +11,7 @@
#include <arm_neon.h>
#include "./vpx_dsp_rtcd.h"
#include "vpx/vpx_integer.h"
#include "aom/vpx_integer.h"
void vpx_convolve_avg_neon(const uint8_t *src, // r0
ptrdiff_t src_stride, // r1
......
......@@ -11,7 +11,7 @@
#include <arm_neon.h>
#include "./vpx_dsp_rtcd.h"
#include "vpx/vpx_integer.h"
#include "aom/vpx_integer.h"
void vpx_convolve_copy_neon(const uint8_t *src, // r0
ptrdiff_t src_stride, // r1
......
......@@ -11,8 +11,8 @@
#include <assert.h>
#include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h"
#include "aom_dsp/vpx_dsp_common.h"
#include "aom_ports/mem.h"
void vpx_convolve8_neon(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst,
ptrdiff_t dst_stride, const int16_t *filter_x,
......
......@@ -10,7 +10,7 @@
#include <stdlib.h>
#include "./vpx_dsp_rtcd.h"
#include "vpx_ports/mem.h"
#include "aom_ports/mem.h"
unsigned int vpx_avg_8x8_c(const uint8_t *s, int p) {
int i, j;
......
......@@ -11,12 +11,12 @@
#include "./vpx_config.h"
#include "vpx_dsp/bitreader.h"
#include "vpx_dsp/prob.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_util/endian_inl.h"
#include "aom_dsp/bitreader.h"
#include "aom_dsp/prob.h"
#include "aom_dsp/vpx_dsp_common.h"
#include "aom_ports/mem.h"
#include "aom_mem/vpx_mem.h"
#include "aom_util/endian_inl.h"
int vpx_reader_init(vpx_reader *r, const uint8_t *buffer, size_t size,
vpx_decrypt_cb decrypt_cb, void *decrypt_state) {
......
......@@ -15,10 +15,10 @@
#include <limits.h>
#include "./vpx_config.h"
#include "vpx_ports/mem.h"
#include "vpx/vp8dx.h"
#include "vpx/vpx_integer.h"
#include "vpx_dsp/prob.h"
#include "aom_ports/mem.h"
#include "aom/vp8dx.h"
#include "aom/vpx_integer.h"
#include "aom_dsp/prob.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -13,7 +13,7 @@
#include <limits.h>
#include "vpx/vpx_integer.h"
#include "aom/vpx_integer.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -11,9 +11,9 @@
#ifndef VPX_DSP_BITWRITER_H_
#define VPX_DSP_BITWRITER_H_
#include "vpx_ports/mem.h"
#include "aom_ports/mem.h"
#include "vpx_dsp/prob.h"
#include "aom_dsp/prob.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -11,7 +11,7 @@
#ifndef VPX_DSP_BITWRITER_BUFFER_H_
#define VPX_DSP_BITWRITER_BUFFER_H_
#include "vpx/vpx_integer.h"
#include "aom/vpx_integer.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -15,8 +15,8 @@
#include <string.h>
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/ssim.h"
#include "vpx_ports/system_state.h"
#include "aom_dsp/ssim.h"
#include "aom_ports/system_state.h"
/* TODO(jbb): High bit depth version of this code needed */
typedef struct fs_level fs_level;
typedef struct fs_ctx fs_ctx;
......
......@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vpx_dsp/fwd_txfm.h"
#include "aom_dsp/fwd_txfm.h"
void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride) {
// The 2D transform is done with two passes which are actually pretty
......
......@@ -11,7 +11,7 @@
#ifndef VPX_DSP_FWD_TXFM_H_
#define VPX_DSP_FWD_TXFM_H_
#include "vpx_dsp/txfm_common.h"
#include "aom_dsp/txfm_common.h"
static INLINE tran_high_t fdct_round_shift(tran_high_t input) {
tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS);
......
......@@ -11,8 +11,8 @@
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h"
#include "aom_dsp/vpx_dsp_common.h"
#include "aom_mem/vpx_mem.h"
#define DST(x, y) dst[(x) + (y)*stride]
#define AVG3(a, b, c) (((a) + 2 * (b) + (c) + 2) >> 2)
......
......@@ -11,7 +11,7 @@
#include <math.h>
#include <string.h>
#include "vpx_dsp/inv_txfm.h"
#include "aom_dsp/inv_txfm.h"
void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride) {
/* 4-point reversible, orthonormal inverse Walsh-Hadamard in 3.5 adds,
......
......@@ -14,8 +14,8 @@
#include <assert.h>
#include "./vpx_config.h"
#include "vpx_dsp/txfm_common.h"
#include "vpx_ports/mem.h"
#include "aom_dsp/txfm_common.h"
#include "aom_ports/mem.h"
#ifdef __cplusplus
extern