Commit c27fc14b authored by Yaowu Xu's avatar Yaowu Xu
Browse files

Port folder renaming changes from AOM

Manually cherry-picked commits:
ceef0583 libvpx->libaom part2
3d26d916 libvpx -> libaom
cfea7dd7 vp10/ -> av1/
3a8eff73 Fix a build issue for a test
bf4202ed Rename vpx to aom

Change-Id: I1b0eb5a40796e3aaf41c58984b4229a439a597dc
parent b1fb998c
......@@ -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" {
......
......@@ -11,7 +11,7 @@
#ifndef VPX_DSP_BLEND_H_
#define VPX_DSP_BLEND_H_
#include "vpx_ports/mem.h"
#include "aom_ports/mem.h"
// Various blending functions and macros.
// See also the vpx_blend_* functions in vpx_dsp_rtcd.h
......
......@@ -10,10 +10,10 @@
#include <assert.h>
#include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_dsp/blend.h"
#include "aom/vpx_integer.h"
#include "aom_ports/mem.h"
#include "aom_dsp/vpx_dsp_common.h"
#include "aom_dsp/blend.h"
#include "./vpx_dsp_rtcd.h"
......
......@@ -10,15 +10,15 @@
#include <assert.h>
#include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
#include "vpx_dsp/blend.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "aom/vpx_integer.h"
#include "aom_ports/mem.h"
#include "aom_dsp/blend.h"
#include "aom_dsp/vpx_dsp_common.h"
#include "./vpx_dsp_rtcd.h"
// Blending with alpha mask. Mask values come from the range [0, 64],
// as described for VPX_BLEND_A64 in vpx_dsp/blned.h. src0 or src1 can
// as described for VPX_BLEND_A64 in aom_dsp/blned.h. src0 or src1 can
// be the same as dst, or dst can be different from both sources.
void vpx_blend_a64_mask_c(uint8_t *dst, uint32_t dst_stride,
......
......@@ -10,10 +10,10 @@
#include <assert.h>
#include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_dsp/blend.h"
#include "aom/vpx_integer.h"
#include "aom_ports/mem.h"
#include "aom_dsp/vpx_dsp_common.h"
#include "aom_dsp/blend.h"
#include "./vpx_dsp_rtcd.h"
......
......@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include <stdlib.h>
#include "vpx/vpx_integer.h"
#include "aom/vpx_integer.h"
const int16_t vpx_rv[] = {
8, 5, 2, 2, 8, 12, 4, 9, 8, 3, 0, 3, 9, 0, 0, 0, 8, 3, 14,
......
......@@ -16,8 +16,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"
typedef struct fs_level fs_level;
typedef struct fs_ctx fs_ctx;
......
......@@ -9,7 +9,7 @@
*/
#include "./vpx_dsp_rtcd.h"
#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
......@@ -744,7 +744,7 @@ void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *out, int stride) {
for (j = 0; j < 32; ++j)
// TODO(cd): see quality impact of only doing
// output[j * 32 + i] = (temp_out[j] + 1) >> 2;
// PS: also change code in vpx_dsp/x86/vpx_dct_sse2.c
// PS: also change code in aom_dsp/x86/vpx_dct_sse2.c
output[j * 32 + i] = (temp_out[j] + 1 + (temp_out[j] > 0)) >> 2;
}
......
......@@ -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)
......
......@@ -12,7 +12,7 @@
#include <string.h>
#include "./vpx_dsp_rtcd.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 "C" {
......
......@@ -12,8 +12,8 @@
#include "./vpx_config.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"
static INLINE int8_t signed_char_clamp(int t) {
return (int8_t)clamp(t, -128, 127);
......
......@@ -9,7 +9,7 @@
*/
#include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/mips/macros_msa.h"
#include "aom_dsp/mips/macros_msa.h"
uint32_t vpx_avg_8x8_msa(const uint8_t *src, int32_t src_stride) {
uint32_t sum_out;
......
......@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vpx_dsp/mips/common_dspr2.h"
#include "aom_dsp/mips/common_dspr2.h"
#if HAVE_DSPR2
uint8_t vpx_ff_cropTbl_a[256 + 2 * CROP_WIDTH];
......
......@@ -13,7 +13,7 @@
#include <assert.h>
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
#include "aom/vpx_integer.h"
#ifdef __cplusplus
extern "C" {
......@@ -21,7 +21,7 @@ extern "C" {
#if HAVE_DSPR2
#define CROP_WIDTH 512
extern uint8_t *vpx_ff_cropTbl; // From "vpx_dsp/mips/intrapred4_dspr2.c"
extern uint8_t *vpx_ff_cropTbl; // From "aom_dsp/mips/intrapred4_dspr2.c"
static INLINE void prefetch_load(const unsigned char *src) {
__asm__ __volatile__("pref 0, 0(%[src]) \n\t" : : [src] "r"(src));
......
......@@ -12,10 +12,10 @@
#include <stdio.h>
#include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/mips/convolve_common_dspr2.h"
#include "vpx_dsp/vpx_convolve.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h"
#include "aom_dsp/mips/convolve_common_dspr2.h"
#include "aom_dsp/vpx_convolve.h"
#include "aom_dsp/vpx_dsp_common.h"
#include "aom_ports/mem.h"
#if HAVE_DSPR2
static void convolve_bi_avg_vert_4_dspr2(const uint8_t *src, int32_t src_stride,
......
......@@ -12,10 +12,10 @@
#include <stdio.h>
#include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/mips/convolve_common_dspr2.h"
#include "vpx_dsp/vpx_convolve.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h"
#include "aom_dsp/mips/convolve_common_dspr2.h"
#include "aom_dsp/vpx_convolve.h"
#include "aom_dsp/vpx_dsp_common.h"
#include "aom_ports/mem.h"
#if HAVE_DSPR2
static void convolve_bi_avg_horiz_4_dspr2(const uint8_t *src,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment