diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/libvpx_srcs.txt | 7 | ||||
| -rw-r--r-- | generic/vp9_rtcd.h | 85 | ||||
| -rw-r--r-- | generic/vpx_config.h | 3 | ||||
| -rw-r--r-- | generic/vpx_version.h | 6 |
4 files changed, 39 insertions, 62 deletions
diff --git a/generic/libvpx_srcs.txt b/generic/libvpx_srcs.txt index 8e6fad7..e07d5af 100644 --- a/generic/libvpx_srcs.txt +++ b/generic/libvpx_srcs.txt @@ -174,9 +174,10 @@ vp9/common/vp9_rtcd_defs.sh vp9/common/vp9_sadmxn.h vp9/common/vp9_scale.c vp9/common/vp9_scale.h +vp9/common/vp9_scan.c +vp9/common/vp9_scan.h vp9/common/vp9_seg_common.c vp9/common/vp9_seg_common.h -vp9/common/vp9_subpelvar.h vp9/common/vp9_systemdependent.h vp9/common/vp9_textblit.h vp9/common/vp9_tile_common.c @@ -193,8 +194,6 @@ vp9/decoder/vp9_detokenize.c vp9/decoder/vp9_detokenize.h vp9/decoder/vp9_dsubexp.c vp9/decoder/vp9_dsubexp.h -vp9/decoder/vp9_idct_blk.c -vp9/decoder/vp9_idct_blk.h vp9/decoder/vp9_onyxd.h vp9/decoder/vp9_onyxd_if.c vp9/decoder/vp9_onyxd_int.h @@ -236,8 +235,6 @@ vpx/vp8cx.h vpx/vp8dx.h vpx/vp8.h vpx/vpx_codec.h -vpx/vpx_codec_impl_bottom.h -vpx/vpx_codec_impl_top.h vpx/vpx_codec.mk vpx/vpx_decoder.h vpx/vpx_encoder.h diff --git a/generic/vp9_rtcd.h b/generic/vp9_rtcd.h index 4dcc1f6..d9e1b0b 100644 --- a/generic/vp9_rtcd.h +++ b/generic/vp9_rtcd.h @@ -24,18 +24,6 @@ struct vp9_variance_vtable; union int_mv; struct yv12_buffer_config; -void vp9_idct_add_16x16_c(int16_t *input, uint8_t *dest, int stride, int eob); -#define vp9_idct_add_16x16 vp9_idct_add_16x16_c - -void vp9_idct_add_8x8_c(int16_t *input, uint8_t *dest, int stride, int eob); -#define vp9_idct_add_8x8 vp9_idct_add_8x8_c - -void vp9_idct_add_c(int16_t *input, uint8_t *dest, int stride, int eob); -#define vp9_idct_add vp9_idct_add_c - -void vp9_idct_add_32x32_c(int16_t *q, uint8_t *dst, int stride, int eob); -#define vp9_idct_add_32x32 vp9_idct_add_32x32_c - void vp9_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define vp9_d207_predictor_4x4 vp9_d207_predictor_4x4_c @@ -192,15 +180,6 @@ void vp9_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8 void vp9_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define vp9_dc_128_predictor_32x32 vp9_dc_128_predictor_32x32_c -void vp9_add_constant_residual_8x8_c(const int16_t diff, uint8_t *dest, int stride); -#define vp9_add_constant_residual_8x8 vp9_add_constant_residual_8x8_c - -void vp9_add_constant_residual_16x16_c(const int16_t diff, uint8_t *dest, int stride); -#define vp9_add_constant_residual_16x16 vp9_add_constant_residual_16x16_c - -void vp9_add_constant_residual_32x32_c(const int16_t diff, uint8_t *dest, int stride); -#define vp9_add_constant_residual_32x32 vp9_add_constant_residual_32x32_c - void vp9_mb_lpf_vertical_edge_w_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); #define vp9_mb_lpf_vertical_edge_w vp9_mb_lpf_vertical_edge_w_c @@ -252,53 +231,53 @@ void vp9_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t void vp9_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); #define vp9_convolve8_avg_vert vp9_convolve8_avg_vert_c -void vp9_short_idct4x4_1_add_c(int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_short_idct4x4_1_add vp9_short_idct4x4_1_add_c +void vp9_idct4x4_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct4x4_1_add vp9_idct4x4_1_add_c -void vp9_short_idct4x4_add_c(int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_short_idct4x4_add vp9_short_idct4x4_add_c +void vp9_idct4x4_16_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct4x4_16_add vp9_idct4x4_16_add_c -void vp9_short_idct8x8_1_add_c(int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_short_idct8x8_1_add vp9_short_idct8x8_1_add_c +void vp9_idct8x8_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct8x8_1_add vp9_idct8x8_1_add_c -void vp9_short_idct8x8_add_c(int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_short_idct8x8_add vp9_short_idct8x8_add_c +void vp9_idct8x8_64_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct8x8_64_add vp9_idct8x8_64_add_c -void vp9_short_idct10_8x8_add_c(int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_short_idct10_8x8_add vp9_short_idct10_8x8_add_c +void vp9_idct8x8_10_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct8x8_10_add vp9_idct8x8_10_add_c -void vp9_short_idct16x16_1_add_c(int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_short_idct16x16_1_add vp9_short_idct16x16_1_add_c +void vp9_idct16x16_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct16x16_1_add vp9_idct16x16_1_add_c -void vp9_short_idct16x16_add_c(int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_short_idct16x16_add vp9_short_idct16x16_add_c +void vp9_idct16x16_256_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct16x16_256_add vp9_idct16x16_256_add_c -void vp9_short_idct10_16x16_add_c(int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_short_idct10_16x16_add vp9_short_idct10_16x16_add_c +void vp9_idct16x16_10_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct16x16_10_add vp9_idct16x16_10_add_c -void vp9_short_idct32x32_add_c(int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_short_idct32x32_add vp9_short_idct32x32_add_c +void vp9_idct32x32_1024_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct32x32_1024_add vp9_idct32x32_1024_add_c -void vp9_short_idct1_32x32_c(int16_t *input, int16_t *output); -#define vp9_short_idct1_32x32 vp9_short_idct1_32x32_c +void vp9_idct32x32_34_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct32x32_34_add vp9_idct32x32_34_add_c -void vp9_short_iht4x4_add_c(int16_t *input, uint8_t *dest, int dest_stride, int tx_type); -#define vp9_short_iht4x4_add vp9_short_iht4x4_add_c +void vp9_idct32x32_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct32x32_1_add vp9_idct32x32_1_add_c -void vp9_short_iht8x8_add_c(int16_t *input, uint8_t *dest, int dest_stride, int tx_type); -#define vp9_short_iht8x8_add vp9_short_iht8x8_add_c +void vp9_iht4x4_16_add_c(const int16_t *input, uint8_t *dest, int dest_stride, int tx_type); +#define vp9_iht4x4_16_add vp9_iht4x4_16_add_c -void vp9_short_iht16x16_add_c(int16_t *input, uint8_t *output, int pitch, int tx_type); -#define vp9_short_iht16x16_add vp9_short_iht16x16_add_c +void vp9_iht8x8_64_add_c(const int16_t *input, uint8_t *dest, int dest_stride, int tx_type); +#define vp9_iht8x8_64_add vp9_iht8x8_64_add_c -void vp9_idct4_1d_c(int16_t *input, int16_t *output); -#define vp9_idct4_1d vp9_idct4_1d_c +void vp9_iht16x16_256_add_c(const int16_t *input, uint8_t *output, int pitch, int tx_type); +#define vp9_iht16x16_256_add vp9_iht16x16_256_add_c -void vp9_short_iwalsh4x4_1_add_c(int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_short_iwalsh4x4_1_add vp9_short_iwalsh4x4_1_add_c +void vp9_iwht4x4_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_iwht4x4_1_add vp9_iwht4x4_1_add_c -void vp9_short_iwalsh4x4_add_c(int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_short_iwalsh4x4_add vp9_short_iwalsh4x4_add_c +void vp9_iwht4x4_16_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_iwht4x4_16_add vp9_iwht4x4_16_add_c void vp9_rtcd(void); #include "vpx_config.h" diff --git a/generic/vpx_config.h b/generic/vpx_config.h index c856d4d..5bcd08f 100644 --- a/generic/vpx_config.h +++ b/generic/vpx_config.h @@ -27,6 +27,8 @@ #define HAVE_SSE3 0 #define HAVE_SSSE3 0 #define HAVE_SSE4_1 0 +#define HAVE_AVX 0 +#define HAVE_AVX2 0 #define HAVE_ALTIVEC 0 #define HAVE_VPX_PORTS 1 #define HAVE_STDINT_H 1 @@ -85,7 +87,6 @@ #define CONFIG_TEMPORAL_DENOISING 1 #define CONFIG_EXPERIMENTAL 0 #define CONFIG_DECRYPT 0 -#define CONFIG_ONESHOTQ 0 #define CONFIG_MULTIPLE_ARF 0 #define CONFIG_NON420 0 #define CONFIG_ALPHA 0 diff --git a/generic/vpx_version.h b/generic/vpx_version.h index 512851c..d3359dc 100644 --- a/generic/vpx_version.h +++ b/generic/vpx_version.h @@ -1,7 +1,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_PATCH 0 -#define VERSION_EXTRA "" +#define VERSION_EXTRA "4989-gabdefea" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.2.0" -#define VERSION_STRING " v1.2.0" +#define VERSION_STRING_NOSP "v1.2.0-4989-gabdefea" +#define VERSION_STRING " v1.2.0-4989-gabdefea" |