diff options
author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-08-15 09:32:37 -0700 |
---|---|---|
committer | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-08-15 09:32:37 -0700 |
commit | ba6c59e9d7d7013b3906b6f4230b663422681848 (patch) | |
tree | fd3686d3a1a5598e6ea35b0006cfeb5d40a9eaa3 /generic | |
parent | bbeabeb879e7fa51c6395ee7ad590617dfbd5299 (diff) | |
download | android_external_libvpx-ba6c59e9d7d7013b3906b6f4230b663422681848.tar.gz android_external_libvpx-ba6c59e9d7d7013b3906b6f4230b663422681848.tar.bz2 android_external_libvpx-ba6c59e9d7d7013b3906b6f4230b663422681848.zip |
libvpx: Pull from upstream
Upstream hash: d4a47a6cc0d869bea3071c15bc61da6836026d0b
Pull latest libvpx from upstream. This fixes a few vp9 encoder bugs and
includes some optimizations. Also fixes a couple of configure flags in
x86 to be consistent with the rest.
Change-Id: Ic58e0b03cce832571a35ec73eec559cdf881d1f5
Diffstat (limited to 'generic')
-rw-r--r-- | generic/libvpx_srcs.txt | 16 | ||||
-rw-r--r-- | generic/vp8_rtcd.h | 5 | ||||
-rw-r--r-- | generic/vp9_rtcd.h | 132 | ||||
-rw-r--r-- | generic/vpx_config.h | 13 | ||||
-rw-r--r-- | generic/vpx_version.h | 6 |
5 files changed, 82 insertions, 90 deletions
diff --git a/generic/libvpx_srcs.txt b/generic/libvpx_srcs.txt index 2ab571e..0e70976 100644 --- a/generic/libvpx_srcs.txt +++ b/generic/libvpx_srcs.txt @@ -39,7 +39,6 @@ vp8/common/onyxc_int.h vp8/common/onyxd.h vp8/common/onyx.h vp8/common/ppflags.h -vp8/common/pragmas.h vp8/common/quant_common.c vp8/common/quant_common.h vp8/common/reconinter.c @@ -154,7 +153,6 @@ vp9/common/vp9_mvref_common.c vp9/common/vp9_mvref_common.h vp9/common/vp9_onyxc_int.h vp9/common/vp9_ppflags.h -vp9/common/vp9_pragmas.h vp9/common/vp9_pred_common.c vp9/common/vp9_pred_common.h vp9/common/vp9_prob.c @@ -175,6 +173,8 @@ vp9/common/vp9_seg_common.c vp9/common/vp9_seg_common.h vp9/common/vp9_systemdependent.h vp9/common/vp9_textblit.h +vp9/common/vp9_thread.c +vp9/common/vp9_thread.h vp9/common/vp9_tile_common.c vp9/common/vp9_tile_common.h vp9/decoder/vp9_decodeframe.c @@ -193,8 +193,6 @@ vp9/decoder/vp9_read_bit_buffer.c vp9/decoder/vp9_read_bit_buffer.h vp9/decoder/vp9_reader.c vp9/decoder/vp9_reader.h -vp9/decoder/vp9_thread.c -vp9/decoder/vp9_thread.h vp9/encoder/vp9_aq_complexity.c vp9/encoder/vp9_aq_complexity.h vp9/encoder/vp9_aq_cyclicrefresh.c @@ -204,6 +202,8 @@ vp9/encoder/vp9_aq_variance.h vp9/encoder/vp9_bitstream.c vp9/encoder/vp9_bitstream.h vp9/encoder/vp9_block.h +vp9/encoder/vp9_context_tree.c +vp9/encoder/vp9_context_tree.h vp9/encoder/vp9_cost.c vp9/encoder/vp9_cost.h vp9/encoder/vp9_dct.c @@ -213,6 +213,8 @@ vp9/encoder/vp9_encodemb.c vp9/encoder/vp9_encodemb.h vp9/encoder/vp9_encodemv.c vp9/encoder/vp9_encodemv.h +vp9/encoder/vp9_encoder.c +vp9/encoder/vp9_encoder.h vp9/encoder/vp9_extend.c vp9/encoder/vp9_extend.h vp9/encoder/vp9_firstpass.c @@ -223,8 +225,6 @@ vp9/encoder/vp9_mbgraph.c vp9/encoder/vp9_mbgraph.h vp9/encoder/vp9_mcomp.c vp9/encoder/vp9_mcomp.h -vp9/encoder/vp9_onyx_if.c -vp9/encoder/vp9_onyx_int.h vp9/encoder/vp9_picklpf.c vp9/encoder/vp9_picklpf.h vp9/encoder/vp9_pickmode.c @@ -233,6 +233,8 @@ vp9/encoder/vp9_quantize.c vp9/encoder/vp9_quantize.h vp9/encoder/vp9_ratectrl.c vp9/encoder/vp9_ratectrl.h +vp9/encoder/vp9_rd.c +vp9/encoder/vp9_rd.h vp9/encoder/vp9_rdopt.c vp9/encoder/vp9_rdopt.h vp9/encoder/vp9_resize.c @@ -289,13 +291,11 @@ vpx_scale/vpx_scale.mk vpx_scale/vpx_scale_rtcd.c vpx_scale/vpx_scale_rtcd.pl vpx_scale/yv12config.h -vpx/src/svc_encodeframe.c vpx/src/vpx_codec.c vpx/src/vpx_decoder.c vpx/src/vpx_encoder.c vpx/src/vpx_image.c vpx/src/vpx_psnr.c -vpx/svc_context.h vpx/vp8cx.h vpx/vp8dx.h vpx/vp8.h diff --git a/generic/vp8_rtcd.h b/generic/vp8_rtcd.h index 9e8dc5f..45ba8fa 100644 --- a/generic/vp8_rtcd.h +++ b/generic/vp8_rtcd.h @@ -62,9 +62,12 @@ void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, in void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride); #define vp8_dc_only_idct_add vp8_dc_only_idct_add_c -int vp8_denoiser_filter_c(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); #define vp8_denoiser_filter vp8_denoiser_filter_c +int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising); +#define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_c + void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); #define vp8_dequant_idct_add vp8_dequant_idct_add_c diff --git a/generic/vp9_rtcd.h b/generic/vp9_rtcd.h index 03e7181..c2df3fb 100644 --- a/generic/vp9_rtcd.h +++ b/generic/vp9_rtcd.h @@ -23,8 +23,7 @@ struct macroblockd; /* Encoder forward decls */ struct macroblock; struct vp9_variance_vtable; - -#define DEC_MVCOSTS int *mvjcost, int *mvcost[2] +struct search_site_config; struct mv; union int_mv; struct yv12_buffer_config; @@ -185,24 +184,36 @@ void vp9_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t void vp9_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define vp9_dc_top_predictor_8x8 vp9_dc_top_predictor_8x8_c -int vp9_diamond_search_sad_c(const struct macroblock *x, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, const struct mv *center_mv); +int vp9_diamond_search_sad_c(const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv); #define vp9_diamond_search_sad vp9_diamond_search_sad_c void vp9_fdct16x16_c(const int16_t *input, int16_t *output, int stride); #define vp9_fdct16x16 vp9_fdct16x16_c +void vp9_fdct16x16_1_c(const int16_t *input, int16_t *output, int stride); +#define vp9_fdct16x16_1 vp9_fdct16x16_1_c + void vp9_fdct32x32_c(const int16_t *input, int16_t *output, int stride); #define vp9_fdct32x32 vp9_fdct32x32_c +void vp9_fdct32x32_1_c(const int16_t *input, int16_t *output, int stride); +#define vp9_fdct32x32_1 vp9_fdct32x32_1_c + void vp9_fdct32x32_rd_c(const int16_t *input, int16_t *output, int stride); #define vp9_fdct32x32_rd vp9_fdct32x32_rd_c void vp9_fdct4x4_c(const int16_t *input, int16_t *output, int stride); #define vp9_fdct4x4 vp9_fdct4x4_c +void vp9_fdct4x4_1_c(const int16_t *input, int16_t *output, int stride); +#define vp9_fdct4x4_1 vp9_fdct4x4_1_c + void vp9_fdct8x8_c(const int16_t *input, int16_t *output, int stride); #define vp9_fdct8x8 vp9_fdct8x8_c +void vp9_fdct8x8_1_c(const int16_t *input, int16_t *output, int stride); +#define vp9_fdct8x8_1 vp9_fdct8x8_1_c + void vp9_fht16x16_c(const int16_t *input, int16_t *output, int stride, int tx_type); #define vp9_fht16x16 vp9_fht16x16_c @@ -212,23 +223,23 @@ void vp9_fht4x4_c(const int16_t *input, int16_t *output, int stride, int tx_type void vp9_fht8x8_c(const int16_t *input, int16_t *output, int stride, int tx_type); #define vp9_fht8x8 vp9_fht8x8_c -int vp9_full_range_search_c(const struct macroblock *x, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, const struct mv *center_mv); +int vp9_full_range_search_c(const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv); #define vp9_full_range_search vp9_full_range_search_c -int vp9_full_search_sad_c(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, const struct mv *center_mv, struct mv *best_mv); +int vp9_full_search_sad_c(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv); #define vp9_full_search_sad vp9_full_search_sad_c void vp9_fwht4x4_c(const int16_t *input, int16_t *output, int stride); #define vp9_fwht4x4 vp9_fwht4x4_c -unsigned int vp9_get_mb_ss_c(const int16_t *); -#define vp9_get_mb_ss vp9_get_mb_ss_c +void vp9_get16x16var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum); +#define vp9_get16x16var vp9_get16x16var_c -void vp9_get_sse_sum_16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum); -#define vp9_get_sse_sum_16x16 vp9_get_sse_sum_16x16_c +void vp9_get8x8var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum); +#define vp9_get8x8var vp9_get8x8var_c -void vp9_get_sse_sum_8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum); -#define vp9_get_sse_sum_8x8 vp9_get_sse_sum_8x8_c +unsigned int vp9_get_mb_ss_c(const int16_t *); +#define vp9_get_mb_ss vp9_get_mb_ss_c void vp9_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define vp9_h_predictor_16x16 vp9_h_predictor_16x16_c @@ -266,8 +277,8 @@ void vp9_idct4x4_16_add_c(const int16_t *input, uint8_t *dest, int dest_stride); 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_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_idct8x8_12_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct8x8_12_add vp9_idct8x8_12_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 @@ -341,13 +352,19 @@ void vp9_quantize_b_c(const int16_t *coeff_ptr, intptr_t n_coeffs, int skip_bloc void vp9_quantize_b_32x32_c(const int16_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); #define vp9_quantize_b_32x32 vp9_quantize_b_32x32_c -int vp9_refining_search_sad_c(const struct macroblock *x, struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, const struct mv *center_mv); +void vp9_quantize_fp_c(const int16_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); +#define vp9_quantize_fp vp9_quantize_fp_c + +void vp9_quantize_fp_32x32_c(const int16_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); +#define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c + +int vp9_refining_search_sad_c(const struct macroblock *x, struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv); #define vp9_refining_search_sad vp9_refining_search_sad_c -unsigned int vp9_sad16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +unsigned int vp9_sad16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride); #define vp9_sad16x16 vp9_sad16x16_c -unsigned int vp9_sad16x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +unsigned int vp9_sad16x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred); #define vp9_sad16x16_avg vp9_sad16x16_avg_c void vp9_sad16x16x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); @@ -359,19 +376,19 @@ void vp9_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* c void vp9_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); #define vp9_sad16x16x8 vp9_sad16x16x8_c -unsigned int vp9_sad16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +unsigned int vp9_sad16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride); #define vp9_sad16x32 vp9_sad16x32_c -unsigned int vp9_sad16x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +unsigned int vp9_sad16x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred); #define vp9_sad16x32_avg vp9_sad16x32_avg_c void vp9_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); #define vp9_sad16x32x4d vp9_sad16x32x4d_c -unsigned int vp9_sad16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +unsigned int vp9_sad16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride); #define vp9_sad16x8 vp9_sad16x8_c -unsigned int vp9_sad16x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +unsigned int vp9_sad16x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred); #define vp9_sad16x8_avg vp9_sad16x8_avg_c void vp9_sad16x8x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); @@ -383,19 +400,19 @@ void vp9_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* co void vp9_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); #define vp9_sad16x8x8 vp9_sad16x8x8_c -unsigned int vp9_sad32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +unsigned int vp9_sad32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride); #define vp9_sad32x16 vp9_sad32x16_c -unsigned int vp9_sad32x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +unsigned int vp9_sad32x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred); #define vp9_sad32x16_avg vp9_sad32x16_avg_c void vp9_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); #define vp9_sad32x16x4d vp9_sad32x16x4d_c -unsigned int vp9_sad32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +unsigned int vp9_sad32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride); #define vp9_sad32x32 vp9_sad32x32_c -unsigned int vp9_sad32x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +unsigned int vp9_sad32x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred); #define vp9_sad32x32_avg vp9_sad32x32_avg_c void vp9_sad32x32x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); @@ -407,19 +424,19 @@ void vp9_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* c void vp9_sad32x32x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); #define vp9_sad32x32x8 vp9_sad32x32x8_c -unsigned int vp9_sad32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +unsigned int vp9_sad32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride); #define vp9_sad32x64 vp9_sad32x64_c -unsigned int vp9_sad32x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +unsigned int vp9_sad32x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred); #define vp9_sad32x64_avg vp9_sad32x64_avg_c void vp9_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); #define vp9_sad32x64x4d vp9_sad32x64x4d_c -unsigned int vp9_sad4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +unsigned int vp9_sad4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride); #define vp9_sad4x4 vp9_sad4x4_c -unsigned int vp9_sad4x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +unsigned int vp9_sad4x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred); #define vp9_sad4x4_avg vp9_sad4x4_avg_c void vp9_sad4x4x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); @@ -431,10 +448,10 @@ void vp9_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* con void vp9_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); #define vp9_sad4x4x8 vp9_sad4x4x8_c -unsigned int vp9_sad4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +unsigned int vp9_sad4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride); #define vp9_sad4x8 vp9_sad4x8_c -unsigned int vp9_sad4x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +unsigned int vp9_sad4x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred); #define vp9_sad4x8_avg vp9_sad4x8_avg_c void vp9_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); @@ -443,19 +460,19 @@ void vp9_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* cons void vp9_sad4x8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); #define vp9_sad4x8x8 vp9_sad4x8x8_c -unsigned int vp9_sad64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +unsigned int vp9_sad64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride); #define vp9_sad64x32 vp9_sad64x32_c -unsigned int vp9_sad64x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +unsigned int vp9_sad64x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred); #define vp9_sad64x32_avg vp9_sad64x32_avg_c void vp9_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); #define vp9_sad64x32x4d vp9_sad64x32x4d_c -unsigned int vp9_sad64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +unsigned int vp9_sad64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride); #define vp9_sad64x64 vp9_sad64x64_c -unsigned int vp9_sad64x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +unsigned int vp9_sad64x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred); #define vp9_sad64x64_avg vp9_sad64x64_avg_c void vp9_sad64x64x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); @@ -467,10 +484,10 @@ void vp9_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* c void vp9_sad64x64x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); #define vp9_sad64x64x8 vp9_sad64x64x8_c -unsigned int vp9_sad8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +unsigned int vp9_sad8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride); #define vp9_sad8x16 vp9_sad8x16_c -unsigned int vp9_sad8x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +unsigned int vp9_sad8x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred); #define vp9_sad8x16_avg vp9_sad8x16_avg_c void vp9_sad8x16x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); @@ -482,10 +499,10 @@ void vp9_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* co void vp9_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); #define vp9_sad8x16x8 vp9_sad8x16x8_c -unsigned int vp9_sad8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +unsigned int vp9_sad8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride); #define vp9_sad8x4 vp9_sad8x4_c -unsigned int vp9_sad8x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +unsigned int vp9_sad8x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred); #define vp9_sad8x4_avg vp9_sad8x4_avg_c void vp9_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); @@ -494,10 +511,10 @@ void vp9_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* cons void vp9_sad8x4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); #define vp9_sad8x4x8 vp9_sad8x4x8_c -unsigned int vp9_sad8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +unsigned int vp9_sad8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride); #define vp9_sad8x8 vp9_sad8x8_c -unsigned int vp9_sad8x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +unsigned int vp9_sad8x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred); #define vp9_sad8x8_avg vp9_sad8x8_avg_c void vp9_sad8x8x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); @@ -548,12 +565,6 @@ unsigned int vp9_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_ unsigned int vp9_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); #define vp9_sub_pixel_avg_variance8x8 vp9_sub_pixel_avg_variance8x8_c -unsigned int vp9_sub_pixel_mse32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); -#define vp9_sub_pixel_mse32x32 vp9_sub_pixel_mse32x32_c - -unsigned int vp9_sub_pixel_mse64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); -#define vp9_sub_pixel_mse64x64 vp9_sub_pixel_mse64x64_c - unsigned int vp9_sub_pixel_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); #define vp9_sub_pixel_variance16x16 vp9_sub_pixel_variance16x16_c @@ -596,7 +607,7 @@ unsigned int vp9_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stri void vp9_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); #define vp9_subtract_block vp9_subtract_block_c -void vp9_temporal_filter_apply_c(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count); +void vp9_temporal_filter_apply_c(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count); #define vp9_temporal_filter_apply vp9_temporal_filter_apply_c void vp9_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); @@ -662,33 +673,6 @@ unsigned int vp9_variance8x4_c(const uint8_t *src_ptr, int source_stride, const unsigned int vp9_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); #define vp9_variance8x8 vp9_variance8x8_c -unsigned int vp9_variance_halfpixvar16x16_h_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); -#define vp9_variance_halfpixvar16x16_h vp9_variance_halfpixvar16x16_h_c - -unsigned int vp9_variance_halfpixvar16x16_hv_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); -#define vp9_variance_halfpixvar16x16_hv vp9_variance_halfpixvar16x16_hv_c - -unsigned int vp9_variance_halfpixvar16x16_v_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); -#define vp9_variance_halfpixvar16x16_v vp9_variance_halfpixvar16x16_v_c - -unsigned int vp9_variance_halfpixvar32x32_h_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); -#define vp9_variance_halfpixvar32x32_h vp9_variance_halfpixvar32x32_h_c - -unsigned int vp9_variance_halfpixvar32x32_hv_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); -#define vp9_variance_halfpixvar32x32_hv vp9_variance_halfpixvar32x32_hv_c - -unsigned int vp9_variance_halfpixvar32x32_v_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); -#define vp9_variance_halfpixvar32x32_v vp9_variance_halfpixvar32x32_v_c - -unsigned int vp9_variance_halfpixvar64x64_h_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); -#define vp9_variance_halfpixvar64x64_h vp9_variance_halfpixvar64x64_h_c - -unsigned int vp9_variance_halfpixvar64x64_hv_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); -#define vp9_variance_halfpixvar64x64_hv vp9_variance_halfpixvar64x64_hv_c - -unsigned int vp9_variance_halfpixvar64x64_v_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); -#define vp9_variance_halfpixvar64x64_v vp9_variance_halfpixvar64x64_v_c - void vp9_rtcd(void); #include "vpx_config.h" diff --git a/generic/vpx_config.h b/generic/vpx_config.h index deac830..743623f 100644 --- a/generic/vpx_config.h +++ b/generic/vpx_config.h @@ -19,6 +19,7 @@ #define HAVE_EDSP 0 #define HAVE_MEDIA 0 #define HAVE_NEON 0 +#define HAVE_NEON_ASM 0 #define HAVE_MIPS32 0 #define HAVE_DSPR2 0 #define HAVE_MMX 0 @@ -37,7 +38,7 @@ #define HAVE_SYS_MMAN_H 1 #define HAVE_UNISTD_H 1 #define CONFIG_EXTERNAL_BUILD 0 -#define CONFIG_INSTALL_DOCS 0 +#define CONFIG_INSTALL_DOCS 1 #define CONFIG_INSTALL_BINS 1 #define CONFIG_INSTALL_LIBS 1 #define CONFIG_INSTALL_SRCS 0 @@ -83,11 +84,15 @@ #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 1 #define CONFIG_WEBM_IO 1 +#define CONFIG_LIBYUV 1 #define CONFIG_DECODE_PERF_TESTS 0 +#define CONFIG_ENCODE_PERF_TESTS 0 #define CONFIG_MULTI_RES_ENCODING 0 #define CONFIG_TEMPORAL_DENOISING 1 +#define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_EXPERIMENTAL 0 -#define CONFIG_DECRYPT 0 -#define CONFIG_MULTIPLE_ARF 0 -#define CONFIG_ALPHA 0 +#define CONFIG_SIZE_LIMIT 0 +#define CONFIG_SPATIAL_SVC 0 +#define CONFIG_VP9_TEMPORAL_DENOISING 0 +#define CONFIG_FP_MB_STATS 0 #endif /* VPX_CONFIG_H */ diff --git a/generic/vpx_version.h b/generic/vpx_version.h index 8bbaf6b..59adf99 100644 --- a/generic/vpx_version.h +++ b/generic/vpx_version.h @@ -1,7 +1,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_EXTRA "2239-g4fffefe" +#define VERSION_EXTRA "3825-gd4a47a6" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.3.0-2239-g4fffefe" -#define VERSION_STRING " v1.3.0-2239-g4fffefe" +#define VERSION_STRING_NOSP "v1.3.0-3825-gd4a47a6" +#define VERSION_STRING " v1.3.0-3825-gd4a47a6" |