Commit cfea7dd7 authored by Yaowu Xu's avatar Yaowu Xu

vp10/ -> av1/

Change-Id: Ia055d03656ad1580447eced8687949583fdf4089
parent 69f01421
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "aom/vp8cx.h" #include "aom/vp8cx.h"
#include "aom/vpx_encoder.h" #include "aom/vpx_encoder.h"
#include "aom_mem/vpx_mem.h" #include "aom_mem/vpx_mem.h"
#include "vp10/common/onyxc_int.h" #include "av1/common/onyxc_int.h"
#ifdef __MINGW32__ #ifdef __MINGW32__
#define strtok_r strtok_s #define strtok_r strtok_s
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
#include "aom_scale/yv12config.h" #include "aom_scale/yv12config.h"
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_VPX_HIGHBITDEPTH
#include "vp10/common/common.h" #include "av1/common/common.h"
#endif #endif
static void extend_plane(uint8_t *const src, int src_stride, int width, static void extend_plane(uint8_t *const src, int src_stride, int width,
......
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
#include "./vpx_config.h" #include "./vpx_config.h"
#include "aom_mem/vpx_mem.h" #include "aom_mem/vpx_mem.h"
#include "vp10/common/alloccommon.h" #include "av1/common/alloccommon.h"
#include "vp10/common/blockd.h" #include "av1/common/blockd.h"
#include "vp10/common/entropymode.h" #include "av1/common/entropymode.h"
#include "vp10/common/entropymv.h" #include "av1/common/entropymv.h"
#include "vp10/common/onyxc_int.h" #include "av1/common/onyxc_int.h"
void vp10_set_mb_mi(VP10_COMMON *cm, int width, int height) { void vp10_set_mb_mi(VP10_COMMON *cm, int width, int height) {
const int aligned_width = ALIGN_POWER_OF_TWO(width, MI_SIZE_LOG2); const int aligned_width = ALIGN_POWER_OF_TWO(width, MI_SIZE_LOG2);
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "./vp10_rtcd.h" #include "./vp10_rtcd.h"
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vp10/common/common.h" #include "av1/common/common.h"
static int16_t sinpi_1_9 = 0x14a3; static int16_t sinpi_1_9 = 0x14a3;
static int16_t sinpi_2_9 = 0x26c9; static int16_t sinpi_2_9 = 0x26c9;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "./vp10_rtcd.h" #include "./vp10_rtcd.h"
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vp10/common/common.h" #include "av1/common/common.h"
static int16_t cospi_2_64 = 16305; static int16_t cospi_2_64 = 16305;
static int16_t cospi_4_64 = 16069; static int16_t cospi_4_64 = 16069;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vp10/common/blockd.h" #include "av1/common/blockd.h"
PREDICTION_MODE vp10_left_block_mode(const MODE_INFO *cur_mi, PREDICTION_MODE vp10_left_block_mode(const MODE_INFO *cur_mi,
const MODE_INFO *left_mi, int b) { const MODE_INFO *left_mi, int b) {
......
...@@ -17,16 +17,16 @@ ...@@ -17,16 +17,16 @@
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
#include "aom_scale/yv12config.h" #include "aom_scale/yv12config.h"
#include "vp10/common/common_data.h" #include "av1/common/common_data.h"
#include "vp10/common/entropy.h" #include "av1/common/entropy.h"
#include "vp10/common/entropymode.h" #include "av1/common/entropymode.h"
#include "vp10/common/mv.h" #include "av1/common/mv.h"
#if CONFIG_AOM_QM #if CONFIG_AOM_QM
#include "vp10/common/quant_common.h" #include "av1/common/quant_common.h"
#endif #endif
#include "vp10/common/scale.h" #include "av1/common/scale.h"
#include "vp10/common/seg_common.h" #include "av1/common/seg_common.h"
#include "vp10/common/tile_common.h" #include "av1/common/tile_common.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -3,7 +3,7 @@ Copyright (c) 2016 Cisco Systems ...@@ -3,7 +3,7 @@ Copyright (c) 2016 Cisco Systems
(Replace with proper AOM header) (Replace with proper AOM header)
*/ */
#include "vp10/common/clpf.h" #include "av1/common/clpf.h"
// Apply the filter on a single block // Apply the filter on a single block
static void clpf_block(const uint8_t *src, uint8_t *dst, int sstride, static void clpf_block(const uint8_t *src, uint8_t *dst, int sstride,
......
...@@ -6,7 +6,7 @@ Copyright (c) 2016, Cisco Systems ...@@ -6,7 +6,7 @@ Copyright (c) 2016, Cisco Systems
#ifndef VP10_COMMON_CLPF_H_ #ifndef VP10_COMMON_CLPF_H_
#define VP10_COMMON_CLPF_H_ #define VP10_COMMON_CLPF_H_
#include "vp10/common/reconinter.h" #include "av1/common/reconinter.h"
// Configuration // Configuration
#define CLPF_ALLOW_PIXEL_PARALLELISM \ #define CLPF_ALLOW_PIXEL_PARALLELISM \
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#ifndef VP10_COMMON_COMMON_DATA_H_ #ifndef VP10_COMMON_COMMON_DATA_H_
#define VP10_COMMON_COMMON_DATA_H_ #define VP10_COMMON_COMMON_DATA_H_
#include "vp10/common/enums.h" #include "av1/common/enums.h"
#include "aom/vpx_integer.h" #include "aom/vpx_integer.h"
#include "aom_dsp/vpx_dsp_common.h" #include "aom_dsp/vpx_dsp_common.h"
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include <stdio.h> #include <stdio.h>
#include "vp10/common/blockd.h" #include "av1/common/blockd.h"
#include "vp10/common/onyxc_int.h" #include "av1/common/onyxc_int.h"
static void log_frame_info(VP10_COMMON *cm, const char *str, FILE *f) { static void log_frame_info(VP10_COMMON *cm, const char *str, FILE *f) {
fprintf(f, "%s", str); fprintf(f, "%s", str);
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
#include "./vpx_scale_rtcd.h" #include "./vpx_scale_rtcd.h"
#include "aom/vpx_integer.h" #include "aom/vpx_integer.h"
#include "vp10/common/dering.h" #include "av1/common/dering.h"
#include "vp10/common/onyxc_int.h" #include "av1/common/onyxc_int.h"
#include "vp10/common/reconinter.h" #include "av1/common/reconinter.h"
#include "vp10/common/od_dering.h" #include "av1/common/od_dering.h"
int compute_level_from_index(int global_level, int gi) { int compute_level_from_index(int global_level, int gi) {
......
#ifndef VP10_COMMON_DERING_H_ #ifndef VP10_COMMON_DERING_H_
#define VP10_COMMON_DERING_H_ #define VP10_COMMON_DERING_H_
#include "vp10/common/od_dering.h" #include "av1/common/od_dering.h"
#include "vp10/common/onyxc_int.h" #include "av1/common/onyxc_int.h"
#include "aom/vpx_integer.h" #include "aom/vpx_integer.h"
#include "./vpx_config.h" #include "./vpx_config.h"
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
......
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vp10/common/entropy.h" #include "av1/common/entropy.h"
#include "vp10/common/blockd.h" #include "av1/common/blockd.h"
#include "vp10/common/onyxc_int.h" #include "av1/common/onyxc_int.h"
#include "vp10/common/entropymode.h" #include "av1/common/entropymode.h"
#include "aom_mem/vpx_mem.h" #include "aom_mem/vpx_mem.h"
#include "aom/vpx_integer.h" #include "aom/vpx_integer.h"
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#include "aom/vpx_integer.h" #include "aom/vpx_integer.h"
#include "aom_dsp/prob.h" #include "aom_dsp/prob.h"
#include "vp10/common/common.h" #include "av1/common/common.h"
#include "vp10/common/enums.h" #include "av1/common/enums.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include "aom_mem/vpx_mem.h" #include "aom_mem/vpx_mem.h"
#include "vp10/common/onyxc_int.h" #include "av1/common/onyxc_int.h"
#include "vp10/common/seg_common.h" #include "av1/common/seg_common.h"
const vpx_prob vp10_kf_y_mode_prob[INTRA_MODES][INTRA_MODES][INTRA_MODES - 1] = const vpx_prob vp10_kf_y_mode_prob[INTRA_MODES][INTRA_MODES][INTRA_MODES - 1] =
{ { { {
......
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
#ifndef VP10_COMMON_ENTROPYMODE_H_ #ifndef VP10_COMMON_ENTROPYMODE_H_
#define VP10_COMMON_ENTROPYMODE_H_ #define VP10_COMMON_ENTROPYMODE_H_
#include "vp10/common/entropy.h" #include "av1/common/entropy.h"
#include "vp10/common/entropymv.h" #include "av1/common/entropymv.h"
#include "vp10/common/filter.h" #include "av1/common/filter.h"
#include "vp10/common/seg_common.h" #include "av1/common/seg_common.h"
#include "aom_dsp/vpx_filter.h" #include "aom_dsp/vpx_filter.h"
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vp10/common/onyxc_int.h" #include "av1/common/onyxc_int.h"
#include "vp10/common/entropymv.h" #include "av1/common/entropymv.h"
// Integer pel reference mv threshold for use of high-precision 1/8 mv // Integer pel reference mv threshold for use of high-precision 1/8 mv
#define COMPANDED_MVREF_THRESH 8 #define COMPANDED_MVREF_THRESH 8
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "aom_dsp/prob.h" #include "aom_dsp/prob.h"
#include "vp10/common/mv.h" #include "av1/common/mv.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <assert.h> #include <assert.h>
#include "vp10/common/filter.h" #include "av1/common/filter.h"
DECLARE_ALIGNED(256, static const InterpKernel, DECLARE_ALIGNED(256, static const InterpKernel,
bilinear_filters[SUBPEL_SHIFTS]) = { bilinear_filters[SUBPEL_SHIFTS]) = {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <assert.h> #include <assert.h>
#include "vp10/common/frame_buffers.h" #include "av1/common/frame_buffers.h"
#include "aom_mem/vpx_mem.h" #include "aom_mem/vpx_mem.h"
int vp10_alloc_internal_frame_buffers(InternalFrameBufferList *list) { int vp10_alloc_internal_frame_buffers(InternalFrameBufferList *list) {
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include "./vp10_rtcd.h" #include "./vp10_rtcd.h"
#include "./vpx_dsp_rtcd.h" #include "./vpx_dsp_rtcd.h"
#include "vp10/common/blockd.h" #include "av1/common/blockd.h"
#include "vp10/common/idct.h" #include "av1/common/idct.h"
#include "aom_dsp/inv_txfm.h" #include "aom_dsp/inv_txfm.h"
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#include <assert.h> #include <assert.h>
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vp10/common/common.h" #include "av1/common/common.h"
#include "vp10/common/enums.h" #include "av1/common/enums.h"
#include "aom_dsp/inv_txfm.h" #include "aom_dsp/inv_txfm.h"
#include "aom_dsp/txfm_common.h" #include "aom_dsp/txfm_common.h"
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
......
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
#include "./vpx_config.h" #include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h" #include "./vpx_dsp_rtcd.h"
#include "vp10/common/loopfilter.h" #include "av1/common/loopfilter.h"
#include "vp10/common/onyxc_int.h" #include "av1/common/onyxc_int.h"
#include "vp10/common/reconinter.h" #include "av1/common/reconinter.h"
#include "aom_dsp/vpx_dsp_common.h" #include "aom_dsp/vpx_dsp_common.h"
#include "aom_mem/vpx_mem.h" #include "aom_mem/vpx_mem.h"
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
#include "vp10/common/seg_common.h" #include "av1/common/seg_common.h"
// 64 bit masks for left transform size. Each 1 represents a position where // 64 bit masks for left transform size. Each 1 represents a position where
// we should apply a loop filter across the left border of an 8x8 block // we should apply a loop filter across the left border of an 8x8 block
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vp10/common/blockd.h" #include "av1/common/blockd.h"
#include "vp10/common/seg_common.h" #include "av1/common/seg_common.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
#include "./vpx_config.h" #include "./vpx_config.h"
#include "./vp10_rtcd.h" #include "./vp10_rtcd.h"
#include "vp10/common/common.h" #include "av1/common/common.h"
#include "vp10/common/blockd.h" #include "av1/common/blockd.h"
#include "vp10/common/idct.h" #include "av1/common/idct.h"
#include "aom_dsp/mips/inv_txfm_dspr2.h" #include "aom_dsp/mips/inv_txfm_dspr2.h"
#include "aom_dsp/txfm_common.h" #include "aom_dsp/txfm_common.h"
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
......
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
#include "./vpx_config.h" #include "./vpx_config.h"
#include "./vp10_rtcd.h" #include "./vp10_rtcd.h"
#include "vp10/common/common.h" #include "av1/common/common.h"
#include "vp10/common/blockd.h" #include "av1/common/blockd.h"
#include "vp10/common/idct.h" #include "av1/common/idct.h"
#include "aom_dsp/mips/inv_txfm_dspr2.h" #include "aom_dsp/mips/inv_txfm_dspr2.h"
#include "aom_dsp/txfm_common.h" #include "aom_dsp/txfm_common.h"
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include "./vpx_config.h" #include "./vpx_config.h"
#include "./vp10_rtcd.h" #include "./vp10_rtcd.h"
#include "vp10/common/common.h" #include "av1/common/common.h"
#include "vp10/common/blockd.h" #include "av1/common/blockd.h"
#include "aom_dsp/mips/inv_txfm_dspr2.h" #include "aom_dsp/mips/inv_txfm_dspr2.h"
#include "aom_dsp/txfm_common.h" #include "aom_dsp/txfm_common.h"
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <assert.h> #include <assert.h>
#include "vp10/common/enums.h" #include "av1/common/enums.h"
#include "aom_dsp/mips/inv_txfm_msa.h" #include "aom_dsp/mips/inv_txfm_msa.h"
void vp10_iht16x16_256_add_msa(const int16_t *input, uint8_t *dst, void vp10_iht16x16_256_add_msa(const int16_t *input, uint8_t *dst,
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <assert.h> #include <assert.h>
#include "vp10/common/enums.h" #include "av1/common/enums.h"
#include "aom_dsp/mips/inv_txfm_msa.h" #include "aom_dsp/mips/inv_txfm_msa.h"
void vp10_iht4x4_16_add_msa(const int16_t *input, uint8_t *dst, void vp10_iht4x4_16_add_msa(const int16_t *input, uint8_t *dst,
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <assert.h> #include <assert.h>
#include "vp10/common/enums.h" #include "av1/common/enums.h"
#include "aom_dsp/mips/inv_txfm_msa.h" #include "aom_dsp/mips/inv_txfm_msa.h"
void vp10_iht8x8_64_add_msa(const int16_t *input, uint8_t *dst, void vp10_iht8x8_64_add_msa(const int16_t *input, uint8_t *dst,
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "aom/vpx_integer.h" #include "aom/vpx_integer.h"
#include "vp10/common/common.h" #include "av1/common/common.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vp10/common/mvref_common.h" #include "av1/common/mvref_common.h"
// This function searches the neighbourhood of a given MB/SB // This function searches the neighbourhood of a given MB/SB
// to try and find candidate reference vectors. // to try and find candidate reference vectors.
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#ifndef VP10_COMMON_MVREF_COMMON_H_ #ifndef VP10_COMMON_MVREF_COMMON_H_
#define VP10_COMMON_MVREF_COMMON_H_ #define VP10_COMMON_MVREF_COMMON_H_
#include "vp10/common/onyxc_int.h" #include "av1/common/onyxc_int.h"
#include "vp10/common/blockd.h" #include "av1/common/blockd.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -22,7 +22,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ...@@ -22,7 +22,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
#include "vp10/common/odintrin.h" #include "av1/common/odintrin.h"
/*Constants for use with OD_DIVU_SMALL(). /*Constants for use with OD_DIVU_SMALL().
See \cite{Rob05} for details on computing these constants. See \cite{Rob05} for details on computing these constants.
......
#ifndef VP10_COMMON_ODINTRIN_H_ #ifndef VP10_COMMON_ODINTRIN_H_
#define VP10_COMMON_ODINTRIN_H_ #define VP10_COMMON_ODINTRIN_H_
#include "vp10/common/enums.h" #include "av1/common/enums.h"
#include "aom/vpx_integer.h" #include "aom/vpx_integer.h"
#include "aom_dsp/vpx_dsp_common.h" #include "aom_dsp/vpx_dsp_common.h"
#include "aom_ports/bitops.h" #include "aom_ports/bitops.h"
......
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
#include "aom/internal/vpx_codec_internal.h" #include "aom/internal/vpx_codec_internal.h"
#include "aom_util/vpx_thread.h" #include "aom_util/vpx_thread.h"
#include "./vp10_rtcd.h" #include "./vp10_rtcd.h"
#include "vp10/common/alloccommon.h" #include "av1/common/alloccommon.h"
#include "vp10/common/loopfilter.h" #include "av1/common/loopfilter.h"
#include "vp10/common/entropymv.h" #include "av1/common/entropymv.h"
#include "vp10/common/entropy.h" #include "av1/common/entropy.h"
#include "vp10/common/entropymode.h" #include "av1/common/entropymode.h"
#include "vp10/common/frame_buffers.h" #include "av1/common/frame_buffers.h"
#include "vp10/common/tile_common.h" #include "av1/common/tile_common.h"