diff options
Diffstat (limited to 'vp8')
49 files changed, 65 insertions, 175 deletions
diff --git a/vp8/common/arm/armv6/idct_blk_v6.c b/vp8/common/arm/armv6/idct_blk_v6.c index 6002c0f12..c94f84a62 100644 --- a/vp8/common/arm/armv6/idct_blk_v6.c +++ b/vp8/common/arm/armv6/idct_blk_v6.c @@ -9,7 +9,7 @@ */ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" void vp8_dequant_idct_add_y_block_v6(short *q, short *dq, diff --git a/vp8/common/arm/bilinearfilter_arm.c b/vp8/common/arm/bilinearfilter_arm.c index c63073c77..799c8bd96 100644 --- a/vp8/common/arm/bilinearfilter_arm.c +++ b/vp8/common/arm/bilinearfilter_arm.c @@ -9,7 +9,7 @@ */ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include <math.h> #include "vp8/common/filter.h" #include "bilinearfilter_arm.h" diff --git a/vp8/common/arm/filter_arm.c b/vp8/common/arm/filter_arm.c index 148951a92..7fe39674e 100644 --- a/vp8/common/arm/filter_arm.c +++ b/vp8/common/arm/filter_arm.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include <math.h> #include "vp8/common/filter.h" #include "vpx_ports/mem.h" diff --git a/vp8/common/arm/loopfilter_arm.c b/vp8/common/arm/loopfilter_arm.c index b8f9bd90e..3bdc9675e 100644 --- a/vp8/common/arm/loopfilter_arm.c +++ b/vp8/common/arm/loopfilter_arm.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vp8/common/loopfilter.h" #include "vp8/common/onyxc_int.h" diff --git a/vp8/common/arm/neon/idct_blk_neon.c b/vp8/common/arm/neon/idct_blk_neon.c index ee7f223b5..fb327a726 100644 --- a/vp8/common/arm/neon/idct_blk_neon.c +++ b/vp8/common/arm/neon/idct_blk_neon.c @@ -9,7 +9,7 @@ */ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" /* place these declarations here because we don't want to maintain them * outside of this scope diff --git a/vp8/common/arm/reconintra_arm.c b/vp8/common/arm/reconintra_arm.c index 121e090e1..2874896e8 100644 --- a/vp8/common/arm/reconintra_arm.c +++ b/vp8/common/arm/reconintra_arm.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vp8/common/blockd.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp8/common/arm/variance_arm.c b/vp8/common/arm/variance_arm.c index 891d767f0..467a50942 100644 --- a/vp8/common/arm/variance_arm.c +++ b/vp8/common/arm/variance_arm.c @@ -9,7 +9,7 @@ */ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vp8/common/variance.h" #include "vp8/common/filter.h" diff --git a/vp8/common/dequantize.c b/vp8/common/dequantize.c index 8eda48623..6e2f69a77 100644 --- a/vp8/common/dequantize.c +++ b/vp8/common/dequantize.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vp8/common/blockd.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index 5a6ac7b0e..2de019d70 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #if ARCH_ARM #include "vpx_ports/arm.h" #elif ARCH_X86 || ARCH_X86_64 diff --git a/vp8/common/idct_blk.c b/vp8/common/idct_blk.c index 0b058c76a..8edfffbed 100644 --- a/vp8/common/idct_blk.c +++ b/vp8/common/idct_blk.c @@ -9,7 +9,7 @@ */ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *dest, int stride); diff --git a/vp8/common/invtrans.h b/vp8/common/invtrans.h index d048665b9..9262640d5 100644 --- a/vp8/common/invtrans.h +++ b/vp8/common/invtrans.h @@ -13,7 +13,7 @@ #define __INC_INVTRANS_H #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "blockd.h" #include "onyxc_int.h" diff --git a/vp8/common/loopfilter.c b/vp8/common/loopfilter.c index 41b4f1214..2b1ee851b 100644 --- a/vp8/common/loopfilter.c +++ b/vp8/common/loopfilter.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "loopfilter.h" #include "onyxc_int.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp8/common/loopfilter.h b/vp8/common/loopfilter.h index b3af2d650..1e47f3490 100644 --- a/vp8/common/loopfilter.h +++ b/vp8/common/loopfilter.h @@ -14,7 +14,7 @@ #include "vpx_ports/mem.h" #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #define MAX_LOOP_FILTER 63 /* fraction of total macroblock rows to be used in fast filter level picking */ diff --git a/vp8/common/mfqe.c b/vp8/common/mfqe.c index 3dff1505b..8a8f92f68 100644 --- a/vp8/common/mfqe.c +++ b/vp8/common/mfqe.c @@ -20,7 +20,7 @@ #include "postproc.h" #include "variance.h" #include "vpx_mem/vpx_mem.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vpx_scale/yv12config.h" #include <limits.h> diff --git a/vp8/common/mips/dspr2/dequantize_dspr2.c b/vp8/common/mips/dspr2/dequantize_dspr2.c index 682332573..619ee808d 100644 --- a/vp8/common/mips/dspr2/dequantize_dspr2.c +++ b/vp8/common/mips/dspr2/dequantize_dspr2.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vpx_mem/vpx_mem.h" #if HAVE_DSPR2 diff --git a/vp8/common/mips/dspr2/filter_dspr2.c b/vp8/common/mips/dspr2/filter_dspr2.c index 71fdcd715..ace5d400c 100644 --- a/vp8/common/mips/dspr2/filter_dspr2.c +++ b/vp8/common/mips/dspr2/filter_dspr2.c @@ -10,7 +10,7 @@ #include <stdlib.h> -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vpx_ports/mem.h" #if HAVE_DSPR2 diff --git a/vp8/common/mips/dspr2/idct_blk_dspr2.c b/vp8/common/mips/dspr2/idct_blk_dspr2.c index 1e0ebd161..ab938cd6a 100644 --- a/vp8/common/mips/dspr2/idct_blk_dspr2.c +++ b/vp8/common/mips/dspr2/idct_blk_dspr2.c @@ -9,7 +9,7 @@ */ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #if HAVE_DSPR2 diff --git a/vp8/common/mips/dspr2/idctllm_dspr2.c b/vp8/common/mips/dspr2/idctllm_dspr2.c index 25b793643..2eff71069 100644 --- a/vp8/common/mips/dspr2/idctllm_dspr2.c +++ b/vp8/common/mips/dspr2/idctllm_dspr2.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #if HAVE_DSPR2 #define CROP_WIDTH 256 diff --git a/vp8/common/mips/dspr2/loopfilter_filters_dspr2.c b/vp8/common/mips/dspr2/loopfilter_filters_dspr2.c index b8e5e4d07..9ae6bc8f9 100644 --- a/vp8/common/mips/dspr2/loopfilter_filters_dspr2.c +++ b/vp8/common/mips/dspr2/loopfilter_filters_dspr2.c @@ -10,7 +10,7 @@ #include <stdlib.h> -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vp8/common/onyxc_int.h" #if HAVE_DSPR2 diff --git a/vp8/common/mips/dspr2/reconinter_dspr2.c b/vp8/common/mips/dspr2/reconinter_dspr2.c index a5239a3c8..a14b397d8 100644 --- a/vp8/common/mips/dspr2/reconinter_dspr2.c +++ b/vp8/common/mips/dspr2/reconinter_dspr2.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vpx/vpx_integer.h" #if HAVE_DSPR2 diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index 5325bace4..03c97187a 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h @@ -13,7 +13,7 @@ #define __INC_VP8C_INT_H #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vpx/internal/vpx_codec_internal.h" #include "loopfilter.h" #include "entropymv.h" diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c index 80fa530ed..c6442c92e 100644 --- a/vp8/common/postproc.c +++ b/vp8/common/postproc.c @@ -10,7 +10,8 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" +#include "vpx_scale_rtcd.h" #include "vpx_scale/yv12config.h" #include "postproc.h" #include "common.h" diff --git a/vp8/common/reconinter.c b/vp8/common/reconinter.c index 3da3bc74f..43f84d01b 100644 --- a/vp8/common/reconinter.c +++ b/vp8/common/reconinter.c @@ -11,7 +11,7 @@ #include <limits.h> #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vpx/vpx_integer.h" #include "blockd.h" #include "reconinter.h" diff --git a/vp8/common/reconintra.c b/vp8/common/reconintra.c index 4067a6851..a85121579 100644 --- a/vp8/common/reconintra.c +++ b/vp8/common/reconintra.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vpx_mem/vpx_mem.h" #include "blockd.h" diff --git a/vp8/common/reconintra4x4.c b/vp8/common/reconintra4x4.c index 7bb8d0ac1..3d4f2c404 100644 --- a/vp8/common/reconintra4x4.c +++ b/vp8/common/reconintra4x4.c @@ -10,17 +10,17 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "blockd.h" void vp8_intra4x4_predict_c(unsigned char *Above, unsigned char *yleft, int left_stride, - B_PREDICTION_MODE b_mode, + int _b_mode, unsigned char *dst, int dst_stride, unsigned char top_left) { int i, r, c; - + B_PREDICTION_MODE b_mode = (B_PREDICTION_MODE)_b_mode; unsigned char Left[4]; Left[0] = yleft[0]; Left[1] = yleft[left_stride]; diff --git a/vp8/common/rtcd.c b/vp8/common/rtcd.c index 01dad4691..0b371b094 100644 --- a/vp8/common/rtcd.c +++ b/vp8/common/rtcd.c @@ -9,97 +9,13 @@ */ #include "vpx_config.h" #define RTCD_C -#include "vpx_rtcd.h" - -#if CONFIG_MULTITHREAD && defined(_WIN32) -#include <windows.h> -#include <stdlib.h> -static void once(void (*func)(void)) -{ - static CRITICAL_SECTION *lock; - static LONG waiters; - static int done; - void *lock_ptr = &lock; - - /* If the initialization is complete, return early. This isn't just an - * optimization, it prevents races on the destruction of the global - * lock. - */ - if(done) - return; - - InterlockedIncrement(&waiters); - - /* Get a lock. We create one and try to make it the one-true-lock, - * throwing it away if we lost the race. - */ - - { - /* Scope to protect access to new_lock */ - CRITICAL_SECTION *new_lock = malloc(sizeof(CRITICAL_SECTION)); - InitializeCriticalSection(new_lock); - if (InterlockedCompareExchangePointer(lock_ptr, new_lock, NULL) != NULL) - { - DeleteCriticalSection(new_lock); - free(new_lock); - } - } - - /* At this point, we have a lock that can be synchronized on. We don't - * care which thread actually performed the allocation. - */ - - EnterCriticalSection(lock); - - if (!done) - { - func(); - done = 1; - } - - LeaveCriticalSection(lock); - - /* Last one out should free resources. The destructed objects are - * protected by checking if(done) above. - */ - if(!InterlockedDecrement(&waiters)) - { - DeleteCriticalSection(lock); - free(lock); - lock = NULL; - } -} - - -#elif CONFIG_MULTITHREAD && HAVE_PTHREAD_H -#include <pthread.h> -static void once(void (*func)(void)) -{ - static pthread_once_t lock = PTHREAD_ONCE_INIT; - pthread_once(&lock, func); -} - - -#else -/* No-op version that performs no synchronization. vpx_rtcd() is idempotent, - * so as long as your platform provides atomic loads/stores of pointers - * no synchronization is strictly necessary. - */ - -static void once(void (*func)(void)) -{ - static int done; - - if(!done) - { - func(); - done = 1; - } -} -#endif +#include "vp8_rtcd.h" +#include "vpx_ports/vpx_once.h" +extern void vpx_scale_rtcd(void); -void vpx_rtcd() +void vp8_rtcd() { + vpx_scale_rtcd(); once(setup_rtcd_internal); } diff --git a/vp8/common/rtcd_defs.sh b/vp8/common/rtcd_defs.sh index 0f950f8ab..4eb96b743 100644 --- a/vp8/common/rtcd_defs.sh +++ b/vp8/common/rtcd_defs.sh @@ -1,6 +1,8 @@ -common_forward_decls() { +vp8_common_forward_decls() { cat <<EOF -#include "vp8/common/blockd.h" +/* + * VP8 + */ struct blockd; struct macroblockd; @@ -14,7 +16,7 @@ union int_mv; struct yv12_buffer_config; EOF } -forward_decls common_forward_decls +forward_decls vp8_common_forward_decls # # Dequant @@ -146,7 +148,7 @@ specialize vp8_build_intra_predictors_mby_s sse2 ssse3 prototype void vp8_build_intra_predictors_mbuv_s "struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride" specialize vp8_build_intra_predictors_mbuv_s sse2 ssse3 -prototype void vp8_intra4x4_predict "unsigned char *Above, unsigned char *yleft, int left_stride, B_PREDICTION_MODE b_mode, unsigned char *dst, int dst_stride, unsigned char top_left" +prototype void vp8_intra4x4_predict "unsigned char *Above, unsigned char *yleft, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left" specialize vp8_intra4x4_predict media vp8_intra4x4_predict_media=vp8_intra4x4_predict_armv6 @@ -530,39 +532,3 @@ fi # End of encoder only functions fi - -# Scaler functions -if [ "CONFIG_SPATIAL_RESAMPLING" != "yes" ]; then - prototype void vp8_horizontal_line_4_5_scale "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width" - prototype void vp8_vertical_band_4_5_scale "unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" - prototype void vp8_last_vertical_band_4_5_scale "unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" - prototype void vp8_horizontal_line_2_3_scale "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width" - prototype void vp8_vertical_band_2_3_scale "unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" - prototype void vp8_last_vertical_band_2_3_scale "unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" - prototype void vp8_horizontal_line_3_5_scale "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width" - prototype void vp8_vertical_band_3_5_scale "unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" - prototype void vp8_last_vertical_band_3_5_scale "unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" - prototype void vp8_horizontal_line_3_4_scale "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width" - prototype void vp8_vertical_band_3_4_scale "unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" - prototype void vp8_last_vertical_band_3_4_scale "unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" - prototype void vp8_horizontal_line_1_2_scale "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width" - prototype void vp8_vertical_band_1_2_scale "unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" - prototype void vp8_last_vertical_band_1_2_scale "unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" - prototype void vp8_horizontal_line_5_4_scale "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width" - prototype void vp8_vertical_band_5_4_scale "unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" - prototype void vp8_horizontal_line_5_3_scale "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width" - prototype void vp8_vertical_band_5_3_scale "unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" - prototype void vp8_horizontal_line_2_1_scale "const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width" - prototype void vp8_vertical_band_2_1_scale "unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" - prototype void vp8_vertical_band_2_1_scale_i "unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width" -fi - -prototype void vp8_yv12_extend_frame_borders "struct yv12_buffer_config *ybf" -specialize vp8_yv12_extend_frame_borders neon - -prototype void vp8_yv12_copy_frame "struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc" -specialize vp8_yv12_copy_frame neon - -prototype void vp8_yv12_copy_y "struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc" -specialize vp8_yv12_copy_y neon - diff --git a/vp8/common/x86/idct_blk_mmx.c b/vp8/common/x86/idct_blk_mmx.c index 4adf3f5f9..49b2013ae 100644 --- a/vp8/common/x86/idct_blk_mmx.c +++ b/vp8/common/x86/idct_blk_mmx.c @@ -9,7 +9,7 @@ */ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vp8/common/blockd.h" extern void vp8_dequantize_b_impl_mmx(short *sq, short *dq, short *q); diff --git a/vp8/common/x86/idct_blk_sse2.c b/vp8/common/x86/idct_blk_sse2.c index 056e05215..ae96ec858 100644 --- a/vp8/common/x86/idct_blk_sse2.c +++ b/vp8/common/x86/idct_blk_sse2.c @@ -9,7 +9,7 @@ */ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" void vp8_idct_dequant_0_2x_sse2 (short *q, short *dq , diff --git a/vp8/common/x86/recon_wrapper_sse2.c b/vp8/common/x86/recon_wrapper_sse2.c index b482faa3f..65f4251a9 100644 --- a/vp8/common/x86/recon_wrapper_sse2.c +++ b/vp8/common/x86/recon_wrapper_sse2.c @@ -9,7 +9,7 @@ */ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vpx_mem/vpx_mem.h" #include "vp8/common/blockd.h" diff --git a/vp8/common/x86/vp8_asm_stubs.c b/vp8/common/x86/vp8_asm_stubs.c index 3437a2367..c0416b7e6 100644 --- a/vp8/common/x86/vp8_asm_stubs.c +++ b/vp8/common/x86/vp8_asm_stubs.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vpx_ports/mem.h" #include "filter_x86.h" diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index a4a00f6bf..a22f37246 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -10,7 +10,8 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" +#include "./vpx_scale_rtcd.h" #include "onyxd_int.h" #include "vp8/common/header.h" #include "vp8/common/reconintra4x4.h" diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index 8d6871b3d..459e34e06 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -25,6 +25,7 @@ #include <assert.h> #include "vp8/common/quant_common.h" +#include "./vpx_scale_rtcd.h" #include "vpx_scale/vpxscale.h" #include "vp8/common/systemdependent.h" #include "vpx_ports/vpx_timer.h" diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index e52a707c0..a714856b0 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #if !defined(WIN32) && CONFIG_OS_SUPPORT == 1 # include <unistd.h> #endif diff --git a/vp8/encoder/arm/dct_arm.c b/vp8/encoder/arm/dct_arm.c index af0fb274e..f71300d2c 100644 --- a/vp8/encoder/arm/dct_arm.c +++ b/vp8/encoder/arm/dct_arm.c @@ -9,7 +9,7 @@ */ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #if HAVE_MEDIA diff --git a/vp8/encoder/arm/quantize_arm.c b/vp8/encoder/arm/quantize_arm.c index 8999e347f..80d9ad054 100644 --- a/vp8/encoder/arm/quantize_arm.c +++ b/vp8/encoder/arm/quantize_arm.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vp8/encoder/block.h" #include <math.h> #include "vpx_mem/vpx_mem.h" diff --git a/vp8/encoder/denoising.c b/vp8/encoder/denoising.c index c0dd7c106..98526d640 100644 --- a/vp8/encoder/denoising.c +++ b/vp8/encoder/denoising.c @@ -13,7 +13,7 @@ #include "vp8/common/reconinter.h" #include "vpx/vpx_integer.h" #include "vpx_mem/vpx_mem.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" static const unsigned int NOISE_MOTION_THRESHOLD = 25 * 25; /* SSE_DIFF_THRESHOLD is selected as ~95% confidence assuming diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c index 340dd638d..cfa4cb927 100644 --- a/vp8/encoder/encodeintra.c +++ b/vp8/encoder/encodeintra.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "quantize.h" #include "vp8/common/reconintra4x4.h" #include "encodemb.h" diff --git a/vp8/encoder/encodemb.c b/vp8/encoder/encodemb.c index 7d494f2c6..7ed2fe1a1 100644 --- a/vp8/encoder/encodemb.c +++ b/vp8/encoder/encodemb.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "encodemb.h" #include "vp8/common/reconinter.h" #include "quantize.h" diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c index b668c8f3b..e5306a425 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -12,6 +12,7 @@ #include <limits.h> #include <stdio.h> +#include "./vpx_scale_rtcd.h" #include "block.h" #include "onyx_int.h" #include "vp8/common/variance.h" diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 4235662f1..e7d22701e 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -10,6 +10,7 @@ #include "vpx_config.h" +#include "./vpx_scale_rtcd.h" #include "vp8/common/onyxc_int.h" #include "vp8/common/blockd.h" #include "onyx_int.h" diff --git a/vp8/encoder/picklpf.c b/vp8/encoder/picklpf.c index 4121349a9..8114ec33a 100644 --- a/vp8/encoder/picklpf.c +++ b/vp8/encoder/picklpf.c @@ -9,6 +9,7 @@ */ +#include "./vpx_scale_rtcd.h" #include "vp8/common/onyxc_int.h" #include "onyx_int.h" #include "quantize.h" diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 28d5c1ee8..946d22a8f 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -14,7 +14,7 @@ #include <limits.h> #include <assert.h> #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vp8/common/pragmas.h" #include "tokenize.h" #include "treewriter.h" diff --git a/vp8/encoder/x86/denoising_sse2.c b/vp8/encoder/x86/denoising_sse2.c index c1ac6c137..87cccaa66 100644 --- a/vp8/encoder/x86/denoising_sse2.c +++ b/vp8/encoder/x86/denoising_sse2.c @@ -12,7 +12,7 @@ #include "vp8/common/reconinter.h" #include "vpx/vpx_integer.h" #include "vpx_mem/vpx_mem.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include <emmintrin.h> diff --git a/vp8/encoder/x86/vp8_enc_stubs_mmx.c b/vp8/encoder/x86/vp8_enc_stubs_mmx.c index da25f5227..cf3d8ca4a 100644 --- a/vp8/encoder/x86/vp8_enc_stubs_mmx.c +++ b/vp8/encoder/x86/vp8_enc_stubs_mmx.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vpx_ports/x86.h" #include "vp8/encoder/block.h" diff --git a/vp8/encoder/x86/vp8_enc_stubs_sse2.c b/vp8/encoder/x86/vp8_enc_stubs_sse2.c index 68db8155a..3dfbee368 100644 --- a/vp8/encoder/x86/vp8_enc_stubs_sse2.c +++ b/vp8/encoder/x86/vp8_enc_stubs_sse2.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vpx_ports/x86.h" #include "vp8/encoder/block.h" diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index d54c2330c..2f73420a5 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -194,3 +194,5 @@ VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_subpixelvariance16x16s_neon $(eval $(call asm_offsets_template,\ vp8_asm_com_offsets.asm, $(VP8_PREFIX)common/asm_com_offsets.c)) + +$(eval $(call rtcd_h_template,vp8_rtcd,vp8/common/rtcd_defs.sh)) diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index eeac3a8b1..83eecba5c 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -9,7 +9,7 @@ */ -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vpx/vpx_codec.h" #include "vpx/internal/vpx_codec_internal.h" #include "vpx_version.h" @@ -582,7 +582,7 @@ static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx, struct VP8_COMP *optr; - vpx_rtcd(); + vp8_rtcd(); if (!ctx->priv) { diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c index c13d69783..01482fcc7 100644 --- a/vp8/vp8_dx_iface.c +++ b/vp8/vp8_dx_iface.c @@ -11,7 +11,7 @@ #include <stdlib.h> #include <string.h> -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #include "vpx/vpx_decoder.h" #include "vpx/vp8dx.h" #include "vpx/internal/vpx_codec_internal.h" @@ -194,7 +194,7 @@ static vpx_codec_err_t vp8_init(vpx_codec_ctx_t *ctx, vpx_codec_err_t res = VPX_CODEC_OK; (void) data; - vpx_rtcd(); + vp8_rtcd(); /* This function only allocates space for the vpx_codec_alg_priv_t * structure. More memory may be required at the time the stream |