From 02321de0f2177cea1dae0b1f6a3b2448eb522939 Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Thu, 10 Feb 2011 14:41:38 -0500 Subject: Fix relative include paths Allow compiling without adding vp8/{common,encoder,decoder} to the include paths. Change-Id: Ifeb5dac351cdfadcd659736f5158b315a0030b6c --- vp8/common/arm/arm_systemdependent.c | 14 +++++++------- vp8/common/arm/bilinearfilter_arm.c | 6 +++--- vp8/common/arm/filter_arm.c | 4 ++-- vp8/common/arm/loopfilter_arm.c | 4 ++-- vp8/common/arm/neon/recon_neon.c | 4 ++-- vp8/common/arm/reconintra_arm.c | 6 +++--- vp8/common/generic/systemdependent.c | 12 ++++++------ vp8/common/x86/loopfilter_x86.c | 2 +- vp8/common/x86/vp8_asm_stubs.c | 2 +- vp8/common/x86/x86_systemdependent.c | 14 +++++++------- 10 files changed, 34 insertions(+), 34 deletions(-) (limited to 'vp8/common') diff --git a/vp8/common/arm/arm_systemdependent.c b/vp8/common/arm/arm_systemdependent.c index 83921f807..69e1bdff4 100644 --- a/vp8/common/arm/arm_systemdependent.c +++ b/vp8/common/arm/arm_systemdependent.c @@ -11,13 +11,13 @@ #include "vpx_ports/config.h" #include "vpx_ports/arm.h" -#include "g_common.h" -#include "pragmas.h" -#include "subpixel.h" -#include "loopfilter.h" -#include "recon.h" -#include "idct.h" -#include "onyxc_int.h" +#include "vp8/common/g_common.h" +#include "vp8/common/pragmas.h" +#include "vp8/common/subpixel.h" +#include "vp8/common/loopfilter.h" +#include "vp8/common/recon.h" +#include "vp8/common/idct.h" +#include "vp8/common/onyxc_int.h" extern void (*vp8_build_intra_predictors_mby_ptr)(MACROBLOCKD *x); extern void vp8_build_intra_predictors_mby(MACROBLOCKD *x); diff --git a/vp8/common/arm/bilinearfilter_arm.c b/vp8/common/arm/bilinearfilter_arm.c index 6a46ef685..7340e20f3 100644 --- a/vp8/common/arm/bilinearfilter_arm.c +++ b/vp8/common/arm/bilinearfilter_arm.c @@ -10,9 +10,9 @@ #include -#include "filter.h" -#include "subpixel.h" -#include "arm/bilinearfilter_arm.h" +#include "vp8/common/filter.h" +#include "vp8/common/subpixel.h" +#include "bilinearfilter_arm.h" void vp8_filter_block2d_bil_armv6 ( diff --git a/vp8/common/arm/filter_arm.c b/vp8/common/arm/filter_arm.c index 2612fc18a..fe3c5a52e 100644 --- a/vp8/common/arm/filter_arm.c +++ b/vp8/common/arm/filter_arm.c @@ -11,8 +11,8 @@ #include "vpx_ports/config.h" #include -#include "filter.h" -#include "subpixel.h" +#include "vp8/common/filter.h" +#include "vp8/common/subpixel.h" #include "vpx_ports/mem.h" extern void vp8_filter_block2d_first_pass_armv6 diff --git a/vp8/common/arm/loopfilter_arm.c b/vp8/common/arm/loopfilter_arm.c index 684a7f156..3532a0356 100644 --- a/vp8/common/arm/loopfilter_arm.c +++ b/vp8/common/arm/loopfilter_arm.c @@ -11,8 +11,8 @@ #include "vpx_ports/config.h" #include -#include "loopfilter.h" -#include "onyxc_int.h" +#include "vp8/common/loopfilter.h" +#include "vp8/common/onyxc_int.h" extern prototype_loopfilter(vp8_loop_filter_horizontal_edge_armv6); extern prototype_loopfilter(vp8_loop_filter_vertical_edge_armv6); diff --git a/vp8/common/arm/neon/recon_neon.c b/vp8/common/arm/neon/recon_neon.c index f7930ee5f..09fd2a56f 100644 --- a/vp8/common/arm/neon/recon_neon.c +++ b/vp8/common/arm/neon/recon_neon.c @@ -10,8 +10,8 @@ #include "vpx_ports/config.h" -#include "recon.h" -#include "blockd.h" +#include "vp8/common/recon.h" +#include "vp8/common/blockd.h" extern void vp8_recon16x16mb_neon(unsigned char *pred_ptr, short *diff_ptr, unsigned char *dst_ptr, int ystride, unsigned char *udst_ptr, unsigned char *vdst_ptr); diff --git a/vp8/common/arm/reconintra_arm.c b/vp8/common/arm/reconintra_arm.c index 4cc93d134..f8f4dca3e 100644 --- a/vp8/common/arm/reconintra_arm.c +++ b/vp8/common/arm/reconintra_arm.c @@ -10,10 +10,10 @@ #include "vpx_ports/config.h" -#include "blockd.h" -#include "reconintra.h" +#include "vp8/common/blockd.h" +#include "vp8/common/reconintra.h" #include "vpx_mem/vpx_mem.h" -#include "recon.h" +#include "vp8/common/recon.h" #if HAVE_ARMV7 extern void vp8_build_intra_predictors_mby_neon_func( diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index b3eadaf27..c843d86fe 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -10,12 +10,12 @@ #include "vpx_ports/config.h" -#include "g_common.h" -#include "subpixel.h" -#include "loopfilter.h" -#include "recon.h" -#include "idct.h" -#include "onyxc_int.h" +#include "vp8/common/g_common.h" +#include "vp8/common/subpixel.h" +#include "vp8/common/loopfilter.h" +#include "vp8/common/recon.h" +#include "vp8/common/idct.h" +#include "vp8/common/onyxc_int.h" extern void vp8_arch_x86_common_init(VP8_COMMON *ctx); extern void vp8_arch_arm_common_init(VP8_COMMON *ctx); diff --git a/vp8/common/x86/loopfilter_x86.c b/vp8/common/x86/loopfilter_x86.c index 3621fe1d7..5837bc0dc 100644 --- a/vp8/common/x86/loopfilter_x86.c +++ b/vp8/common/x86/loopfilter_x86.c @@ -10,7 +10,7 @@ #include "vpx_ports/config.h" -#include "loopfilter.h" +#include "vp8/common/loopfilter.h" prototype_loopfilter(vp8_loop_filter_horizontal_edge_c); prototype_loopfilter(vp8_loop_filter_vertical_edge_c); diff --git a/vp8/common/x86/vp8_asm_stubs.c b/vp8/common/x86/vp8_asm_stubs.c index 8dd07c90d..790400609 100644 --- a/vp8/common/x86/vp8_asm_stubs.c +++ b/vp8/common/x86/vp8_asm_stubs.c @@ -11,7 +11,7 @@ #include "vpx_ports/config.h" #include "vpx_ports/mem.h" -#include "subpixel.h" +#include "vp8/common/subpixel.h" extern const short vp8_six_tap_mmx[8][6*8]; extern const short vp8_bilinear_filters_mmx[8][2*8]; diff --git a/vp8/common/x86/x86_systemdependent.c b/vp8/common/x86/x86_systemdependent.c index 38500fd01..e89c07a4f 100644 --- a/vp8/common/x86/x86_systemdependent.c +++ b/vp8/common/x86/x86_systemdependent.c @@ -11,13 +11,13 @@ #include "vpx_ports/config.h" #include "vpx_ports/x86.h" -#include "g_common.h" -#include "subpixel.h" -#include "loopfilter.h" -#include "recon.h" -#include "idct.h" -#include "pragmas.h" -#include "onyxc_int.h" +#include "vp8/common/g_common.h" +#include "vp8/common/subpixel.h" +#include "vp8/common/loopfilter.h" +#include "vp8/common/recon.h" +#include "vp8/common/idct.h" +#include "vp8/common/pragmas.h" +#include "vp8/common/onyxc_int.h" void vp8_arch_x86_common_init(VP8_COMMON *ctx) { -- cgit v1.2.3 From 07f7b66fae85b1312622d869e0e944c65b315305 Mon Sep 17 00:00:00 2001 From: Scott LaVarnway Date: Thu, 17 Feb 2011 13:34:38 -0500 Subject: Removed unused vp8_recon_intra4x4mb function Change-Id: I4a328ce152d9dbe6b0d1606d1b523e8e7bfb468e --- vp8/common/recon.h | 1 - vp8/common/reconintra4x4.c | 86 ---------------------------------------------- 2 files changed, 87 deletions(-) (limited to 'vp8/common') diff --git a/vp8/common/recon.h b/vp8/common/recon.h index 1e6e343fc..e7df90a71 100644 --- a/vp8/common/recon.h +++ b/vp8/common/recon.h @@ -94,6 +94,5 @@ typedef struct vp8_recon_rtcd_vtable #define RECON_INVOKE(ctx,fn) vp8_recon_##fn #endif -void vp8_recon_intra4x4mb(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x); void vp8_recon_intra_mbuv(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x); #endif diff --git a/vp8/common/reconintra4x4.c b/vp8/common/reconintra4x4.c index db44fa190..cd70dca73 100644 --- a/vp8/common/reconintra4x4.c +++ b/vp8/common/reconintra4x4.c @@ -313,89 +313,3 @@ void vp8_intra_prediction_down_copy(MACROBLOCKD *x) } -void vp8_recon_intra4x4mb(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *x) -{ - int i; - - vp8_intra_prediction_down_copy(x); - -#if ARCH_ARM - { - BLOCKD *b = &x->block[0]; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - b += 1; - - vp8_predict_intra4x4(b, b->bmi.mode, b->predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - } -#else - for (i = 0; i < 16; i++) - { - BLOCKD *b = &x->block[i]; - - vp8_predict_intra4x4(b, x->block[i].bmi.mode, x->block[i].predictor); - RECON_INVOKE(rtcd, recon)(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride); - } -#endif - - vp8_recon_intra_mbuv(rtcd, x); - -} -- cgit v1.2.3