vp10/ -> av1/ Change-Id: Ia055d03656ad1580447eced8687949583fdf4089
diff --git a/aom/src/svc_encodeframe.c b/aom/src/svc_encodeframe.c index 90fd194..6e6be8a 100644 --- a/aom/src/svc_encodeframe.c +++ b/aom/src/svc_encodeframe.c
@@ -26,7 +26,7 @@ #include "aom/vp8cx.h" #include "aom/vpx_encoder.h" #include "aom_mem/vpx_mem.h" -#include "vp10/common/onyxc_int.h" +#include "av1/common/onyxc_int.h" #ifdef __MINGW32__ #define strtok_r strtok_s
diff --git a/aom_scale/generic/yv12extend.c b/aom_scale/generic/yv12extend.c index 0479642..29bb111 100644 --- a/aom_scale/generic/yv12extend.c +++ b/aom_scale/generic/yv12extend.c
@@ -16,7 +16,7 @@ #include "aom_ports/mem.h" #include "aom_scale/yv12config.h" #if CONFIG_VPX_HIGHBITDEPTH -#include "vp10/common/common.h" +#include "av1/common/common.h" #endif static void extend_plane(uint8_t *const src, int src_stride, int width,
diff --git a/vp10/common/alloccommon.c b/av1/common/alloccommon.c similarity index 95% rename from vp10/common/alloccommon.c rename to av1/common/alloccommon.c index 636feac..d1735cd 100644 --- a/vp10/common/alloccommon.c +++ b/av1/common/alloccommon.c
@@ -11,11 +11,11 @@ #include "./vpx_config.h" #include "aom_mem/vpx_mem.h" -#include "vp10/common/alloccommon.h" -#include "vp10/common/blockd.h" -#include "vp10/common/entropymode.h" -#include "vp10/common/entropymv.h" -#include "vp10/common/onyxc_int.h" +#include "av1/common/alloccommon.h" +#include "av1/common/blockd.h" +#include "av1/common/entropymode.h" +#include "av1/common/entropymv.h" +#include "av1/common/onyxc_int.h" void vp10_set_mb_mi(VP10_COMMON *cm, int width, int height) { const int aligned_width = ALIGN_POWER_OF_TWO(width, MI_SIZE_LOG2);
diff --git a/vp10/common/alloccommon.h b/av1/common/alloccommon.h similarity index 100% rename from vp10/common/alloccommon.h rename to av1/common/alloccommon.h
diff --git a/vp10/common/arm/neon/iht4x4_add_neon.c b/av1/common/arm/neon/iht4x4_add_neon.c similarity index 99% rename from vp10/common/arm/neon/iht4x4_add_neon.c rename to av1/common/arm/neon/iht4x4_add_neon.c index d074bc9..600e66b 100644 --- a/vp10/common/arm/neon/iht4x4_add_neon.c +++ b/av1/common/arm/neon/iht4x4_add_neon.c
@@ -13,7 +13,7 @@ #include "./vp10_rtcd.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_2_9 = 0x26c9;
diff --git a/vp10/common/arm/neon/iht8x8_add_neon.c b/av1/common/arm/neon/iht8x8_add_neon.c similarity index 99% rename from vp10/common/arm/neon/iht8x8_add_neon.c rename to av1/common/arm/neon/iht8x8_add_neon.c index 7e1c83f..ff5578d 100644 --- a/vp10/common/arm/neon/iht8x8_add_neon.c +++ b/av1/common/arm/neon/iht8x8_add_neon.c
@@ -13,7 +13,7 @@ #include "./vp10_rtcd.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_4_64 = 16069;
diff --git a/vp10/common/blockd.c b/av1/common/blockd.c similarity index 99% rename from vp10/common/blockd.c rename to av1/common/blockd.c index 031ca1e..1936888 100644 --- a/vp10/common/blockd.c +++ b/av1/common/blockd.c
@@ -8,7 +8,7 @@ * 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, const MODE_INFO *left_mi, int b) {
diff --git a/vp10/common/blockd.h b/av1/common/blockd.h similarity index 96% rename from vp10/common/blockd.h rename to av1/common/blockd.h index 4bcd8df..9b5480a 100644 --- a/vp10/common/blockd.h +++ b/av1/common/blockd.h
@@ -17,16 +17,16 @@ #include "aom_ports/mem.h" #include "aom_scale/yv12config.h" -#include "vp10/common/common_data.h" -#include "vp10/common/entropy.h" -#include "vp10/common/entropymode.h" -#include "vp10/common/mv.h" +#include "av1/common/common_data.h" +#include "av1/common/entropy.h" +#include "av1/common/entropymode.h" +#include "av1/common/mv.h" #if CONFIG_AOM_QM -#include "vp10/common/quant_common.h" +#include "av1/common/quant_common.h" #endif -#include "vp10/common/scale.h" -#include "vp10/common/seg_common.h" -#include "vp10/common/tile_common.h" +#include "av1/common/scale.h" +#include "av1/common/seg_common.h" +#include "av1/common/tile_common.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/common/clpf.c b/av1/common/clpf.c similarity index 98% rename from vp10/common/clpf.c rename to av1/common/clpf.c index b5b41ff..9c69a6c 100644 --- a/vp10/common/clpf.c +++ b/av1/common/clpf.c
@@ -3,7 +3,7 @@ (Replace with proper AOM header) */ -#include "vp10/common/clpf.h" +#include "av1/common/clpf.h" // Apply the filter on a single block static void clpf_block(const uint8_t *src, uint8_t *dst, int sstride,
diff --git a/vp10/common/clpf.h b/av1/common/clpf.h similarity index 93% rename from vp10/common/clpf.h rename to av1/common/clpf.h index 1776a3d..5b9d55b 100644 --- a/vp10/common/clpf.h +++ b/av1/common/clpf.h
@@ -6,7 +6,7 @@ #ifndef VP10_COMMON_CLPF_H_ #define VP10_COMMON_CLPF_H_ -#include "vp10/common/reconinter.h" +#include "av1/common/reconinter.h" // Configuration #define CLPF_ALLOW_PIXEL_PARALLELISM \
diff --git a/vp10/common/common.h b/av1/common/common.h similarity index 100% rename from vp10/common/common.h rename to av1/common/common.h
diff --git a/vp10/common/common_data.h b/av1/common/common_data.h similarity index 99% rename from vp10/common/common_data.h rename to av1/common/common_data.h index cd499ec..6b26015 100644 --- a/vp10/common/common_data.h +++ b/av1/common/common_data.h
@@ -11,7 +11,7 @@ #ifndef 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_dsp/vpx_dsp_common.h"
diff --git a/vp10/common/debugmodes.c b/av1/common/debugmodes.c similarity index 97% rename from vp10/common/debugmodes.c rename to av1/common/debugmodes.c index 18bbbec..6c958a8 100644 --- a/vp10/common/debugmodes.c +++ b/av1/common/debugmodes.c
@@ -10,8 +10,8 @@ #include <stdio.h> -#include "vp10/common/blockd.h" -#include "vp10/common/onyxc_int.h" +#include "av1/common/blockd.h" +#include "av1/common/onyxc_int.h" static void log_frame_info(VP10_COMMON *cm, const char *str, FILE *f) { fprintf(f, "%s", str);
diff --git a/vp10/common/dering.c b/av1/common/dering.c similarity index 97% rename from vp10/common/dering.c rename to av1/common/dering.c index ad77e80..c22a434 100644 --- a/vp10/common/dering.c +++ b/av1/common/dering.c
@@ -13,10 +13,10 @@ #include "./vpx_scale_rtcd.h" #include "aom/vpx_integer.h" -#include "vp10/common/dering.h" -#include "vp10/common/onyxc_int.h" -#include "vp10/common/reconinter.h" -#include "vp10/common/od_dering.h" +#include "av1/common/dering.h" +#include "av1/common/onyxc_int.h" +#include "av1/common/reconinter.h" +#include "av1/common/od_dering.h" int compute_level_from_index(int global_level, int gi) {
diff --git a/vp10/common/dering.h b/av1/common/dering.h similarity index 92% rename from vp10/common/dering.h rename to av1/common/dering.h index 7c4dc3b..eefd0ae 100644 --- a/vp10/common/dering.h +++ b/av1/common/dering.h
@@ -1,8 +1,8 @@ #ifndef VP10_COMMON_DERING_H_ #define VP10_COMMON_DERING_H_ -#include "vp10/common/od_dering.h" -#include "vp10/common/onyxc_int.h" +#include "av1/common/od_dering.h" +#include "av1/common/onyxc_int.h" #include "aom/vpx_integer.h" #include "./vpx_config.h" #include "aom_ports/mem.h"
diff --git a/vp10/common/entropy.c b/av1/common/entropy.c similarity index 99% rename from vp10/common/entropy.c rename to av1/common/entropy.c index 7e96c0a..c4e023d 100644 --- a/vp10/common/entropy.c +++ b/av1/common/entropy.c
@@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp10/common/entropy.h" -#include "vp10/common/blockd.h" -#include "vp10/common/onyxc_int.h" -#include "vp10/common/entropymode.h" +#include "av1/common/entropy.h" +#include "av1/common/blockd.h" +#include "av1/common/onyxc_int.h" +#include "av1/common/entropymode.h" #include "aom_mem/vpx_mem.h" #include "aom/vpx_integer.h"
diff --git a/vp10/common/entropy.h b/av1/common/entropy.h similarity index 98% rename from vp10/common/entropy.h rename to av1/common/entropy.h index d72243b..42f30e4 100644 --- a/vp10/common/entropy.h +++ b/av1/common/entropy.h
@@ -14,8 +14,8 @@ #include "aom/vpx_integer.h" #include "aom_dsp/prob.h" -#include "vp10/common/common.h" -#include "vp10/common/enums.h" +#include "av1/common/common.h" +#include "av1/common/enums.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/common/entropymode.c b/av1/common/entropymode.c similarity index 99% rename from vp10/common/entropymode.c rename to av1/common/entropymode.c index 15c538d..b85bc41 100644 --- a/vp10/common/entropymode.c +++ b/av1/common/entropymode.c
@@ -10,8 +10,8 @@ #include "aom_mem/vpx_mem.h" -#include "vp10/common/onyxc_int.h" -#include "vp10/common/seg_common.h" +#include "av1/common/onyxc_int.h" +#include "av1/common/seg_common.h" const vpx_prob vp10_kf_y_mode_prob[INTRA_MODES][INTRA_MODES][INTRA_MODES - 1] = { {
diff --git a/vp10/common/entropymode.h b/av1/common/entropymode.h similarity index 96% rename from vp10/common/entropymode.h rename to av1/common/entropymode.h index b20f15e..3f8a125 100644 --- a/vp10/common/entropymode.h +++ b/av1/common/entropymode.h
@@ -11,10 +11,10 @@ #ifndef VP10_COMMON_ENTROPYMODE_H_ #define VP10_COMMON_ENTROPYMODE_H_ -#include "vp10/common/entropy.h" -#include "vp10/common/entropymv.h" -#include "vp10/common/filter.h" -#include "vp10/common/seg_common.h" +#include "av1/common/entropy.h" +#include "av1/common/entropymv.h" +#include "av1/common/filter.h" +#include "av1/common/seg_common.h" #include "aom_dsp/vpx_filter.h" #ifdef __cplusplus
diff --git a/vp10/common/entropymv.c b/av1/common/entropymv.c similarity index 98% rename from vp10/common/entropymv.c rename to av1/common/entropymv.c index a984241..5405a86 100644 --- a/vp10/common/entropymv.c +++ b/av1/common/entropymv.c
@@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp10/common/onyxc_int.h" -#include "vp10/common/entropymv.h" +#include "av1/common/onyxc_int.h" +#include "av1/common/entropymv.h" // Integer pel reference mv threshold for use of high-precision 1/8 mv #define COMPANDED_MVREF_THRESH 8
diff --git a/vp10/common/entropymv.h b/av1/common/entropymv.h similarity index 98% rename from vp10/common/entropymv.h rename to av1/common/entropymv.h index 5728164..57b9af0 100644 --- a/vp10/common/entropymv.h +++ b/av1/common/entropymv.h
@@ -15,7 +15,7 @@ #include "aom_dsp/prob.h" -#include "vp10/common/mv.h" +#include "av1/common/mv.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/common/enums.h b/av1/common/enums.h similarity index 100% rename from vp10/common/enums.h rename to av1/common/enums.h
diff --git a/vp10/common/filter.c b/av1/common/filter.c similarity index 98% rename from vp10/common/filter.c rename to av1/common/filter.c index 8597efc..197d026 100644 --- a/vp10/common/filter.c +++ b/av1/common/filter.c
@@ -10,7 +10,7 @@ #include <assert.h> -#include "vp10/common/filter.h" +#include "av1/common/filter.h" DECLARE_ALIGNED(256, static const InterpKernel, bilinear_filters[SUBPEL_SHIFTS]) = {
diff --git a/vp10/common/filter.h b/av1/common/filter.h similarity index 100% rename from vp10/common/filter.h rename to av1/common/filter.h
diff --git a/vp10/common/frame_buffers.c b/av1/common/frame_buffers.c similarity index 98% rename from vp10/common/frame_buffers.c rename to av1/common/frame_buffers.c index a683d32..5c736a9 100644 --- a/vp10/common/frame_buffers.c +++ b/av1/common/frame_buffers.c
@@ -10,7 +10,7 @@ #include <assert.h> -#include "vp10/common/frame_buffers.h" +#include "av1/common/frame_buffers.h" #include "aom_mem/vpx_mem.h" int vp10_alloc_internal_frame_buffers(InternalFrameBufferList *list) {
diff --git a/vp10/common/frame_buffers.h b/av1/common/frame_buffers.h similarity index 100% rename from vp10/common/frame_buffers.h rename to av1/common/frame_buffers.h
diff --git a/vp10/common/idct.c b/av1/common/idct.c similarity index 99% rename from vp10/common/idct.c rename to av1/common/idct.c index fbbce3d..d35a4d0 100644 --- a/vp10/common/idct.c +++ b/av1/common/idct.c
@@ -12,8 +12,8 @@ #include "./vp10_rtcd.h" #include "./vpx_dsp_rtcd.h" -#include "vp10/common/blockd.h" -#include "vp10/common/idct.h" +#include "av1/common/blockd.h" +#include "av1/common/idct.h" #include "aom_dsp/inv_txfm.h" #include "aom_ports/mem.h"
diff --git a/vp10/common/idct.h b/av1/common/idct.h similarity index 97% rename from vp10/common/idct.h rename to av1/common/idct.h index 3afa5f9..040458c 100644 --- a/vp10/common/idct.h +++ b/av1/common/idct.h
@@ -14,8 +14,8 @@ #include <assert.h> #include "./vpx_config.h" -#include "vp10/common/common.h" -#include "vp10/common/enums.h" +#include "av1/common/common.h" +#include "av1/common/enums.h" #include "aom_dsp/inv_txfm.h" #include "aom_dsp/txfm_common.h" #include "aom_ports/mem.h"
diff --git a/vp10/common/loopfilter.c b/av1/common/loopfilter.c similarity index 99% rename from vp10/common/loopfilter.c rename to av1/common/loopfilter.c index ae925cc..13b804e 100644 --- a/vp10/common/loopfilter.c +++ b/av1/common/loopfilter.c
@@ -10,14 +10,14 @@ #include "./vpx_config.h" #include "./vpx_dsp_rtcd.h" -#include "vp10/common/loopfilter.h" -#include "vp10/common/onyxc_int.h" -#include "vp10/common/reconinter.h" +#include "av1/common/loopfilter.h" +#include "av1/common/onyxc_int.h" +#include "av1/common/reconinter.h" #include "aom_dsp/vpx_dsp_common.h" #include "aom_mem/vpx_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 // we should apply a loop filter across the left border of an 8x8 block
diff --git a/vp10/common/loopfilter.h b/av1/common/loopfilter.h similarity index 98% rename from vp10/common/loopfilter.h rename to av1/common/loopfilter.h index e7218d2..f572384 100644 --- a/vp10/common/loopfilter.h +++ b/av1/common/loopfilter.h
@@ -14,8 +14,8 @@ #include "aom_ports/mem.h" #include "./vpx_config.h" -#include "vp10/common/blockd.h" -#include "vp10/common/seg_common.h" +#include "av1/common/blockd.h" +#include "av1/common/seg_common.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/common/mips/dspr2/itrans16_dspr2.c b/av1/common/mips/dspr2/itrans16_dspr2.c similarity index 96% rename from vp10/common/mips/dspr2/itrans16_dspr2.c rename to av1/common/mips/dspr2/itrans16_dspr2.c index f725610..c0b9b2a 100644 --- a/vp10/common/mips/dspr2/itrans16_dspr2.c +++ b/av1/common/mips/dspr2/itrans16_dspr2.c
@@ -13,9 +13,9 @@ #include "./vpx_config.h" #include "./vp10_rtcd.h" -#include "vp10/common/common.h" -#include "vp10/common/blockd.h" -#include "vp10/common/idct.h" +#include "av1/common/common.h" +#include "av1/common/blockd.h" +#include "av1/common/idct.h" #include "aom_dsp/mips/inv_txfm_dspr2.h" #include "aom_dsp/txfm_common.h" #include "aom_ports/mem.h"
diff --git a/vp10/common/mips/dspr2/itrans4_dspr2.c b/av1/common/mips/dspr2/itrans4_dspr2.c similarity index 96% rename from vp10/common/mips/dspr2/itrans4_dspr2.c rename to av1/common/mips/dspr2/itrans4_dspr2.c index 99705d3..dcb28c9 100644 --- a/vp10/common/mips/dspr2/itrans4_dspr2.c +++ b/av1/common/mips/dspr2/itrans4_dspr2.c
@@ -13,9 +13,9 @@ #include "./vpx_config.h" #include "./vp10_rtcd.h" -#include "vp10/common/common.h" -#include "vp10/common/blockd.h" -#include "vp10/common/idct.h" +#include "av1/common/common.h" +#include "av1/common/blockd.h" +#include "av1/common/idct.h" #include "aom_dsp/mips/inv_txfm_dspr2.h" #include "aom_dsp/txfm_common.h" #include "aom_ports/mem.h"
diff --git a/vp10/common/mips/dspr2/itrans8_dspr2.c b/av1/common/mips/dspr2/itrans8_dspr2.c similarity index 97% rename from vp10/common/mips/dspr2/itrans8_dspr2.c rename to av1/common/mips/dspr2/itrans8_dspr2.c index 835e2ea..761d6f0 100644 --- a/vp10/common/mips/dspr2/itrans8_dspr2.c +++ b/av1/common/mips/dspr2/itrans8_dspr2.c
@@ -13,8 +13,8 @@ #include "./vpx_config.h" #include "./vp10_rtcd.h" -#include "vp10/common/common.h" -#include "vp10/common/blockd.h" +#include "av1/common/common.h" +#include "av1/common/blockd.h" #include "aom_dsp/mips/inv_txfm_dspr2.h" #include "aom_dsp/txfm_common.h" #include "aom_ports/mem.h"
diff --git a/vp10/common/mips/msa/idct16x16_msa.c b/av1/common/mips/msa/idct16x16_msa.c similarity index 98% rename from vp10/common/mips/msa/idct16x16_msa.c rename to av1/common/mips/msa/idct16x16_msa.c index bed3fde..baa3a97 100644 --- a/vp10/common/mips/msa/idct16x16_msa.c +++ b/av1/common/mips/msa/idct16x16_msa.c
@@ -10,7 +10,7 @@ #include <assert.h> -#include "vp10/common/enums.h" +#include "av1/common/enums.h" #include "aom_dsp/mips/inv_txfm_msa.h" void vp10_iht16x16_256_add_msa(const int16_t *input, uint8_t *dst,
diff --git a/vp10/common/mips/msa/idct4x4_msa.c b/av1/common/mips/msa/idct4x4_msa.c similarity index 98% rename from vp10/common/mips/msa/idct4x4_msa.c rename to av1/common/mips/msa/idct4x4_msa.c index b396722..0620df7 100644 --- a/vp10/common/mips/msa/idct4x4_msa.c +++ b/av1/common/mips/msa/idct4x4_msa.c
@@ -10,7 +10,7 @@ #include <assert.h> -#include "vp10/common/enums.h" +#include "av1/common/enums.h" #include "aom_dsp/mips/inv_txfm_msa.h" void vp10_iht4x4_16_add_msa(const int16_t *input, uint8_t *dst,
diff --git a/vp10/common/mips/msa/idct8x8_msa.c b/av1/common/mips/msa/idct8x8_msa.c similarity index 98% rename from vp10/common/mips/msa/idct8x8_msa.c rename to av1/common/mips/msa/idct8x8_msa.c index 231de6a..5c62c4a 100644 --- a/vp10/common/mips/msa/idct8x8_msa.c +++ b/av1/common/mips/msa/idct8x8_msa.c
@@ -10,7 +10,7 @@ #include <assert.h> -#include "vp10/common/enums.h" +#include "av1/common/enums.h" #include "aom_dsp/mips/inv_txfm_msa.h" void vp10_iht8x8_64_add_msa(const int16_t *input, uint8_t *dst,
diff --git a/vp10/common/mv.h b/av1/common/mv.h similarity index 97% rename from vp10/common/mv.h rename to av1/common/mv.h index f7c2848..0f4ac4a 100644 --- a/vp10/common/mv.h +++ b/av1/common/mv.h
@@ -13,7 +13,7 @@ #include "aom/vpx_integer.h" -#include "vp10/common/common.h" +#include "av1/common/common.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/common/mvref_common.c b/av1/common/mvref_common.c similarity index 99% rename from vp10/common/mvref_common.c rename to av1/common/mvref_common.c index 198bbf5..b632b54 100644 --- a/vp10/common/mvref_common.c +++ b/av1/common/mvref_common.c
@@ -9,7 +9,7 @@ * 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 // to try and find candidate reference vectors.
diff --git a/vp10/common/mvref_common.h b/av1/common/mvref_common.h similarity index 98% rename from vp10/common/mvref_common.h rename to av1/common/mvref_common.h index 44e4bb5..a2e984d 100644 --- a/vp10/common/mvref_common.h +++ b/av1/common/mvref_common.h
@@ -10,8 +10,8 @@ #ifndef VP10_COMMON_MVREF_COMMON_H_ #define VP10_COMMON_MVREF_COMMON_H_ -#include "vp10/common/onyxc_int.h" -#include "vp10/common/blockd.h" +#include "av1/common/onyxc_int.h" +#include "av1/common/blockd.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/common/od_dering.c b/av1/common/od_dering.c similarity index 100% rename from vp10/common/od_dering.c rename to av1/common/od_dering.c
diff --git a/vp10/common/od_dering.h b/av1/common/od_dering.h similarity index 100% rename from vp10/common/od_dering.h rename to av1/common/od_dering.h
diff --git a/vp10/common/odintrin.c b/av1/common/odintrin.c similarity index 99% rename from vp10/common/odintrin.c rename to av1/common/odintrin.c index ca9a5fc..a87bda0 100644 --- a/vp10/common/odintrin.c +++ b/av1/common/odintrin.c
@@ -22,7 +22,7 @@ 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.*/ -#include "vp10/common/odintrin.h" +#include "av1/common/odintrin.h" /*Constants for use with OD_DIVU_SMALL(). See \cite{Rob05} for details on computing these constants.
diff --git a/vp10/common/odintrin.h b/av1/common/odintrin.h similarity index 97% rename from vp10/common/odintrin.h rename to av1/common/odintrin.h index c07816f..89bc41d 100644 --- a/vp10/common/odintrin.h +++ b/av1/common/odintrin.h
@@ -1,7 +1,7 @@ #ifndef 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_dsp/vpx_dsp_common.h" #include "aom_ports/bitops.h"
diff --git a/vp10/common/onyxc_int.h b/av1/common/onyxc_int.h similarity index 98% rename from vp10/common/onyxc_int.h rename to av1/common/onyxc_int.h index e80c7ed..0031022 100644 --- a/vp10/common/onyxc_int.h +++ b/av1/common/onyxc_int.h
@@ -15,13 +15,13 @@ #include "aom/internal/vpx_codec_internal.h" #include "aom_util/vpx_thread.h" #include "./vp10_rtcd.h" -#include "vp10/common/alloccommon.h" -#include "vp10/common/loopfilter.h" -#include "vp10/common/entropymv.h" -#include "vp10/common/entropy.h" -#include "vp10/common/entropymode.h" -#include "vp10/common/frame_buffers.h" -#include "vp10/common/tile_common.h" +#include "av1/common/alloccommon.h" +#include "av1/common/loopfilter.h" +#include "av1/common/entropymv.h" +#include "av1/common/entropy.h" +#include "av1/common/entropymode.h" +#include "av1/common/frame_buffers.h" +#include "av1/common/tile_common.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/common/pred_common.c b/av1/common/pred_common.c similarity index 98% rename from vp10/common/pred_common.c rename to av1/common/pred_common.c index b3a4531..67c7464 100644 --- a/vp10/common/pred_common.c +++ b/av1/common/pred_common.c
@@ -9,9 +9,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp10/common/common.h" -#include "vp10/common/pred_common.h" -#include "vp10/common/seg_common.h" +#include "av1/common/common.h" +#include "av1/common/pred_common.h" +#include "av1/common/seg_common.h" // Returns a context number for the given MB prediction signal int vp10_get_pred_context_switchable_interp(const MACROBLOCKD *xd) {
diff --git a/vp10/common/pred_common.h b/av1/common/pred_common.h similarity index 98% rename from vp10/common/pred_common.h rename to av1/common/pred_common.h index dbaf456..e5e5292 100644 --- a/vp10/common/pred_common.h +++ b/av1/common/pred_common.h
@@ -11,8 +11,8 @@ #ifndef VP10_COMMON_PRED_COMMON_H_ #define VP10_COMMON_PRED_COMMON_H_ -#include "vp10/common/blockd.h" -#include "vp10/common/onyxc_int.h" +#include "av1/common/blockd.h" +#include "av1/common/onyxc_int.h" #include "aom_dsp/vpx_dsp_common.h" #ifdef __cplusplus
diff --git a/vp10/common/quant_common.c b/av1/common/quant_common.c similarity index 99% rename from vp10/common/quant_common.c rename to av1/common/quant_common.c index f993dd2..c17d17e 100644 --- a/vp10/common/quant_common.c +++ b/av1/common/quant_common.c
@@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp10/common/common.h" -#include "vp10/common/onyxc_int.h" -#include "vp10/common/quant_common.h" -#include "vp10/common/seg_common.h" +#include "av1/common/common.h" +#include "av1/common/onyxc_int.h" +#include "av1/common/quant_common.h" +#include "av1/common/seg_common.h" #if CONFIG_AOM_QM static void make_qmatrices(qm_val_t* wmatrix[NUM_QM_LEVELS][2][2][TX_SIZES],
diff --git a/vp10/common/quant_common.h b/av1/common/quant_common.h similarity index 96% rename from vp10/common/quant_common.h rename to av1/common/quant_common.h index 65b484e..a2e7c05 100644 --- a/vp10/common/quant_common.h +++ b/av1/common/quant_common.h
@@ -12,8 +12,8 @@ #define VP10_COMMON_QUANT_COMMON_H_ #include "aom/vpx_codec.h" -#include "vp10/common/seg_common.h" -#include "vp10/common/enums.h" +#include "av1/common/seg_common.h" +#include "av1/common/enums.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/common/reconinter.c b/av1/common/reconinter.c similarity index 98% rename from vp10/common/reconinter.c rename to av1/common/reconinter.c index aceca16..0a13a1f 100644 --- a/vp10/common/reconinter.c +++ b/av1/common/reconinter.c
@@ -15,9 +15,9 @@ #include "aom/vpx_integer.h" -#include "vp10/common/blockd.h" -#include "vp10/common/reconinter.h" -#include "vp10/common/reconintra.h" +#include "av1/common/blockd.h" +#include "av1/common/reconinter.h" +#include "av1/common/reconintra.h" #if CONFIG_VPX_HIGHBITDEPTH void vp10_highbd_build_inter_predictor(
diff --git a/vp10/common/reconinter.h b/av1/common/reconinter.h similarity index 98% rename from vp10/common/reconinter.h rename to av1/common/reconinter.h index b7b981e..03beedd 100644 --- a/vp10/common/reconinter.h +++ b/av1/common/reconinter.h
@@ -11,8 +11,8 @@ #ifndef VP10_COMMON_RECONINTER_H_ #define VP10_COMMON_RECONINTER_H_ -#include "vp10/common/filter.h" -#include "vp10/common/onyxc_int.h" +#include "av1/common/filter.h" +#include "av1/common/onyxc_int.h" #include "aom/vpx_integer.h" #include "aom_dsp/vpx_filter.h"
diff --git a/vp10/common/reconintra.c b/av1/common/reconintra.c similarity index 99% rename from vp10/common/reconintra.c rename to av1/common/reconintra.c index 6adafb0..d2195fe 100644 --- a/vp10/common/reconintra.c +++ b/av1/common/reconintra.c
@@ -18,8 +18,8 @@ #include "aom_ports/mem.h" #include "aom_ports/vpx_once.h" -#include "vp10/common/reconintra.h" -#include "vp10/common/onyxc_int.h" +#include "av1/common/reconintra.h" +#include "av1/common/onyxc_int.h" #if CONFIG_MISC_FIXES enum {
diff --git a/vp10/common/reconintra.h b/av1/common/reconintra.h similarity index 96% rename from vp10/common/reconintra.h rename to av1/common/reconintra.h index 76eb0f6..5c00a6a 100644 --- a/vp10/common/reconintra.h +++ b/av1/common/reconintra.h
@@ -12,7 +12,7 @@ #define VP10_COMMON_RECONINTRA_H_ #include "aom/vpx_integer.h" -#include "vp10/common/blockd.h" +#include "av1/common/blockd.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/common/scale.c b/av1/common/scale.c similarity index 98% rename from vp10/common/scale.c rename to av1/common/scale.c index 4fb8a87..e011a95 100644 --- a/vp10/common/scale.c +++ b/av1/common/scale.c
@@ -9,8 +9,8 @@ */ #include "./vpx_dsp_rtcd.h" -#include "vp10/common/filter.h" -#include "vp10/common/scale.h" +#include "av1/common/filter.h" +#include "av1/common/scale.h" #include "aom_dsp/vpx_filter.h" static INLINE int scaled_x(int val, const struct scale_factors *sf) {
diff --git a/vp10/common/scale.h b/av1/common/scale.h similarity index 98% rename from vp10/common/scale.h rename to av1/common/scale.h index 43ba730..ea53f35 100644 --- a/vp10/common/scale.h +++ b/av1/common/scale.h
@@ -11,7 +11,7 @@ #ifndef VP10_COMMON_SCALE_H_ #define VP10_COMMON_SCALE_H_ -#include "vp10/common/mv.h" +#include "av1/common/mv.h" #include "aom_dsp/vpx_convolve.h" #ifdef __cplusplus
diff --git a/vp10/common/scan.c b/av1/common/scan.c similarity index 99% rename from vp10/common/scan.c rename to av1/common/scan.c index f11ac8d..c61a057 100644 --- a/vp10/common/scan.c +++ b/av1/common/scan.c
@@ -10,7 +10,7 @@ #include <assert.h> -#include "vp10/common/scan.h" +#include "av1/common/scan.h" DECLARE_ALIGNED(16, static const int16_t, default_scan_4x4[16]) = { 0, 4, 1, 5, 8, 2, 12, 9, 3, 6, 13, 10, 7, 14, 11, 15,
diff --git a/vp10/common/scan.h b/av1/common/scan.h similarity index 95% rename from vp10/common/scan.h rename to av1/common/scan.h index 1804662..8dd35a5 100644 --- a/vp10/common/scan.h +++ b/av1/common/scan.h
@@ -14,8 +14,8 @@ #include "aom/vpx_integer.h" #include "aom_ports/mem.h" -#include "vp10/common/enums.h" -#include "vp10/common/blockd.h" +#include "av1/common/enums.h" +#include "av1/common/blockd.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/common/seg_common.c b/av1/common/seg_common.c similarity index 93% rename from vp10/common/seg_common.c rename to av1/common/seg_common.c index 7e5dcc2..f131c7b 100644 --- a/vp10/common/seg_common.c +++ b/av1/common/seg_common.c
@@ -10,10 +10,10 @@ #include <assert.h> -#include "vp10/common/blockd.h" -#include "vp10/common/loopfilter.h" -#include "vp10/common/seg_common.h" -#include "vp10/common/quant_common.h" +#include "av1/common/blockd.h" +#include "av1/common/loopfilter.h" +#include "av1/common/seg_common.h" +#include "av1/common/quant_common.h" static const int seg_feature_data_signed[SEG_LVL_MAX] = { 1, 1, 0, 0 };
diff --git a/vp10/common/seg_common.h b/av1/common/seg_common.h similarity index 100% rename from vp10/common/seg_common.h rename to av1/common/seg_common.h
diff --git a/vp10/common/thread_common.c b/av1/common/thread_common.c similarity index 98% rename from vp10/common/thread_common.c rename to av1/common/thread_common.c index d7b33de..667777a 100644 --- a/vp10/common/thread_common.c +++ b/av1/common/thread_common.c
@@ -11,10 +11,10 @@ #include "./vpx_config.h" #include "aom_dsp/vpx_dsp_common.h" #include "aom_mem/vpx_mem.h" -#include "vp10/common/entropymode.h" -#include "vp10/common/thread_common.h" -#include "vp10/common/reconinter.h" -#include "vp10/common/loopfilter.h" +#include "av1/common/entropymode.h" +#include "av1/common/thread_common.h" +#include "av1/common/reconinter.h" +#include "av1/common/loopfilter.h" #if CONFIG_MULTITHREAD static INLINE void mutex_lock(pthread_mutex_t *const mutex) {
diff --git a/vp10/common/thread_common.h b/av1/common/thread_common.h similarity index 98% rename from vp10/common/thread_common.h rename to av1/common/thread_common.h index 9f813ee..3e098f5 100644 --- a/vp10/common/thread_common.h +++ b/av1/common/thread_common.h
@@ -11,7 +11,7 @@ #ifndef VP10_COMMON_LOOPFILTER_THREAD_H_ #define VP10_COMMON_LOOPFILTER_THREAD_H_ #include "./vpx_config.h" -#include "vp10/common/loopfilter.h" +#include "av1/common/loopfilter.h" #include "aom_util/vpx_thread.h" #ifdef __cplusplus
diff --git a/vp10/common/tile_common.c b/av1/common/tile_common.c similarity index 96% rename from vp10/common/tile_common.c rename to av1/common/tile_common.c index 53df678..fde5a2b 100644 --- a/vp10/common/tile_common.c +++ b/av1/common/tile_common.c
@@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp10/common/tile_common.h" -#include "vp10/common/onyxc_int.h" +#include "av1/common/tile_common.h" +#include "av1/common/onyxc_int.h" #include "aom_dsp/vpx_dsp_common.h" #define MIN_TILE_WIDTH_B64 4
diff --git a/vp10/common/tile_common.h b/av1/common/tile_common.h similarity index 100% rename from vp10/common/tile_common.h rename to av1/common/tile_common.h
diff --git a/vp10/common/vp10_fwd_txfm.c b/av1/common/vp10_fwd_txfm.c similarity index 99% rename from vp10/common/vp10_fwd_txfm.c rename to av1/common/vp10_fwd_txfm.c index 8ec2316..f02c55f 100644 --- a/vp10/common/vp10_fwd_txfm.c +++ b/av1/common/vp10_fwd_txfm.c
@@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp10/common/vp10_fwd_txfm.h" +#include "av1/common/vp10_fwd_txfm.h" void vp10_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride) { // The 2D transform is done with two passes which are actually pretty
diff --git a/vp10/common/vp10_fwd_txfm.h b/av1/common/vp10_fwd_txfm.h similarity index 100% rename from vp10/common/vp10_fwd_txfm.h rename to av1/common/vp10_fwd_txfm.h
diff --git a/vp10/common/vp10_inv_txfm.c b/av1/common/vp10_inv_txfm.c similarity index 99% rename from vp10/common/vp10_inv_txfm.c rename to av1/common/vp10_inv_txfm.c index cd5eea3..8e1e614 100644 --- a/vp10/common/vp10_inv_txfm.c +++ b/av1/common/vp10_inv_txfm.c
@@ -12,7 +12,7 @@ #include <math.h> #include <string.h> -#include "vp10/common/vp10_inv_txfm.h" +#include "av1/common/vp10_inv_txfm.h" void vp10_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,
diff --git a/vp10/common/vp10_inv_txfm.h b/av1/common/vp10_inv_txfm.h similarity index 100% rename from vp10/common/vp10_inv_txfm.h rename to av1/common/vp10_inv_txfm.h
diff --git a/vp10/common/vp10_rtcd.c b/av1/common/vp10_rtcd.c similarity index 100% rename from vp10/common/vp10_rtcd.c rename to av1/common/vp10_rtcd.c
diff --git a/vp10/common/vp10_rtcd_defs.pl b/av1/common/vp10_rtcd_defs.pl similarity index 99% rename from vp10/common/vp10_rtcd_defs.pl rename to av1/common/vp10_rtcd_defs.pl index 82239c3..7582b07 100644 --- a/vp10/common/vp10_rtcd_defs.pl +++ b/av1/common/vp10_rtcd_defs.pl
@@ -5,8 +5,8 @@ */ #include "aom/vpx_integer.h" -#include "vp10/common/common.h" -#include "vp10/common/enums.h" +#include "av1/common/common.h" +#include "av1/common/enums.h" struct macroblockd;
diff --git a/vp10/common/x86/idct_intrin_sse2.c b/av1/common/x86/idct_intrin_sse2.c similarity index 100% rename from vp10/common/x86/idct_intrin_sse2.c rename to av1/common/x86/idct_intrin_sse2.c
diff --git a/vp10/common/x86/vp10_fwd_dct32x32_impl_sse2.h b/av1/common/x86/vp10_fwd_dct32x32_impl_sse2.h similarity index 99% rename from vp10/common/x86/vp10_fwd_dct32x32_impl_sse2.h rename to av1/common/x86/vp10_fwd_dct32x32_impl_sse2.h index c5fb2c3..e7d63fe 100644 --- a/vp10/common/x86/vp10_fwd_dct32x32_impl_sse2.h +++ b/av1/common/x86/vp10_fwd_dct32x32_impl_sse2.h
@@ -11,7 +11,7 @@ #include <emmintrin.h> // SSE2 #include "./vp10_rtcd.h" -#include "vp10/common/vp10_fwd_txfm.h" +#include "av1/common/vp10_fwd_txfm.h" #include "aom_dsp/txfm_common.h" #include "aom_dsp/x86/txfm_common_sse2.h" @@ -3146,7 +3146,7 @@ tr2_6 = _mm_sub_epi16(tr2_6, tr2_6_0); tr2_7 = _mm_sub_epi16(tr2_7, tr2_7_0); // ... and here. - // PS: also change code in vp10/encoder/dct.c + // PS: also change code in av1/encoder/dct.c tr2_0 = _mm_add_epi16(tr2_0, kOne); tr2_1 = _mm_add_epi16(tr2_1, kOne); tr2_2 = _mm_add_epi16(tr2_2, kOne);
diff --git a/vp10/common/x86/vp10_fwd_txfm_impl_sse2.h b/av1/common/x86/vp10_fwd_txfm_impl_sse2.h similarity index 100% rename from vp10/common/x86/vp10_fwd_txfm_impl_sse2.h rename to av1/common/x86/vp10_fwd_txfm_impl_sse2.h
diff --git a/vp10/common/x86/vp10_fwd_txfm_sse2.c b/av1/common/x86/vp10_fwd_txfm_sse2.c similarity index 95% rename from vp10/common/x86/vp10_fwd_txfm_sse2.c rename to av1/common/x86/vp10_fwd_txfm_sse2.c index f22fda6..2b8ed9d 100644 --- a/vp10/common/x86/vp10_fwd_txfm_sse2.c +++ b/av1/common/x86/vp10_fwd_txfm_sse2.c
@@ -228,20 +228,20 @@ #define FDCT4x4_2D vp10_fdct4x4_sse2 #define FDCT8x8_2D vp10_fdct8x8_sse2 #define FDCT16x16_2D vp10_fdct16x16_sse2 -#include "vp10/common/x86/vp10_fwd_txfm_impl_sse2.h" +#include "av1/common/x86/vp10_fwd_txfm_impl_sse2.h" #undef FDCT4x4_2D #undef FDCT8x8_2D #undef FDCT16x16_2D #define FDCT32x32_2D vp10_fdct32x32_rd_sse2 #define FDCT32x32_HIGH_PRECISION 0 -#include "vp10/common/x86/vp10_fwd_dct32x32_impl_sse2.h" +#include "av1/common/x86/vp10_fwd_dct32x32_impl_sse2.h" #undef FDCT32x32_2D #undef FDCT32x32_HIGH_PRECISION #define FDCT32x32_2D vp10_fdct32x32_sse2 #define FDCT32x32_HIGH_PRECISION 1 -#include "vp10/common/x86/vp10_fwd_dct32x32_impl_sse2.h" // NOLINT +#include "av1/common/x86/vp10_fwd_dct32x32_impl_sse2.h" // NOLINT #undef FDCT32x32_2D #undef FDCT32x32_HIGH_PRECISION #undef DCT_HIGH_BIT_DEPTH @@ -251,20 +251,20 @@ #define FDCT4x4_2D vp10_highbd_fdct4x4_sse2 #define FDCT8x8_2D vp10_highbd_fdct8x8_sse2 #define FDCT16x16_2D vp10_highbd_fdct16x16_sse2 -#include "vp10/common/x86/vp10_fwd_txfm_impl_sse2.h" // NOLINT +#include "av1/common/x86/vp10_fwd_txfm_impl_sse2.h" // NOLINT #undef FDCT4x4_2D #undef FDCT8x8_2D #undef FDCT16x16_2D #define FDCT32x32_2D vp10_highbd_fdct32x32_rd_sse2 #define FDCT32x32_HIGH_PRECISION 0 -#include "vp10/common/x86/vp10_fwd_dct32x32_impl_sse2.h" // NOLINT +#include "av1/common/x86/vp10_fwd_dct32x32_impl_sse2.h" // NOLINT #undef FDCT32x32_2D #undef FDCT32x32_HIGH_PRECISION #define FDCT32x32_2D vp10_highbd_fdct32x32_sse2 #define FDCT32x32_HIGH_PRECISION 1 -#include "vp10/common/x86/vp10_fwd_dct32x32_impl_sse2.h" // NOLINT +#include "av1/common/x86/vp10_fwd_dct32x32_impl_sse2.h" // NOLINT #undef FDCT32x32_2D #undef FDCT32x32_HIGH_PRECISION #undef DCT_HIGH_BIT_DEPTH
diff --git a/vp10/common/x86/vp10_inv_txfm_sse2.c b/av1/common/x86/vp10_inv_txfm_sse2.c similarity index 99% rename from vp10/common/x86/vp10_inv_txfm_sse2.c rename to av1/common/x86/vp10_inv_txfm_sse2.c index 870d082..9abaa64 100644 --- a/vp10/common/x86/vp10_inv_txfm_sse2.c +++ b/av1/common/x86/vp10_inv_txfm_sse2.c
@@ -9,7 +9,7 @@ */ #include "./vp10_rtcd.h" -#include "vp10/common/x86/vp10_inv_txfm_sse2.h" +#include "av1/common/x86/vp10_inv_txfm_sse2.h" #include "aom_dsp/x86/txfm_common_sse2.h" #define RECON_AND_STORE4X4(dest, in_x) \
diff --git a/vp10/common/x86/vp10_inv_txfm_sse2.h b/av1/common/x86/vp10_inv_txfm_sse2.h similarity index 99% rename from vp10/common/x86/vp10_inv_txfm_sse2.h rename to av1/common/x86/vp10_inv_txfm_sse2.h index bf84db86..0839ab9 100644 --- a/vp10/common/x86/vp10_inv_txfm_sse2.h +++ b/av1/common/x86/vp10_inv_txfm_sse2.h
@@ -14,7 +14,7 @@ #include <emmintrin.h> // SSE2 #include "./vpx_config.h" #include "aom/vpx_integer.h" -#include "vp10/common/vp10_inv_txfm.h" +#include "av1/common/vp10_inv_txfm.h" // perform 8x8 transpose static INLINE void array_transpose_8x8(__m128i *in, __m128i *res) {
diff --git a/vp10/decoder/decodeframe.c b/av1/decoder/decodeframe.c similarity index 98% rename from vp10/decoder/decodeframe.c rename to av1/decoder/decodeframe.c index 55bfe77..0c44d42 100644 --- a/vp10/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c
@@ -25,30 +25,30 @@ #include "aom_scale/vpx_scale.h" #include "aom_util/vpx_thread.h" -#include "vp10/common/alloccommon.h" +#include "av1/common/alloccommon.h" #if CONFIG_CLPF -#include "vp10/common/clpf.h" +#include "av1/common/clpf.h" #endif -#include "vp10/common/common.h" +#include "av1/common/common.h" #if CONFIG_DERING -#include "vp10/common/dering.h" +#include "av1/common/dering.h" #endif // CONFIG_DERING -#include "vp10/common/entropy.h" -#include "vp10/common/entropymode.h" -#include "vp10/common/idct.h" -#include "vp10/common/thread_common.h" -#include "vp10/common/pred_common.h" -#include "vp10/common/quant_common.h" -#include "vp10/common/reconintra.h" -#include "vp10/common/reconinter.h" -#include "vp10/common/seg_common.h" -#include "vp10/common/tile_common.h" +#include "av1/common/entropy.h" +#include "av1/common/entropymode.h" +#include "av1/common/idct.h" +#include "av1/common/thread_common.h" +#include "av1/common/pred_common.h" +#include "av1/common/quant_common.h" +#include "av1/common/reconintra.h" +#include "av1/common/reconinter.h" +#include "av1/common/seg_common.h" +#include "av1/common/tile_common.h" -#include "vp10/decoder/decodeframe.h" -#include "vp10/decoder/detokenize.h" -#include "vp10/decoder/decodemv.h" -#include "vp10/decoder/decoder.h" -#include "vp10/decoder/dsubexp.h" +#include "av1/decoder/decodeframe.h" +#include "av1/decoder/detokenize.h" +#include "av1/decoder/decodemv.h" +#include "av1/decoder/decoder.h" +#include "av1/decoder/dsubexp.h" #define MAX_VP10_HEADER_SIZE 80
diff --git a/vp10/decoder/decodeframe.h b/av1/decoder/decodeframe.h similarity index 100% rename from vp10/decoder/decodeframe.h rename to av1/decoder/decodeframe.h
diff --git a/vp10/decoder/decodemv.c b/av1/decoder/decodemv.c similarity index 98% rename from vp10/decoder/decodemv.c rename to av1/decoder/decodemv.c index 94fc8ae..eade851 100644 --- a/vp10/decoder/decodemv.c +++ b/av1/decoder/decodemv.c
@@ -10,17 +10,17 @@ #include <assert.h> -#include "vp10/common/common.h" -#include "vp10/common/entropy.h" -#include "vp10/common/entropymode.h" -#include "vp10/common/entropymv.h" -#include "vp10/common/mvref_common.h" -#include "vp10/common/pred_common.h" -#include "vp10/common/reconinter.h" -#include "vp10/common/seg_common.h" +#include "av1/common/common.h" +#include "av1/common/entropy.h" +#include "av1/common/entropymode.h" +#include "av1/common/entropymv.h" +#include "av1/common/mvref_common.h" +#include "av1/common/pred_common.h" +#include "av1/common/reconinter.h" +#include "av1/common/seg_common.h" -#include "vp10/decoder/decodemv.h" -#include "vp10/decoder/decodeframe.h" +#include "av1/decoder/decodemv.h" +#include "av1/decoder/decodeframe.h" #include "aom_dsp/vpx_dsp_common.h"
diff --git a/vp10/decoder/decodemv.h b/av1/decoder/decodemv.h similarity index 95% rename from vp10/decoder/decodemv.h rename to av1/decoder/decodemv.h index e11c1a6..0962f97 100644 --- a/vp10/decoder/decodemv.h +++ b/av1/decoder/decodemv.h
@@ -13,7 +13,7 @@ #include "aom_dsp/bitreader.h" -#include "vp10/decoder/decoder.h" +#include "av1/decoder/decoder.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/decoder/decoder.c b/av1/decoder/decoder.c similarity index 97% rename from vp10/decoder/decoder.c rename to av1/decoder/decoder.c index e40e864..644dac0 100644 --- a/vp10/decoder/decoder.c +++ b/av1/decoder/decoder.c
@@ -23,15 +23,15 @@ #include "aom_scale/vpx_scale.h" #include "aom_util/vpx_thread.h" -#include "vp10/common/alloccommon.h" -#include "vp10/common/loopfilter.h" -#include "vp10/common/onyxc_int.h" -#include "vp10/common/quant_common.h" -#include "vp10/common/reconintra.h" +#include "av1/common/alloccommon.h" +#include "av1/common/loopfilter.h" +#include "av1/common/onyxc_int.h" +#include "av1/common/quant_common.h" +#include "av1/common/reconintra.h" -#include "vp10/decoder/decodeframe.h" -#include "vp10/decoder/decoder.h" -#include "vp10/decoder/detokenize.h" +#include "av1/decoder/decodeframe.h" +#include "av1/decoder/decoder.h" +#include "av1/decoder/detokenize.h" static void initialize_dec(void) { static volatile int init_done = 0;
diff --git a/vp10/decoder/decoder.h b/av1/decoder/decoder.h similarity index 97% rename from vp10/decoder/decoder.h rename to av1/decoder/decoder.h index 9852cfc..d03d4d0 100644 --- a/vp10/decoder/decoder.h +++ b/av1/decoder/decoder.h
@@ -18,9 +18,9 @@ #include "aom_scale/yv12config.h" #include "aom_util/vpx_thread.h" -#include "vp10/common/thread_common.h" -#include "vp10/common/onyxc_int.h" -#include "vp10/decoder/dthread.h" +#include "av1/common/thread_common.h" +#include "av1/common/onyxc_int.h" +#include "av1/decoder/dthread.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/decoder/detokenize.c b/av1/decoder/detokenize.c similarity index 97% rename from vp10/decoder/detokenize.c rename to av1/decoder/detokenize.c index d491fbc..3fab40f 100644 --- a/vp10/decoder/detokenize.c +++ b/av1/decoder/detokenize.c
@@ -11,14 +11,14 @@ #include "aom_mem/vpx_mem.h" #include "aom_ports/mem.h" -#include "vp10/common/blockd.h" -#include "vp10/common/common.h" -#include "vp10/common/entropy.h" +#include "av1/common/blockd.h" +#include "av1/common/common.h" +#include "av1/common/entropy.h" #if CONFIG_COEFFICIENT_RANGE_CHECKING -#include "vp10/common/idct.h" +#include "av1/common/idct.h" #endif -#include "vp10/decoder/detokenize.h" +#include "av1/decoder/detokenize.h" #define EOB_CONTEXT_NODE 0 #define ZERO_CONTEXT_NODE 1
diff --git a/vp10/decoder/detokenize.h b/av1/decoder/detokenize.h similarity index 92% rename from vp10/decoder/detokenize.h rename to av1/decoder/detokenize.h index cc8c5ee..9a21438 100644 --- a/vp10/decoder/detokenize.h +++ b/av1/decoder/detokenize.h
@@ -12,8 +12,8 @@ #define VP10_DECODER_DETOKENIZE_H_ #include "aom_dsp/bitreader.h" -#include "vp10/decoder/decoder.h" -#include "vp10/common/scan.h" +#include "av1/decoder/decoder.h" +#include "av1/common/scan.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/decoder/dsubexp.c b/av1/decoder/dsubexp.c similarity index 97% rename from vp10/decoder/dsubexp.c rename to av1/decoder/dsubexp.c index 4e1ccc0..bb0ed7f 100644 --- a/vp10/decoder/dsubexp.c +++ b/av1/decoder/dsubexp.c
@@ -10,9 +10,9 @@ #include <assert.h> -#include "vp10/common/entropy.h" +#include "av1/common/entropy.h" -#include "vp10/decoder/dsubexp.h" +#include "av1/decoder/dsubexp.h" static int inv_recenter_nonneg(int v, int m) { if (v > 2 * m) return v;
diff --git a/vp10/decoder/dsubexp.h b/av1/decoder/dsubexp.h similarity index 100% rename from vp10/decoder/dsubexp.h rename to av1/decoder/dsubexp.h
diff --git a/vp10/decoder/dthread.c b/av1/decoder/dthread.c similarity index 98% rename from vp10/decoder/dthread.c rename to av1/decoder/dthread.c index b0b16ba..76209ac 100644 --- a/vp10/decoder/dthread.c +++ b/av1/decoder/dthread.c
@@ -10,9 +10,9 @@ #include "./vpx_config.h" #include "aom_mem/vpx_mem.h" -#include "vp10/common/reconinter.h" -#include "vp10/decoder/dthread.h" -#include "vp10/decoder/decoder.h" +#include "av1/common/reconinter.h" +#include "av1/decoder/dthread.h" +#include "av1/decoder/decoder.h" // #define DEBUG_THREAD
diff --git a/vp10/decoder/dthread.h b/av1/decoder/dthread.h similarity index 100% rename from vp10/decoder/dthread.h rename to av1/decoder/dthread.h
diff --git a/vp10/encoder/aq_complexity.c b/av1/encoder/aq_complexity.c similarity index 96% rename from vp10/encoder/aq_complexity.c rename to av1/encoder/aq_complexity.c index 291c73b..14e3da1 100644 --- a/vp10/encoder/aq_complexity.c +++ b/av1/encoder/aq_complexity.c
@@ -11,11 +11,11 @@ #include <limits.h> #include <math.h> -#include "vp10/encoder/aq_complexity.h" -#include "vp10/encoder/aq_variance.h" -#include "vp10/encoder/encodeframe.h" -#include "vp10/common/seg_common.h" -#include "vp10/encoder/segmentation.h" +#include "av1/encoder/aq_complexity.h" +#include "av1/encoder/aq_variance.h" +#include "av1/encoder/encodeframe.h" +#include "av1/common/seg_common.h" +#include "av1/encoder/segmentation.h" #include "aom_dsp/vpx_dsp_common.h" #include "aom_ports/system_state.h"
diff --git a/vp10/encoder/aq_complexity.h b/av1/encoder/aq_complexity.h similarity index 96% rename from vp10/encoder/aq_complexity.h rename to av1/encoder/aq_complexity.h index 5ed461b..db85406 100644 --- a/vp10/encoder/aq_complexity.h +++ b/av1/encoder/aq_complexity.h
@@ -15,7 +15,7 @@ extern "C" { #endif -#include "vp10/common/enums.h" +#include "av1/common/enums.h" struct VP10_COMP; struct macroblock;
diff --git a/vp10/encoder/aq_cyclicrefresh.c b/av1/encoder/aq_cyclicrefresh.c similarity index 99% rename from vp10/encoder/aq_cyclicrefresh.c rename to av1/encoder/aq_cyclicrefresh.c index 19bd288..40391cb 100644 --- a/vp10/encoder/aq_cyclicrefresh.c +++ b/av1/encoder/aq_cyclicrefresh.c
@@ -11,10 +11,10 @@ #include <limits.h> #include <math.h> -#include "vp10/common/seg_common.h" -#include "vp10/encoder/aq_cyclicrefresh.h" -#include "vp10/encoder/ratectrl.h" -#include "vp10/encoder/segmentation.h" +#include "av1/common/seg_common.h" +#include "av1/encoder/aq_cyclicrefresh.h" +#include "av1/encoder/ratectrl.h" +#include "av1/encoder/segmentation.h" #include "aom_dsp/vpx_dsp_common.h" #include "aom_ports/system_state.h"
diff --git a/vp10/encoder/aq_cyclicrefresh.h b/av1/encoder/aq_cyclicrefresh.h similarity index 98% rename from vp10/encoder/aq_cyclicrefresh.h rename to av1/encoder/aq_cyclicrefresh.h index 649d714..24491fc 100644 --- a/vp10/encoder/aq_cyclicrefresh.h +++ b/av1/encoder/aq_cyclicrefresh.h
@@ -11,7 +11,7 @@ #ifndef VP10_ENCODER_AQ_CYCLICREFRESH_H_ #define VP10_ENCODER_AQ_CYCLICREFRESH_H_ -#include "vp10/common/blockd.h" +#include "av1/common/blockd.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/aq_variance.c b/av1/encoder/aq_variance.c similarity index 97% rename from vp10/encoder/aq_variance.c rename to av1/encoder/aq_variance.c index c9713eb..85a43db 100644 --- a/vp10/encoder/aq_variance.c +++ b/av1/encoder/aq_variance.c
@@ -12,12 +12,12 @@ #include "aom_ports/mem.h" -#include "vp10/encoder/aq_variance.h" +#include "av1/encoder/aq_variance.h" -#include "vp10/common/seg_common.h" -#include "vp10/encoder/ratectrl.h" -#include "vp10/encoder/rd.h" -#include "vp10/encoder/segmentation.h" +#include "av1/common/seg_common.h" +#include "av1/encoder/ratectrl.h" +#include "av1/encoder/rd.h" +#include "av1/encoder/segmentation.h" #include "aom_ports/system_state.h" #define ENERGY_MIN (-4)
diff --git a/vp10/encoder/aq_variance.h b/av1/encoder/aq_variance.h similarity index 95% rename from vp10/encoder/aq_variance.h rename to av1/encoder/aq_variance.h index cfb5b86..a30a449 100644 --- a/vp10/encoder/aq_variance.h +++ b/av1/encoder/aq_variance.h
@@ -11,7 +11,7 @@ #ifndef VP10_ENCODER_AQ_VARIANCE_H_ #define VP10_ENCODER_AQ_VARIANCE_H_ -#include "vp10/encoder/encoder.h" +#include "av1/encoder/encoder.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/arm/neon/dct_neon.c b/av1/encoder/arm/neon/dct_neon.c similarity index 97% rename from vp10/encoder/arm/neon/dct_neon.c rename to av1/encoder/arm/neon/dct_neon.c index f7fab55..f9b9cb8 100644 --- a/vp10/encoder/arm/neon/dct_neon.c +++ b/av1/encoder/arm/neon/dct_neon.c
@@ -14,7 +14,7 @@ #include "./vpx_config.h" #include "./vpx_dsp_rtcd.h" -#include "vp10/common/blockd.h" +#include "av1/common/blockd.h" #include "aom_dsp/txfm_common.h" void vp10_fdct8x8_quant_neon(
diff --git a/vp10/encoder/arm/neon/error_neon.c b/av1/encoder/arm/neon/error_neon.c similarity index 100% rename from vp10/encoder/arm/neon/error_neon.c rename to av1/encoder/arm/neon/error_neon.c
diff --git a/vp10/encoder/arm/neon/quantize_neon.c b/av1/encoder/arm/neon/quantize_neon.c similarity index 96% rename from vp10/encoder/arm/neon/quantize_neon.c rename to av1/encoder/arm/neon/quantize_neon.c index c765aff..db85b4d 100644 --- a/vp10/encoder/arm/neon/quantize_neon.c +++ b/av1/encoder/arm/neon/quantize_neon.c
@@ -14,12 +14,12 @@ #include "aom_mem/vpx_mem.h" -#include "vp10/common/quant_common.h" -#include "vp10/common/seg_common.h" +#include "av1/common/quant_common.h" +#include "av1/common/seg_common.h" -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/quantize.h" -#include "vp10/encoder/rd.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/quantize.h" +#include "av1/encoder/rd.h" void vp10_quantize_fp_neon(const int16_t *coeff_ptr, intptr_t count, int skip_block, const int16_t *zbin_ptr,
diff --git a/vp10/encoder/bitstream.c b/av1/encoder/bitstream.c similarity index 98% rename from vp10/encoder/bitstream.c rename to av1/encoder/bitstream.c index 41e61c4..49ba305 100644 --- a/vp10/encoder/bitstream.c +++ b/av1/encoder/bitstream.c
@@ -20,26 +20,26 @@ #include "aom_ports/system_state.h" #if CONFIG_CLPF -#include "vp10/common/clpf.h" +#include "av1/common/clpf.h" #endif #if CONFIG_DERING -#include "vp10/common/dering.h" +#include "av1/common/dering.h" #endif // CONFIG_DERING -#include "vp10/common/entropy.h" -#include "vp10/common/entropymode.h" -#include "vp10/common/entropymv.h" -#include "vp10/common/mvref_common.h" -#include "vp10/common/pred_common.h" -#include "vp10/common/seg_common.h" -#include "vp10/common/tile_common.h" +#include "av1/common/entropy.h" +#include "av1/common/entropymode.h" +#include "av1/common/entropymv.h" +#include "av1/common/mvref_common.h" +#include "av1/common/pred_common.h" +#include "av1/common/seg_common.h" +#include "av1/common/tile_common.h" -#include "vp10/encoder/cost.h" -#include "vp10/encoder/bitstream.h" -#include "vp10/encoder/encodemv.h" -#include "vp10/encoder/mcomp.h" -#include "vp10/encoder/segmentation.h" -#include "vp10/encoder/subexp.h" -#include "vp10/encoder/tokenize.h" +#include "av1/encoder/cost.h" +#include "av1/encoder/bitstream.h" +#include "av1/encoder/encodemv.h" +#include "av1/encoder/mcomp.h" +#include "av1/encoder/segmentation.h" +#include "av1/encoder/subexp.h" +#include "av1/encoder/tokenize.h" static const struct vp10_token intra_mode_encodings[INTRA_MODES] = { { 0, 1 }, { 6, 3 }, { 28, 5 }, { 30, 5 }, { 58, 6 },
diff --git a/vp10/encoder/bitstream.h b/av1/encoder/bitstream.h similarity index 95% rename from vp10/encoder/bitstream.h rename to av1/encoder/bitstream.h index ab692e8..4d50071 100644 --- a/vp10/encoder/bitstream.h +++ b/av1/encoder/bitstream.h
@@ -15,7 +15,7 @@ extern "C" { #endif -#include "vp10/encoder/encoder.h" +#include "av1/encoder/encoder.h" void vp10_encode_token_init(); void vp10_pack_bitstream(VP10_COMP *const cpi, uint8_t *dest, size_t *size);
diff --git a/vp10/encoder/block.h b/av1/encoder/block.h similarity index 97% rename from vp10/encoder/block.h rename to av1/encoder/block.h index 00181ad..53b7b80 100644 --- a/vp10/encoder/block.h +++ b/av1/encoder/block.h
@@ -11,8 +11,8 @@ #ifndef VP10_ENCODER_BLOCK_H_ #define VP10_ENCODER_BLOCK_H_ -#include "vp10/common/entropymv.h" -#include "vp10/common/entropy.h" +#include "av1/common/entropymv.h" +#include "av1/common/entropy.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/blockiness.c b/av1/encoder/blockiness.c similarity index 98% rename from vp10/encoder/blockiness.c rename to av1/encoder/blockiness.c index e5e0661..97e201a 100644 --- a/vp10/encoder/blockiness.c +++ b/av1/encoder/blockiness.c
@@ -11,8 +11,8 @@ #include "./vp10_rtcd.h" #include "./vpx_config.h" #include "./vpx_dsp_rtcd.h" -#include "vp10/common/common.h" -#include "vp10/common/filter.h" +#include "av1/common/common.h" +#include "av1/common/filter.h" #include "aom/vpx_integer.h" #include "aom_dsp/vpx_convolve.h" #include "aom_dsp/vpx_filter.h"
diff --git a/vp10/encoder/context_tree.c b/av1/encoder/context_tree.c similarity index 98% rename from vp10/encoder/context_tree.c rename to av1/encoder/context_tree.c index 07ae254..5b762f1 100644 --- a/vp10/encoder/context_tree.c +++ b/av1/encoder/context_tree.c
@@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp10/encoder/context_tree.h" -#include "vp10/encoder/encoder.h" +#include "av1/encoder/context_tree.h" +#include "av1/encoder/encoder.h" static const BLOCK_SIZE square[] = { BLOCK_8X8, BLOCK_16X16, BLOCK_32X32, BLOCK_64X64,
diff --git a/vp10/encoder/context_tree.h b/av1/encoder/context_tree.h similarity index 97% rename from vp10/encoder/context_tree.h rename to av1/encoder/context_tree.h index 0983133..5e74a0a 100644 --- a/vp10/encoder/context_tree.h +++ b/av1/encoder/context_tree.h
@@ -11,8 +11,8 @@ #ifndef VP10_ENCODER_CONTEXT_TREE_H_ #define VP10_ENCODER_CONTEXT_TREE_H_ -#include "vp10/common/blockd.h" -#include "vp10/encoder/block.h" +#include "av1/common/blockd.h" +#include "av1/encoder/block.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/cost.c b/av1/encoder/cost.c similarity index 98% rename from vp10/encoder/cost.c rename to av1/encoder/cost.c index 66d4078..e934a73 100644 --- a/vp10/encoder/cost.c +++ b/av1/encoder/cost.c
@@ -9,7 +9,7 @@ */ #include <assert.h> -#include "vp10/encoder/cost.h" +#include "av1/encoder/cost.h" /* round(-log2(i/256.) * (1 << VP9_PROB_COST_SHIFT)) Begins and ends with a bogus entry to satisfy use of prob=0 in the firstpass.
diff --git a/vp10/encoder/cost.h b/av1/encoder/cost.h similarity index 100% rename from vp10/encoder/cost.h rename to av1/encoder/cost.h
diff --git a/vp10/encoder/dct.c b/av1/encoder/dct.c similarity index 99% rename from vp10/encoder/dct.c rename to av1/encoder/dct.c index 9ac5ca1..0302291 100644 --- a/vp10/encoder/dct.c +++ b/av1/encoder/dct.c
@@ -15,8 +15,8 @@ #include "./vpx_config.h" #include "./vpx_dsp_rtcd.h" -#include "vp10/common/blockd.h" -#include "vp10/common/idct.h" +#include "av1/common/blockd.h" +#include "av1/common/idct.h" #include "aom_dsp/fwd_txfm.h" #include "aom_ports/mem.h"
diff --git a/vp10/encoder/encodeframe.c b/av1/encoder/encodeframe.c similarity index 98% rename from vp10/encoder/encodeframe.c rename to av1/encoder/encodeframe.c index 7b0b3b0..9805944 100644 --- a/vp10/encoder/encodeframe.c +++ b/av1/encoder/encodeframe.c
@@ -21,30 +21,30 @@ #include "aom_ports/vpx_timer.h" #include "aom_ports/system_state.h" -#include "vp10/common/common.h" -#include "vp10/common/entropy.h" -#include "vp10/common/entropymode.h" -#include "vp10/common/idct.h" -#include "vp10/common/mvref_common.h" -#include "vp10/common/pred_common.h" -#include "vp10/common/quant_common.h" -#include "vp10/common/reconintra.h" -#include "vp10/common/reconinter.h" -#include "vp10/common/seg_common.h" -#include "vp10/common/tile_common.h" +#include "av1/common/common.h" +#include "av1/common/entropy.h" +#include "av1/common/entropymode.h" +#include "av1/common/idct.h" +#include "av1/common/mvref_common.h" +#include "av1/common/pred_common.h" +#include "av1/common/quant_common.h" +#include "av1/common/reconintra.h" +#include "av1/common/reconinter.h" +#include "av1/common/seg_common.h" +#include "av1/common/tile_common.h" -#include "vp10/encoder/aq_complexity.h" -#include "vp10/encoder/aq_cyclicrefresh.h" -#include "vp10/encoder/aq_variance.h" -#include "vp10/encoder/encodeframe.h" -#include "vp10/encoder/encodemb.h" -#include "vp10/encoder/encodemv.h" -#include "vp10/encoder/ethread.h" -#include "vp10/encoder/extend.h" -#include "vp10/encoder/rd.h" -#include "vp10/encoder/rdopt.h" -#include "vp10/encoder/segmentation.h" -#include "vp10/encoder/tokenize.h" +#include "av1/encoder/aq_complexity.h" +#include "av1/encoder/aq_cyclicrefresh.h" +#include "av1/encoder/aq_variance.h" +#include "av1/encoder/encodeframe.h" +#include "av1/encoder/encodemb.h" +#include "av1/encoder/encodemv.h" +#include "av1/encoder/ethread.h" +#include "av1/encoder/extend.h" +#include "av1/encoder/rd.h" +#include "av1/encoder/rdopt.h" +#include "av1/encoder/segmentation.h" +#include "av1/encoder/tokenize.h" static void encode_superblock(VP10_COMP *cpi, ThreadData *td, TOKENEXTRA **t, int output_enabled, int mi_row, int mi_col,
diff --git a/vp10/encoder/encodeframe.h b/av1/encoder/encodeframe.h similarity index 100% rename from vp10/encoder/encodeframe.h rename to av1/encoder/encodeframe.h
diff --git a/vp10/encoder/encodemb.c b/av1/encoder/encodemb.c similarity index 99% rename from vp10/encoder/encodemb.c rename to av1/encoder/encodemb.c index fde2110..853629a 100644 --- a/vp10/encoder/encodemb.c +++ b/av1/encoder/encodemb.c
@@ -16,14 +16,14 @@ #include "aom_mem/vpx_mem.h" #include "aom_ports/mem.h" -#include "vp10/common/idct.h" -#include "vp10/common/reconinter.h" -#include "vp10/common/reconintra.h" -#include "vp10/common/scan.h" +#include "av1/common/idct.h" +#include "av1/common/reconinter.h" +#include "av1/common/reconintra.h" +#include "av1/common/scan.h" -#include "vp10/encoder/encodemb.h" -#include "vp10/encoder/rd.h" -#include "vp10/encoder/tokenize.h" +#include "av1/encoder/encodemb.h" +#include "av1/encoder/rd.h" +#include "av1/encoder/tokenize.h" struct optimize_ctx { ENTROPY_CONTEXT ta[MAX_MB_PLANE][16];
diff --git a/vp10/encoder/encodemb.h b/av1/encoder/encodemb.h similarity index 98% rename from vp10/encoder/encodemb.h rename to av1/encoder/encodemb.h index 4d1c826..2faec3d 100644 --- a/vp10/encoder/encodemb.h +++ b/av1/encoder/encodemb.h
@@ -12,7 +12,7 @@ #define VP10_ENCODER_ENCODEMB_H_ #include "./vpx_config.h" -#include "vp10/encoder/block.h" +#include "av1/encoder/block.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/encodemv.c b/av1/encoder/encodemv.c similarity index 97% rename from vp10/encoder/encodemv.c rename to av1/encoder/encodemv.c index 539b90f..41f4049 100644 --- a/vp10/encoder/encodemv.c +++ b/av1/encoder/encodemv.c
@@ -10,12 +10,12 @@ #include <math.h> -#include "vp10/common/common.h" -#include "vp10/common/entropymode.h" +#include "av1/common/common.h" +#include "av1/common/entropymode.h" -#include "vp10/encoder/cost.h" -#include "vp10/encoder/encodemv.h" -#include "vp10/encoder/subexp.h" +#include "av1/encoder/cost.h" +#include "av1/encoder/encodemv.h" +#include "av1/encoder/subexp.h" #include "aom_dsp/vpx_dsp_common.h"
diff --git a/vp10/encoder/encodemv.h b/av1/encoder/encodemv.h similarity index 96% rename from vp10/encoder/encodemv.h rename to av1/encoder/encodemv.h index 6187488..dfcfffc 100644 --- a/vp10/encoder/encodemv.h +++ b/av1/encoder/encodemv.h
@@ -11,7 +11,7 @@ #ifndef VP10_ENCODER_ENCODEMV_H_ #define VP10_ENCODER_ENCODEMV_H_ -#include "vp10/encoder/encoder.h" +#include "av1/encoder/encoder.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/encoder.c b/av1/encoder/encoder.c similarity index 99% rename from vp10/encoder/encoder.c rename to av1/encoder/encoder.c index c3ffbdb..107345a 100644 --- a/vp10/encoder/encoder.c +++ b/av1/encoder/encoder.c
@@ -14,38 +14,38 @@ #include "./vpx_config.h" -#include "vp10/common/alloccommon.h" +#include "av1/common/alloccommon.h" #if CONFIG_CLPF -#include "vp10/common/clpf.h" +#include "av1/common/clpf.h" #endif #if CONFIG_DERING -#include "vp10/common/dering.h" +#include "av1/common/dering.h" #endif // CONFIG_DERING -#include "vp10/common/filter.h" -#include "vp10/common/idct.h" -#include "vp10/common/reconinter.h" -#include "vp10/common/reconintra.h" -#include "vp10/common/tile_common.h" +#include "av1/common/filter.h" +#include "av1/common/idct.h" +#include "av1/common/reconinter.h" +#include "av1/common/reconintra.h" +#include "av1/common/tile_common.h" -#include "vp10/encoder/aq_complexity.h" -#include "vp10/encoder/aq_cyclicrefresh.h" -#include "vp10/encoder/aq_variance.h" -#include "vp10/encoder/bitstream.h" -#include "vp10/encoder/context_tree.h" -#include "vp10/encoder/encodeframe.h" -#include "vp10/encoder/encodemv.h" -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/ethread.h" -#include "vp10/encoder/firstpass.h" -#include "vp10/encoder/mbgraph.h" -#include "vp10/encoder/picklpf.h" -#include "vp10/encoder/ratectrl.h" -#include "vp10/encoder/rd.h" -#include "vp10/encoder/resize.h" -#include "vp10/encoder/segmentation.h" -#include "vp10/encoder/skin_detection.h" -#include "vp10/encoder/speed_features.h" -#include "vp10/encoder/temporal_filter.h" +#include "av1/encoder/aq_complexity.h" +#include "av1/encoder/aq_cyclicrefresh.h" +#include "av1/encoder/aq_variance.h" +#include "av1/encoder/bitstream.h" +#include "av1/encoder/context_tree.h" +#include "av1/encoder/encodeframe.h" +#include "av1/encoder/encodemv.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/ethread.h" +#include "av1/encoder/firstpass.h" +#include "av1/encoder/mbgraph.h" +#include "av1/encoder/picklpf.h" +#include "av1/encoder/ratectrl.h" +#include "av1/encoder/rd.h" +#include "av1/encoder/resize.h" +#include "av1/encoder/segmentation.h" +#include "av1/encoder/skin_detection.h" +#include "av1/encoder/speed_features.h" +#include "av1/encoder/temporal_filter.h" #include "./vp10_rtcd.h" #include "./vpx_dsp_rtcd.h"
diff --git a/vp10/encoder/encoder.h b/av1/encoder/encoder.h similarity index 96% rename from vp10/encoder/encoder.h rename to av1/encoder/encoder.h index 0fb589d..181e243 100644 --- a/vp10/encoder/encoder.h +++ b/av1/encoder/encoder.h
@@ -16,23 +16,23 @@ #include "./vpx_config.h" #include "aom/vp8cx.h" -#include "vp10/common/alloccommon.h" -#include "vp10/common/entropymode.h" -#include "vp10/common/thread_common.h" -#include "vp10/common/onyxc_int.h" +#include "av1/common/alloccommon.h" +#include "av1/common/entropymode.h" +#include "av1/common/thread_common.h" +#include "av1/common/onyxc_int.h" -#include "vp10/encoder/aq_cyclicrefresh.h" -#include "vp10/encoder/context_tree.h" -#include "vp10/encoder/encodemb.h" -#include "vp10/encoder/firstpass.h" -#include "vp10/encoder/lookahead.h" -#include "vp10/encoder/mbgraph.h" -#include "vp10/encoder/mcomp.h" -#include "vp10/encoder/quantize.h" -#include "vp10/encoder/ratectrl.h" -#include "vp10/encoder/rd.h" -#include "vp10/encoder/speed_features.h" -#include "vp10/encoder/tokenize.h" +#include "av1/encoder/aq_cyclicrefresh.h" +#include "av1/encoder/context_tree.h" +#include "av1/encoder/encodemb.h" +#include "av1/encoder/firstpass.h" +#include "av1/encoder/lookahead.h" +#include "av1/encoder/mbgraph.h" +#include "av1/encoder/mcomp.h" +#include "av1/encoder/quantize.h" +#include "av1/encoder/ratectrl.h" +#include "av1/encoder/rd.h" +#include "av1/encoder/speed_features.h" +#include "av1/encoder/tokenize.h" #if CONFIG_INTERNAL_STATS #include "aom_dsp/ssim.h"
diff --git a/vp10/encoder/ethread.c b/av1/encoder/ethread.c similarity index 97% rename from vp10/encoder/ethread.c rename to av1/encoder/ethread.c index c57ba56..4117f2b 100644 --- a/vp10/encoder/ethread.c +++ b/av1/encoder/ethread.c
@@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp10/encoder/encodeframe.h" -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/ethread.h" +#include "av1/encoder/encodeframe.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/ethread.h" #include "aom_dsp/vpx_dsp_common.h" static void accumulate_rd_opt(ThreadData *td, ThreadData *td_t) {
diff --git a/vp10/encoder/ethread.h b/av1/encoder/ethread.h similarity index 100% rename from vp10/encoder/ethread.h rename to av1/encoder/ethread.h
diff --git a/vp10/encoder/extend.c b/av1/encoder/extend.c similarity index 98% rename from vp10/encoder/extend.c rename to av1/encoder/extend.c index b3a3224..b0e20f0 100644 --- a/vp10/encoder/extend.c +++ b/av1/encoder/extend.c
@@ -12,8 +12,8 @@ #include "aom_mem/vpx_mem.h" #include "aom_ports/mem.h" -#include "vp10/common/common.h" -#include "vp10/encoder/extend.h" +#include "av1/common/common.h" +#include "av1/encoder/extend.h" static void copy_and_extend_plane(const uint8_t *src, int src_pitch, uint8_t *dst, int dst_pitch, int w, int h,
diff --git a/vp10/encoder/extend.h b/av1/encoder/extend.h similarity index 100% rename from vp10/encoder/extend.h rename to av1/encoder/extend.h
diff --git a/vp10/encoder/firstpass.c b/av1/encoder/firstpass.c similarity index 99% rename from vp10/encoder/firstpass.c rename to av1/encoder/firstpass.c index b40d672..b89acfd 100644 --- a/vp10/encoder/firstpass.c +++ b/av1/encoder/firstpass.c
@@ -22,20 +22,20 @@ #include "aom_scale/vpx_scale.h" #include "aom_scale/yv12config.h" -#include "vp10/common/entropymv.h" -#include "vp10/common/quant_common.h" -#include "vp10/common/reconinter.h" // vp10_setup_dst_planes() -#include "vp10/encoder/aq_variance.h" -#include "vp10/encoder/block.h" -#include "vp10/encoder/encodeframe.h" -#include "vp10/encoder/encodemb.h" -#include "vp10/encoder/encodemv.h" -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/extend.h" -#include "vp10/encoder/firstpass.h" -#include "vp10/encoder/mcomp.h" -#include "vp10/encoder/quantize.h" -#include "vp10/encoder/rd.h" +#include "av1/common/entropymv.h" +#include "av1/common/quant_common.h" +#include "av1/common/reconinter.h" // vp10_setup_dst_planes() +#include "av1/encoder/aq_variance.h" +#include "av1/encoder/block.h" +#include "av1/encoder/encodeframe.h" +#include "av1/encoder/encodemb.h" +#include "av1/encoder/encodemv.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/extend.h" +#include "av1/encoder/firstpass.h" +#include "av1/encoder/mcomp.h" +#include "av1/encoder/quantize.h" +#include "av1/encoder/rd.h" #include "aom_dsp/variance.h" #define OUTPUT_FPF 0
diff --git a/vp10/encoder/firstpass.h b/av1/encoder/firstpass.h similarity index 98% rename from vp10/encoder/firstpass.h rename to av1/encoder/firstpass.h index 2fbd3f7..c08c285 100644 --- a/vp10/encoder/firstpass.h +++ b/av1/encoder/firstpass.h
@@ -11,8 +11,8 @@ #ifndef VP10_ENCODER_FIRSTPASS_H_ #define VP10_ENCODER_FIRSTPASS_H_ -#include "vp10/encoder/lookahead.h" -#include "vp10/encoder/ratectrl.h" +#include "av1/encoder/lookahead.h" +#include "av1/encoder/ratectrl.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/lookahead.c b/av1/encoder/lookahead.c similarity index 97% rename from vp10/encoder/lookahead.c rename to av1/encoder/lookahead.c index 145a4b0..3f62c98 100644 --- a/vp10/encoder/lookahead.c +++ b/av1/encoder/lookahead.c
@@ -12,11 +12,11 @@ #include "./vpx_config.h" -#include "vp10/common/common.h" +#include "av1/common/common.h" -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/extend.h" -#include "vp10/encoder/lookahead.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/extend.h" +#include "av1/encoder/lookahead.h" /* Return the buffer at the given absolute index and increment the index */ static struct lookahead_entry *pop(struct lookahead_ctx *ctx,
diff --git a/vp10/encoder/lookahead.h b/av1/encoder/lookahead.h similarity index 100% rename from vp10/encoder/lookahead.h rename to av1/encoder/lookahead.h
diff --git a/vp10/encoder/mbgraph.c b/av1/encoder/mbgraph.c similarity index 98% rename from vp10/encoder/mbgraph.c rename to av1/encoder/mbgraph.c index 2909ac8..278875b 100644 --- a/vp10/encoder/mbgraph.c +++ b/av1/encoder/mbgraph.c
@@ -16,11 +16,11 @@ #include "aom_dsp/vpx_dsp_common.h" #include "aom_mem/vpx_mem.h" #include "aom_ports/system_state.h" -#include "vp10/encoder/segmentation.h" -#include "vp10/encoder/mcomp.h" -#include "vp10/common/blockd.h" -#include "vp10/common/reconinter.h" -#include "vp10/common/reconintra.h" +#include "av1/encoder/segmentation.h" +#include "av1/encoder/mcomp.h" +#include "av1/common/blockd.h" +#include "av1/common/reconinter.h" +#include "av1/common/reconintra.h" static unsigned int do_16x16_motion_iteration(VP10_COMP *cpi, const MV *ref_mv, MV *dst_mv, int mb_row,
diff --git a/vp10/encoder/mbgraph.h b/av1/encoder/mbgraph.h similarity index 100% rename from vp10/encoder/mbgraph.h rename to av1/encoder/mbgraph.h
diff --git a/vp10/encoder/mcomp.c b/av1/encoder/mcomp.c similarity index 99% rename from vp10/encoder/mcomp.c rename to av1/encoder/mcomp.c index 93f6a5e..3b57ed1 100644 --- a/vp10/encoder/mcomp.c +++ b/av1/encoder/mcomp.c
@@ -19,11 +19,11 @@ #include "aom_mem/vpx_mem.h" #include "aom_ports/mem.h" -#include "vp10/common/common.h" -#include "vp10/common/reconinter.h" +#include "av1/common/common.h" +#include "av1/common/reconinter.h" -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/mcomp.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/mcomp.h" // #define NEW_DIAMOND_SEARCH
diff --git a/vp10/encoder/mcomp.h b/av1/encoder/mcomp.h similarity index 99% rename from vp10/encoder/mcomp.h rename to av1/encoder/mcomp.h index 00717c7..c112061 100644 --- a/vp10/encoder/mcomp.h +++ b/av1/encoder/mcomp.h
@@ -11,7 +11,7 @@ #ifndef VP10_ENCODER_MCOMP_H_ #define VP10_ENCODER_MCOMP_H_ -#include "vp10/encoder/block.h" +#include "av1/encoder/block.h" #include "aom_dsp/variance.h" #ifdef __cplusplus
diff --git a/vp10/encoder/mips/msa/error_msa.c b/av1/encoder/mips/msa/error_msa.c similarity index 100% rename from vp10/encoder/mips/msa/error_msa.c rename to av1/encoder/mips/msa/error_msa.c
diff --git a/vp10/encoder/mips/msa/fdct16x16_msa.c b/av1/encoder/mips/msa/fdct16x16_msa.c similarity index 99% rename from vp10/encoder/mips/msa/fdct16x16_msa.c rename to av1/encoder/mips/msa/fdct16x16_msa.c index 195250c..cda2138 100644 --- a/vp10/encoder/mips/msa/fdct16x16_msa.c +++ b/av1/encoder/mips/msa/fdct16x16_msa.c
@@ -10,8 +10,8 @@ #include <assert.h> -#include "vp10/common/enums.h" -#include "vp10/encoder/mips/msa/fdct_msa.h" +#include "av1/common/enums.h" +#include "av1/encoder/mips/msa/fdct_msa.h" #include "aom_dsp/mips/fwd_txfm_msa.h" static void fadst16_cols_step1_msa(const int16_t *input, int32_t stride,
diff --git a/vp10/encoder/mips/msa/fdct4x4_msa.c b/av1/encoder/mips/msa/fdct4x4_msa.c similarity index 97% rename from vp10/encoder/mips/msa/fdct4x4_msa.c rename to av1/encoder/mips/msa/fdct4x4_msa.c index def9b45..a3731c3 100644 --- a/vp10/encoder/mips/msa/fdct4x4_msa.c +++ b/av1/encoder/mips/msa/fdct4x4_msa.c
@@ -10,8 +10,8 @@ #include <assert.h> -#include "vp10/common/enums.h" -#include "vp10/encoder/mips/msa/fdct_msa.h" +#include "av1/common/enums.h" +#include "av1/encoder/mips/msa/fdct_msa.h" void vp10_fwht4x4_msa(const int16_t *input, int16_t *output, int32_t src_stride) {
diff --git a/vp10/encoder/mips/msa/fdct8x8_msa.c b/av1/encoder/mips/msa/fdct8x8_msa.c similarity index 96% rename from vp10/encoder/mips/msa/fdct8x8_msa.c rename to av1/encoder/mips/msa/fdct8x8_msa.c index 7843a62..3b6532a 100644 --- a/vp10/encoder/mips/msa/fdct8x8_msa.c +++ b/av1/encoder/mips/msa/fdct8x8_msa.c
@@ -10,8 +10,8 @@ #include <assert.h> -#include "vp10/common/enums.h" -#include "vp10/encoder/mips/msa/fdct_msa.h" +#include "av1/common/enums.h" +#include "av1/encoder/mips/msa/fdct_msa.h" void vp10_fht8x8_msa(const int16_t *input, int16_t *output, int32_t stride, int32_t tx_type) {
diff --git a/vp10/encoder/mips/msa/fdct_msa.h b/av1/encoder/mips/msa/fdct_msa.h similarity index 100% rename from vp10/encoder/mips/msa/fdct_msa.h rename to av1/encoder/mips/msa/fdct_msa.h
diff --git a/vp10/encoder/mips/msa/temporal_filter_msa.c b/av1/encoder/mips/msa/temporal_filter_msa.c similarity index 100% rename from vp10/encoder/mips/msa/temporal_filter_msa.c rename to av1/encoder/mips/msa/temporal_filter_msa.c
diff --git a/vp10/encoder/pickdering.c b/av1/encoder/pickdering.c similarity index 97% rename from vp10/encoder/pickdering.c rename to av1/encoder/pickdering.c index 6a4e778..b5399e5 100644 --- a/vp10/encoder/pickdering.c +++ b/av1/encoder/pickdering.c
@@ -11,10 +11,10 @@ #include <string.h> #include "./vpx_scale_rtcd.h" -#include "vp10/common/dering.h" -#include "vp10/common/onyxc_int.h" -#include "vp10/common/reconinter.h" -#include "vp10/encoder/encoder.h" +#include "av1/common/dering.h" +#include "av1/common/onyxc_int.h" +#include "av1/common/reconinter.h" +#include "av1/encoder/encoder.h" #include "aom/vpx_integer.h" static double compute_dist(int16_t *x, int xstride, int16_t *y, int ystride,
diff --git a/vp10/encoder/picklpf.c b/av1/encoder/picklpf.c similarity index 96% rename from vp10/encoder/picklpf.c rename to av1/encoder/picklpf.c index 5fbbb3e..f1610fa 100644 --- a/vp10/encoder/picklpf.c +++ b/av1/encoder/picklpf.c
@@ -17,13 +17,13 @@ #include "aom_mem/vpx_mem.h" #include "aom_ports/mem.h" -#include "vp10/common/loopfilter.h" -#include "vp10/common/onyxc_int.h" -#include "vp10/common/quant_common.h" +#include "av1/common/loopfilter.h" +#include "av1/common/onyxc_int.h" +#include "av1/common/quant_common.h" -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/picklpf.h" -#include "vp10/encoder/quantize.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/picklpf.h" +#include "av1/encoder/quantize.h" static int get_max_filter_level(const VP10_COMP *cpi) { if (cpi->oxcf.pass == 2) {
diff --git a/vp10/encoder/picklpf.h b/av1/encoder/picklpf.h similarity index 95% rename from vp10/encoder/picklpf.h rename to av1/encoder/picklpf.h index 7d5f167..dae0090 100644 --- a/vp10/encoder/picklpf.h +++ b/av1/encoder/picklpf.h
@@ -15,7 +15,7 @@ extern "C" { #endif -#include "vp10/encoder/encoder.h" +#include "av1/encoder/encoder.h" struct yv12_buffer_config; struct VP10_COMP;
diff --git a/vp10/encoder/quantize.c b/av1/encoder/quantize.c similarity index 98% rename from vp10/encoder/quantize.c rename to av1/encoder/quantize.c index ed2f503..86af339 100644 --- a/vp10/encoder/quantize.c +++ b/av1/encoder/quantize.c
@@ -13,12 +13,12 @@ #include "aom_mem/vpx_mem.h" #include "aom_ports/mem.h" -#include "vp10/common/quant_common.h" -#include "vp10/common/seg_common.h" +#include "av1/common/quant_common.h" +#include "av1/common/seg_common.h" -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/quantize.h" -#include "vp10/encoder/rd.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/quantize.h" +#include "av1/encoder/rd.h" void vp10_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr,
diff --git a/vp10/encoder/quantize.h b/av1/encoder/quantize.h similarity index 96% rename from vp10/encoder/quantize.h rename to av1/encoder/quantize.h index 5f047ca..848b13d 100644 --- a/vp10/encoder/quantize.h +++ b/av1/encoder/quantize.h
@@ -12,8 +12,8 @@ #define VP10_ENCODER_QUANTIZE_H_ #include "./vpx_config.h" -#include "vp10/common/quant_common.h" -#include "vp10/encoder/block.h" +#include "av1/common/quant_common.h" +#include "av1/encoder/block.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/ratectrl.c b/av1/encoder/ratectrl.c similarity index 99% rename from vp10/encoder/ratectrl.c rename to av1/encoder/ratectrl.c index 519e0c8..8512e98 100644 --- a/vp10/encoder/ratectrl.c +++ b/av1/encoder/ratectrl.c
@@ -20,15 +20,15 @@ #include "aom_ports/mem.h" #include "aom_ports/system_state.h" -#include "vp10/common/alloccommon.h" -#include "vp10/encoder/aq_cyclicrefresh.h" -#include "vp10/common/common.h" -#include "vp10/common/entropymode.h" -#include "vp10/common/quant_common.h" -#include "vp10/common/seg_common.h" +#include "av1/common/alloccommon.h" +#include "av1/encoder/aq_cyclicrefresh.h" +#include "av1/common/common.h" +#include "av1/common/entropymode.h" +#include "av1/common/quant_common.h" +#include "av1/common/seg_common.h" -#include "vp10/encoder/encodemv.h" -#include "vp10/encoder/ratectrl.h" +#include "av1/encoder/encodemv.h" +#include "av1/encoder/ratectrl.h" // Max rate target for 1080P and below encodes under normal circumstances // (1920 * 1080 / (16 * 16)) * MAX_MB_RATE bits per MB
diff --git a/vp10/encoder/ratectrl.h b/av1/encoder/ratectrl.h similarity index 99% rename from vp10/encoder/ratectrl.h rename to av1/encoder/ratectrl.h index 8e636c7..cdb9973 100644 --- a/vp10/encoder/ratectrl.h +++ b/av1/encoder/ratectrl.h
@@ -14,7 +14,7 @@ #include "aom/vpx_codec.h" #include "aom/vpx_integer.h" -#include "vp10/common/blockd.h" +#include "av1/common/blockd.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/rd.c b/av1/encoder/rd.c similarity index 97% rename from vp10/encoder/rd.c rename to av1/encoder/rd.c index 03e79be..1352f07 100644 --- a/vp10/encoder/rd.c +++ b/av1/encoder/rd.c
@@ -20,25 +20,25 @@ #include "aom_ports/mem.h" #include "aom_ports/system_state.h" -#include "vp10/common/common.h" -#include "vp10/common/entropy.h" -#include "vp10/common/entropymode.h" -#include "vp10/common/mvref_common.h" -#include "vp10/common/pred_common.h" -#include "vp10/common/quant_common.h" -#include "vp10/common/reconinter.h" -#include "vp10/common/reconintra.h" -#include "vp10/common/seg_common.h" +#include "av1/common/common.h" +#include "av1/common/entropy.h" +#include "av1/common/entropymode.h" +#include "av1/common/mvref_common.h" +#include "av1/common/pred_common.h" +#include "av1/common/quant_common.h" +#include "av1/common/reconinter.h" +#include "av1/common/reconintra.h" +#include "av1/common/seg_common.h" -#include "vp10/encoder/cost.h" -#include "vp10/encoder/encodemb.h" -#include "vp10/encoder/encodemv.h" -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/mcomp.h" -#include "vp10/encoder/quantize.h" -#include "vp10/encoder/ratectrl.h" -#include "vp10/encoder/rd.h" -#include "vp10/encoder/tokenize.h" +#include "av1/encoder/cost.h" +#include "av1/encoder/encodemb.h" +#include "av1/encoder/encodemv.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/mcomp.h" +#include "av1/encoder/quantize.h" +#include "av1/encoder/ratectrl.h" +#include "av1/encoder/rd.h" +#include "av1/encoder/tokenize.h" #define RD_THRESH_POW 1.25
diff --git a/vp10/encoder/rd.h b/av1/encoder/rd.h similarity index 97% rename from vp10/encoder/rd.h rename to av1/encoder/rd.h index 7255cc8..ffa9e47 100644 --- a/vp10/encoder/rd.h +++ b/av1/encoder/rd.h
@@ -13,11 +13,11 @@ #include <limits.h> -#include "vp10/common/blockd.h" +#include "av1/common/blockd.h" -#include "vp10/encoder/block.h" -#include "vp10/encoder/context_tree.h" -#include "vp10/encoder/cost.h" +#include "av1/encoder/block.h" +#include "av1/encoder/context_tree.h" +#include "av1/encoder/cost.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/rdopt.c b/av1/encoder/rdopt.c similarity index 99% rename from vp10/encoder/rdopt.c rename to av1/encoder/rdopt.c index 3b630fe..d704510 100644 --- a/vp10/encoder/rdopt.c +++ b/av1/encoder/rdopt.c
@@ -19,28 +19,28 @@ #include "aom_ports/mem.h" #include "aom_ports/system_state.h" -#include "vp10/common/common.h" -#include "vp10/common/entropy.h" -#include "vp10/common/entropymode.h" -#include "vp10/common/idct.h" -#include "vp10/common/mvref_common.h" -#include "vp10/common/pred_common.h" -#include "vp10/common/quant_common.h" -#include "vp10/common/reconinter.h" -#include "vp10/common/reconintra.h" -#include "vp10/common/scan.h" -#include "vp10/common/seg_common.h" +#include "av1/common/common.h" +#include "av1/common/entropy.h" +#include "av1/common/entropymode.h" +#include "av1/common/idct.h" +#include "av1/common/mvref_common.h" +#include "av1/common/pred_common.h" +#include "av1/common/quant_common.h" +#include "av1/common/reconinter.h" +#include "av1/common/reconintra.h" +#include "av1/common/scan.h" +#include "av1/common/seg_common.h" -#include "vp10/encoder/cost.h" -#include "vp10/encoder/encodemb.h" -#include "vp10/encoder/encodemv.h" -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/mcomp.h" -#include "vp10/encoder/quantize.h" -#include "vp10/encoder/ratectrl.h" -#include "vp10/encoder/rd.h" -#include "vp10/encoder/rdopt.h" -#include "vp10/encoder/aq_variance.h" +#include "av1/encoder/cost.h" +#include "av1/encoder/encodemb.h" +#include "av1/encoder/encodemv.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/mcomp.h" +#include "av1/encoder/quantize.h" +#include "av1/encoder/ratectrl.h" +#include "av1/encoder/rd.h" +#include "av1/encoder/rdopt.h" +#include "av1/encoder/aq_variance.h" #define LAST_FRAME_MODE_MASK \ ((1 << GOLDEN_FRAME) | (1 << ALTREF_FRAME) | (1 << INTRA_FRAME))
diff --git a/vp10/encoder/rdopt.h b/av1/encoder/rdopt.h similarity index 95% rename from vp10/encoder/rdopt.h rename to av1/encoder/rdopt.h index b887b8a..cf5efe6 100644 --- a/vp10/encoder/rdopt.h +++ b/av1/encoder/rdopt.h
@@ -11,10 +11,10 @@ #ifndef VP10_ENCODER_RDOPT_H_ #define VP10_ENCODER_RDOPT_H_ -#include "vp10/common/blockd.h" +#include "av1/common/blockd.h" -#include "vp10/encoder/block.h" -#include "vp10/encoder/context_tree.h" +#include "av1/encoder/block.h" +#include "av1/encoder/context_tree.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/resize.c b/av1/encoder/resize.c similarity index 99% rename from vp10/encoder/resize.c rename to av1/encoder/resize.c index 1423c83..d3295eb 100644 --- a/vp10/encoder/resize.c +++ b/av1/encoder/resize.c
@@ -19,8 +19,8 @@ #include "aom_dsp/vpx_dsp_common.h" #endif // CONFIG_VPX_HIGHBITDEPTH #include "aom_ports/mem.h" -#include "vp10/common/common.h" -#include "vp10/encoder/resize.h" +#include "av1/common/common.h" +#include "av1/encoder/resize.h" #define FILTER_BITS 7
diff --git a/vp10/encoder/resize.h b/av1/encoder/resize.h similarity index 100% rename from vp10/encoder/resize.h rename to av1/encoder/resize.h
diff --git a/vp10/encoder/segmentation.c b/av1/encoder/segmentation.c similarity index 98% rename from vp10/encoder/segmentation.c rename to av1/encoder/segmentation.c index 241a07a..118463a 100644 --- a/vp10/encoder/segmentation.c +++ b/av1/encoder/segmentation.c
@@ -12,12 +12,12 @@ #include "aom_mem/vpx_mem.h" -#include "vp10/common/pred_common.h" -#include "vp10/common/tile_common.h" +#include "av1/common/pred_common.h" +#include "av1/common/tile_common.h" -#include "vp10/encoder/cost.h" -#include "vp10/encoder/segmentation.h" -#include "vp10/encoder/subexp.h" +#include "av1/encoder/cost.h" +#include "av1/encoder/segmentation.h" +#include "av1/encoder/subexp.h" void vp10_enable_segmentation(struct segmentation *seg) { seg->enabled = 1;
diff --git a/vp10/encoder/segmentation.h b/av1/encoder/segmentation.h similarity index 95% rename from vp10/encoder/segmentation.h rename to av1/encoder/segmentation.h index c07f37f..3c79bd1 100644 --- a/vp10/encoder/segmentation.h +++ b/av1/encoder/segmentation.h
@@ -11,8 +11,8 @@ #ifndef VP10_ENCODER_SEGMENTATION_H_ #define VP10_ENCODER_SEGMENTATION_H_ -#include "vp10/common/blockd.h" -#include "vp10/encoder/encoder.h" +#include "av1/common/blockd.h" +#include "av1/encoder/encoder.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/skin_detection.c b/av1/encoder/skin_detection.c similarity index 97% rename from vp10/encoder/skin_detection.c rename to av1/encoder/skin_detection.c index 324ac59..36e8781 100644 --- a/vp10/encoder/skin_detection.c +++ b/av1/encoder/skin_detection.c
@@ -11,9 +11,9 @@ #include <limits.h> #include <math.h> -#include "vp10/common/blockd.h" -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/skin_detection.h" +#include "av1/common/blockd.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/skin_detection.h" // Fixed-point skin color model parameters. static const int skin_mean[2] = { 7463, 9614 }; // q6
diff --git a/vp10/encoder/skin_detection.h b/av1/encoder/skin_detection.h similarity index 96% rename from vp10/encoder/skin_detection.h rename to av1/encoder/skin_detection.h index 26b7d5e..782b7a6 100644 --- a/vp10/encoder/skin_detection.h +++ b/av1/encoder/skin_detection.h
@@ -11,7 +11,7 @@ #ifndef VP10_ENCODER_SKIN_MAP_H_ #define VP10_ENCODER_SKIN_MAP_H_ -#include "vp10/common/blockd.h" +#include "av1/common/blockd.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/speed_features.c b/av1/encoder/speed_features.c similarity index 99% rename from vp10/encoder/speed_features.c rename to av1/encoder/speed_features.c index 2faf12f..dc620a2 100644 --- a/vp10/encoder/speed_features.c +++ b/av1/encoder/speed_features.c
@@ -10,9 +10,9 @@ #include <limits.h> -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/speed_features.h" -#include "vp10/encoder/rdopt.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/speed_features.h" +#include "av1/encoder/rdopt.h" #include "aom_dsp/vpx_dsp_common.h"
diff --git a/vp10/encoder/speed_features.h b/av1/encoder/speed_features.h similarity index 99% rename from vp10/encoder/speed_features.h rename to av1/encoder/speed_features.h index 72b5847..3d4f130 100644 --- a/vp10/encoder/speed_features.h +++ b/av1/encoder/speed_features.h
@@ -11,7 +11,7 @@ #ifndef VP10_ENCODER_SPEED_FEATURES_H_ #define VP10_ENCODER_SPEED_FEATURES_H_ -#include "vp10/common/enums.h" +#include "av1/common/enums.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/subexp.c b/av1/encoder/subexp.c similarity index 98% rename from vp10/encoder/subexp.c rename to av1/encoder/subexp.c index 368f86b..def82ab 100644 --- a/vp10/encoder/subexp.c +++ b/av1/encoder/subexp.c
@@ -9,10 +9,10 @@ */ #include "aom_dsp/bitwriter.h" -#include "vp10/common/common.h" -#include "vp10/common/entropy.h" -#include "vp10/encoder/cost.h" -#include "vp10/encoder/subexp.h" +#include "av1/common/common.h" +#include "av1/common/entropy.h" +#include "av1/encoder/cost.h" +#include "av1/encoder/subexp.h" #define vp10_cost_upd256 ((int)(vp10_cost_one(upd) - vp10_cost_zero(upd)))
diff --git a/vp10/encoder/subexp.h b/av1/encoder/subexp.h similarity index 100% rename from vp10/encoder/subexp.h rename to av1/encoder/subexp.h
diff --git a/vp10/encoder/temporal_filter.c b/av1/encoder/temporal_filter.c similarity index 97% rename from vp10/encoder/temporal_filter.c rename to av1/encoder/temporal_filter.c index 006b965..c13a1a8 100644 --- a/vp10/encoder/temporal_filter.c +++ b/av1/encoder/temporal_filter.c
@@ -11,19 +11,19 @@ #include <math.h> #include <limits.h> -#include "vp10/common/alloccommon.h" -#include "vp10/common/onyxc_int.h" -#include "vp10/common/quant_common.h" -#include "vp10/common/reconinter.h" -#include "vp10/common/odintrin.h" -#include "vp10/encoder/extend.h" -#include "vp10/encoder/firstpass.h" -#include "vp10/encoder/mcomp.h" -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/quantize.h" -#include "vp10/encoder/ratectrl.h" -#include "vp10/encoder/segmentation.h" -#include "vp10/encoder/temporal_filter.h" +#include "av1/common/alloccommon.h" +#include "av1/common/onyxc_int.h" +#include "av1/common/quant_common.h" +#include "av1/common/reconinter.h" +#include "av1/common/odintrin.h" +#include "av1/encoder/extend.h" +#include "av1/encoder/firstpass.h" +#include "av1/encoder/mcomp.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/quantize.h" +#include "av1/encoder/ratectrl.h" +#include "av1/encoder/segmentation.h" +#include "av1/encoder/temporal_filter.h" #include "aom_dsp/vpx_dsp_common.h" #include "aom_mem/vpx_mem.h" #include "aom_ports/mem.h"
diff --git a/vp10/encoder/temporal_filter.h b/av1/encoder/temporal_filter.h similarity index 100% rename from vp10/encoder/temporal_filter.h rename to av1/encoder/temporal_filter.h
diff --git a/vp10/encoder/tokenize.c b/av1/encoder/tokenize.c similarity index 98% rename from vp10/encoder/tokenize.c rename to av1/encoder/tokenize.c index 438ee5a..1b5262b 100644 --- a/vp10/encoder/tokenize.c +++ b/av1/encoder/tokenize.c
@@ -15,14 +15,14 @@ #include "aom_mem/vpx_mem.h" -#include "vp10/common/entropy.h" -#include "vp10/common/pred_common.h" -#include "vp10/common/scan.h" -#include "vp10/common/seg_common.h" +#include "av1/common/entropy.h" +#include "av1/common/pred_common.h" +#include "av1/common/scan.h" +#include "av1/common/seg_common.h" -#include "vp10/encoder/cost.h" -#include "vp10/encoder/encoder.h" -#include "vp10/encoder/tokenize.h" +#include "av1/encoder/cost.h" +#include "av1/encoder/encoder.h" +#include "av1/encoder/tokenize.h" static const TOKENVALUE dct_cat_lt_10_value_tokens[] = { { 9, 63 }, { 9, 61 }, { 9, 59 }, { 9, 57 }, { 9, 55 }, { 9, 53 }, { 9, 51 },
diff --git a/vp10/encoder/tokenize.h b/av1/encoder/tokenize.h similarity index 96% rename from vp10/encoder/tokenize.h rename to av1/encoder/tokenize.h index 64a820a..27d7ed4 100644 --- a/vp10/encoder/tokenize.h +++ b/av1/encoder/tokenize.h
@@ -11,10 +11,10 @@ #ifndef VP10_ENCODER_TOKENIZE_H_ #define VP10_ENCODER_TOKENIZE_H_ -#include "vp10/common/entropy.h" +#include "av1/common/entropy.h" -#include "vp10/encoder/block.h" -#include "vp10/encoder/treewriter.h" +#include "av1/encoder/block.h" +#include "av1/encoder/treewriter.h" #ifdef __cplusplus extern "C" {
diff --git a/vp10/encoder/treewriter.c b/av1/encoder/treewriter.c similarity index 97% rename from vp10/encoder/treewriter.c rename to av1/encoder/treewriter.c index 152bf40..d3fcd45 100644 --- a/vp10/encoder/treewriter.c +++ b/av1/encoder/treewriter.c
@@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp10/encoder/treewriter.h" +#include "av1/encoder/treewriter.h" static void tree2tok(struct vp10_token *tokens, const vpx_tree_index *tree, int i, int v, int l) {
diff --git a/vp10/encoder/treewriter.h b/av1/encoder/treewriter.h similarity index 100% rename from vp10/encoder/treewriter.h rename to av1/encoder/treewriter.h
diff --git a/vp10/encoder/x86/dct_mmx.asm b/av1/encoder/x86/dct_mmx.asm similarity index 100% rename from vp10/encoder/x86/dct_mmx.asm rename to av1/encoder/x86/dct_mmx.asm
diff --git a/vp10/encoder/x86/dct_sse2.c b/av1/encoder/x86/dct_sse2.c similarity index 100% rename from vp10/encoder/x86/dct_sse2.c rename to av1/encoder/x86/dct_sse2.c
diff --git a/vp10/encoder/x86/dct_ssse3.c b/av1/encoder/x86/dct_ssse3.c similarity index 100% rename from vp10/encoder/x86/dct_ssse3.c rename to av1/encoder/x86/dct_ssse3.c
diff --git a/vp10/encoder/x86/error_intrin_avx2.c b/av1/encoder/x86/error_intrin_avx2.c similarity index 100% rename from vp10/encoder/x86/error_intrin_avx2.c rename to av1/encoder/x86/error_intrin_avx2.c
diff --git a/vp10/encoder/x86/error_sse2.asm b/av1/encoder/x86/error_sse2.asm similarity index 100% rename from vp10/encoder/x86/error_sse2.asm rename to av1/encoder/x86/error_sse2.asm
diff --git a/vp10/encoder/x86/highbd_block_error_intrin_sse2.c b/av1/encoder/x86/highbd_block_error_intrin_sse2.c similarity index 98% rename from vp10/encoder/x86/highbd_block_error_intrin_sse2.c rename to av1/encoder/x86/highbd_block_error_intrin_sse2.c index eefca1c..2728880 100644 --- a/vp10/encoder/x86/highbd_block_error_intrin_sse2.c +++ b/av1/encoder/x86/highbd_block_error_intrin_sse2.c
@@ -11,7 +11,7 @@ #include <emmintrin.h> #include <stdio.h> -#include "vp10/common/common.h" +#include "av1/common/common.h" int64_t vp10_highbd_block_error_sse2(tran_low_t *coeff, tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz,
diff --git a/vp10/encoder/x86/quantize_sse2.c b/av1/encoder/x86/quantize_sse2.c similarity index 100% rename from vp10/encoder/x86/quantize_sse2.c rename to av1/encoder/x86/quantize_sse2.c
diff --git a/vp10/encoder/x86/quantize_ssse3_x86_64.asm b/av1/encoder/x86/quantize_ssse3_x86_64.asm similarity index 100% rename from vp10/encoder/x86/quantize_ssse3_x86_64.asm rename to av1/encoder/x86/quantize_ssse3_x86_64.asm
diff --git a/vp10/encoder/x86/ssim_opt_x86_64.asm b/av1/encoder/x86/ssim_opt_x86_64.asm similarity index 100% rename from vp10/encoder/x86/ssim_opt_x86_64.asm rename to av1/encoder/x86/ssim_opt_x86_64.asm
diff --git a/vp10/encoder/x86/temporal_filter_apply_sse2.asm b/av1/encoder/x86/temporal_filter_apply_sse2.asm similarity index 100% rename from vp10/encoder/x86/temporal_filter_apply_sse2.asm rename to av1/encoder/x86/temporal_filter_apply_sse2.asm
diff --git a/vp10/exports_dec b/av1/exports_dec similarity index 100% rename from vp10/exports_dec rename to av1/exports_dec
diff --git a/vp10/exports_enc b/av1/exports_enc similarity index 100% rename from vp10/exports_enc rename to av1/exports_enc
diff --git a/vp10/vp10_common.mk b/av1/vp10_common.mk similarity index 97% rename from vp10/vp10_common.mk rename to av1/vp10_common.mk index d0311f5..6d27eee 100644 --- a/vp10/vp10_common.mk +++ b/av1/vp10_common.mk
@@ -95,4 +95,4 @@ VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp10_inv_txfm_sse2.c VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp10_inv_txfm_sse2.h -$(eval $(call rtcd_h_template,vp10_rtcd,vp10/common/vp10_rtcd_defs.pl)) +$(eval $(call rtcd_h_template,vp10_rtcd,av1/common/vp10_rtcd_defs.pl))
diff --git a/vp10/vp10_cx_iface.c b/av1/vp10_cx_iface.c similarity index 99% rename from vp10/vp10_cx_iface.c rename to av1/vp10_cx_iface.c index ae3fc25..3f43178 100644 --- a/vp10/vp10_cx_iface.c +++ b/av1/vp10_cx_iface.c
@@ -16,10 +16,10 @@ #include "aom_ports/vpx_once.h" #include "aom/internal/vpx_codec_internal.h" #include "./vpx_version.h" -#include "vp10/encoder/encoder.h" +#include "av1/encoder/encoder.h" #include "aom/vp8cx.h" -#include "vp10/encoder/firstpass.h" -#include "vp10/vp10_iface_common.h" +#include "av1/encoder/firstpass.h" +#include "av1/vp10_iface_common.h" struct vp10_extracfg { int cpu_used; // available cpu percentage in 1/16
diff --git a/vp10/vp10_dx_iface.c b/av1/vp10_dx_iface.c similarity index 99% rename from vp10/vp10_dx_iface.c rename to av1/vp10_dx_iface.c index b8edb3d..1b2a502 100644 --- a/vp10/vp10_dx_iface.c +++ b/av1/vp10_dx_iface.c
@@ -21,13 +21,13 @@ #include "aom_dsp/vpx_dsp_common.h" #include "aom_util/vpx_thread.h" -#include "vp10/common/alloccommon.h" -#include "vp10/common/frame_buffers.h" +#include "av1/common/alloccommon.h" +#include "av1/common/frame_buffers.h" -#include "vp10/decoder/decoder.h" -#include "vp10/decoder/decodeframe.h" +#include "av1/decoder/decoder.h" +#include "av1/decoder/decodeframe.h" -#include "vp10/vp10_iface_common.h" +#include "av1/vp10_iface_common.h" typedef vpx_codec_stream_info_t vp10_stream_info_t;
diff --git a/vp10/vp10_iface_common.h b/av1/vp10_iface_common.h similarity index 100% rename from vp10/vp10_iface_common.h rename to av1/vp10_iface_common.h
diff --git a/vp10/vp10cx.mk b/av1/vp10cx.mk similarity index 100% rename from vp10/vp10cx.mk rename to av1/vp10cx.mk
diff --git a/vp10/vp10dx.mk b/av1/vp10dx.mk similarity index 100% rename from vp10/vp10dx.mk rename to av1/vp10dx.mk
diff --git a/configure b/configure index acc0e8d..b82a4a4 100755 --- a/configure +++ b/configure
@@ -185,7 +185,7 @@ fi # disable codecs when their source directory does not exist -[ -d "${source_path}/vp10" ] || disable_feature vp10 +[ -d "${source_path}/av1" ] || disable_feature vp10 # install everything except the sources, by default. sources will have # to be enabled when doing dist builds, since that's no longer a common
diff --git a/examples.mk b/examples.mk index 1792b85..aa3e060 100644 --- a/examples.mk +++ b/examples.mk
@@ -188,8 +188,8 @@ INC_PATH-yes := $(SRC_PATH_BARE)/../include else LIB_PATH-yes += $(if $(BUILD_PFX),$(BUILD_PFX),.) - INC_PATH-$(CONFIG_VP10_DECODER) += $(SRC_PATH_BARE)/vp10 - INC_PATH-$(CONFIG_VP10_ENCODER) += $(SRC_PATH_BARE)/vp10 + INC_PATH-$(CONFIG_VP10_DECODER) += $(SRC_PATH_BARE)/av1 + INC_PATH-$(CONFIG_VP10_ENCODER) += $(SRC_PATH_BARE)/av1 endif INC_PATH-$(CONFIG_LIBYUV) += $(SRC_PATH_BARE)/third_party/libyuv/include LIB_PATH := $(call enabled,LIB_PATH)
diff --git a/libs.mk b/libs.mk index b74d909..683073d 100644 --- a/libs.mk +++ b/libs.mk
@@ -55,12 +55,12 @@ # VP10 make file ifeq ($(CONFIG_VP10),yes) - VP10_PREFIX=vp10/ + VP10_PREFIX=av1/ include $(SRC_PATH_BARE)/$(VP10_PREFIX)vp10_common.mk endif ifeq ($(CONFIG_VP10_ENCODER),yes) - VP10_PREFIX=vp10/ + VP10_PREFIX=av1/ include $(SRC_PATH_BARE)/$(VP10_PREFIX)vp10cx.mk CODEC_SRCS-yes += $(addprefix $(VP10_PREFIX),$(call enabled,VP10_CX_SRCS)) CODEC_EXPORTS-yes += $(addprefix $(VP10_PREFIX),$(VP10_CX_EXPORTS)) @@ -73,7 +73,7 @@ endif ifeq ($(CONFIG_VP10_DECODER),yes) - VP10_PREFIX=vp10/ + VP10_PREFIX=av1/ include $(SRC_PATH_BARE)/$(VP10_PREFIX)vp10dx.mk CODEC_SRCS-yes += $(addprefix $(VP10_PREFIX),$(call enabled,VP10_DX_SRCS)) CODEC_EXPORTS-yes += $(addprefix $(VP10_PREFIX),$(VP10_DX_EXPORTS)) @@ -84,7 +84,7 @@ CODEC_DOC_SECTIONS += vp10 vp10_decoder endif -VP10_PREFIX=vp10/ +VP10_PREFIX=av1/ $(BUILD_PFX)$(VP10_PREFIX)%.c.o: CFLAGS += -Wextra ifeq ($(CONFIG_ENCODERS),yes)
diff --git a/test/arf_freq_test.cc b/test/arf_freq_test.cc index 79fa804..aa40840 100644 --- a/test/arf_freq_test.cc +++ b/test/arf_freq_test.cc
@@ -15,7 +15,7 @@ #include "test/util.h" #include "test/y4m_video_source.h" #include "test/yuv_video_source.h" -#include "vp10/encoder/ratectrl.h" +#include "av1/encoder/ratectrl.h" namespace {
diff --git a/test/convolve_test.cc b/test/convolve_test.cc index 7fcf7e9..fe7f312 100644 --- a/test/convolve_test.cc +++ b/test/convolve_test.cc
@@ -19,8 +19,8 @@ #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "vp10/common/common.h" -#include "vp10/common/filter.h" +#include "av1/common/common.h" +#include "av1/common/filter.h" #include "aom_dsp/vpx_dsp_common.h" #include "aom_dsp/vpx_filter.h" #include "aom_mem/vpx_mem.h"
diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc index 5c679d3..ef01c74 100644 --- a/test/dct16x16_test.cc +++ b/test/dct16x16_test.cc
@@ -20,8 +20,8 @@ #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "vp10/common/entropy.h" -#include "vp10/common/scan.h" +#include "av1/common/entropy.h" +#include "av1/common/scan.h" #include "aom/vpx_codec.h" #include "aom/vpx_integer.h" #include "aom_ports/mem.h"
diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc index 2e71e25..63304ce 100644 --- a/test/dct32x32_test.cc +++ b/test/dct32x32_test.cc
@@ -21,7 +21,7 @@ #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "vp10/common/entropy.h" +#include "av1/common/entropy.h" #include "aom/vpx_codec.h" #include "aom/vpx_integer.h" #include "aom_ports/mem.h"
diff --git a/test/denoiser_sse2_test.cc b/test/denoiser_sse2_test.cc index d65c31f..c2e5556 100644 --- a/test/denoiser_sse2_test.cc +++ b/test/denoiser_sse2_test.cc
@@ -20,9 +20,9 @@ #include "aom_scale/yv12config.h" #include "aom/vpx_integer.h" -#include "vp10/common/reconinter.h" -#include "vp10/encoder/context_tree.h" -#include "vp10/encoder/denoiser.h" +#include "av1/common/reconinter.h" +#include "av1/encoder/context_tree.h" +#include "av1/encoder/denoiser.h" using libvpx_test::ACMRandom;
diff --git a/test/divu_small_test.cc b/test/divu_small_test.cc index a7cfbf7..5f6aac7 100644 --- a/test/divu_small_test.cc +++ b/test/divu_small_test.cc
@@ -27,7 +27,7 @@ #include "third_party/googletest/src/include/gtest/gtest.h" #include "test/acm_random.h" -#include "vp10/common/odintrin.h" +#include "av1/common/odintrin.h" using libvpx_test::ACMRandom;
diff --git a/test/encoder_parms_get_to_decoder.cc b/test/encoder_parms_get_to_decoder.cc index 3dd5f86..1983aba 100644 --- a/test/encoder_parms_get_to_decoder.cc +++ b/test/encoder_parms_get_to_decoder.cc
@@ -14,7 +14,7 @@ #include "test/encode_test_driver.h" #include "test/util.h" #include "test/y4m_video_source.h" -#include "vp10/vp10_dx_iface.c" +#include "av1/vp10_dx_iface.c" namespace {
diff --git a/test/error_block_test.cc b/test/error_block_test.cc index 09814e9..c1ea0da 100644 --- a/test/error_block_test.cc +++ b/test/error_block_test.cc
@@ -20,7 +20,7 @@ #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "vp10/common/entropy.h" +#include "av1/common/entropy.h" #include "aom/vpx_codec.h" #include "aom/vpx_integer.h"
diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc index d5f57b2..b36b1cf 100644 --- a/test/fdct4x4_test.cc +++ b/test/fdct4x4_test.cc
@@ -20,7 +20,7 @@ #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "vp10/common/entropy.h" +#include "av1/common/entropy.h" #include "aom/vpx_codec.h" #include "aom/vpx_integer.h" #include "aom_ports/mem.h"
diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc index 91d56f0..4a9137c 100644 --- a/test/fdct8x8_test.cc +++ b/test/fdct8x8_test.cc
@@ -20,8 +20,8 @@ #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "vp10/common/entropy.h" -#include "vp10/common/scan.h" +#include "av1/common/entropy.h" +#include "av1/common/scan.h" #include "aom/vpx_codec.h" #include "aom/vpx_integer.h" #include "aom_ports/mem.h"
diff --git a/test/intrapred_test.cc b/test/intrapred_test.cc index ab7e6c8..7bff52f 100644 --- a/test/intrapred_test.cc +++ b/test/intrapred_test.cc
@@ -18,8 +18,8 @@ #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "vp10/common/blockd.h" -#include "vp10/common/pred_common.h" +#include "av1/common/blockd.h" +#include "av1/common/pred_common.h" #include "aom_mem/vpx_mem.h" namespace {
diff --git a/test/lpf_8_test.cc b/test/lpf_8_test.cc index 5691d82..1a2b066 100644 --- a/test/lpf_8_test.cc +++ b/test/lpf_8_test.cc
@@ -20,8 +20,8 @@ #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "vp10/common/entropy.h" -#include "vp10/common/loopfilter.h" +#include "av1/common/entropy.h" +#include "av1/common/loopfilter.h" #include "aom/vpx_integer.h" using libvpx_test::ACMRandom;
diff --git a/test/partial_idct_test.cc b/test/partial_idct_test.cc index acb407b..5b27ae1 100644 --- a/test/partial_idct_test.cc +++ b/test/partial_idct_test.cc
@@ -20,8 +20,8 @@ #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "vp10/common/blockd.h" -#include "vp10/common/scan.h" +#include "av1/common/blockd.h" +#include "av1/common/scan.h" #include "aom/vpx_integer.h" using libvpx_test::ACMRandom;
diff --git a/test/quantize_test.cc b/test/quantize_test.cc index 0df39a4..51ad522 100644 --- a/test/quantize_test.cc +++ b/test/quantize_test.cc
@@ -20,8 +20,8 @@ #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "vp10/common/entropy.h" -#include "vp10/common/scan.h" +#include "av1/common/entropy.h" +#include "av1/common/scan.h" #include "aom/vpx_codec.h" #include "aom/vpx_integer.h"
diff --git a/test/subtract_test.cc b/test/subtract_test.cc index dc0eaaa..db7f60c 100644 --- a/test/subtract_test.cc +++ b/test/subtract_test.cc
@@ -16,7 +16,7 @@ #include "test/acm_random.h" #include "test/clear_system_state.h" #include "test/register_state_check.h" -#include "vp10/common/blockd.h" +#include "av1/common/blockd.h" #include "aom_mem/vpx_mem.h" typedef void (*SubtractFunc)(int rows, int cols, int16_t *diff_ptr,
diff --git a/test/svc_test.cc b/test/svc_test.cc index f514d44..e61a1b8 100644 --- a/test/svc_test.cc +++ b/test/svc_test.cc
@@ -14,7 +14,7 @@ #include "test/decode_test_driver.h" #include "test/i420_video_source.h" -#include "vp10/decoder/decoder.h" +#include "av1/decoder/decoder.h" #include "aom/svc_context.h" #include "aom/vp8cx.h"
diff --git a/test/vp10_dct_test.cc b/test/vp10_dct_test.cc index f23bb18..6331d69 100644 --- a/test/vp10_dct_test.cc +++ b/test/vp10_dct_test.cc
@@ -20,7 +20,7 @@ #undef CONFIG_COEFFICIENT_RANGE_CHECKING #define CONFIG_COEFFICIENT_RANGE_CHECKING 1 -#include "vp10/encoder/dct.c" +#include "av1/encoder/dct.c" using libvpx_test::ACMRandom;
diff --git a/test/vp10_inv_txfm_test.cc b/test/vp10_inv_txfm_test.cc index 1eb7c38..e4b4d90 100644 --- a/test/vp10_inv_txfm_test.cc +++ b/test/vp10_inv_txfm_test.cc
@@ -20,10 +20,10 @@ #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "vp10/common/blockd.h" -#include "vp10/common/scan.h" +#include "av1/common/blockd.h" +#include "av1/common/scan.h" #include "aom/vpx_integer.h" -#include "vp10/common/vp10_inv_txfm.h" +#include "av1/common/vp10_inv_txfm.h" using libvpx_test::ACMRandom;