diff options
author | Kunter Gultekin <kuntergultekin@google.com> | 2013-02-08 14:15:35 +0200 |
---|---|---|
committer | James Dong <jdong@google.com> | 2013-02-12 09:40:20 -0800 |
commit | ca15b5fc158a9df465aaf1acfe38d8cb5042c81b (patch) | |
tree | 938a101899fba675440fde883cb12d0d841ff764 /mips-dspr2 | |
parent | 8d88675ca5bdd3ef20a6410c4a0f346531ece0b6 (diff) | |
download | android_external_libvpx-ca15b5fc158a9df465aaf1acfe38d8cb5042c81b.tar.gz android_external_libvpx-ca15b5fc158a9df465aaf1acfe38d8cb5042c81b.tar.bz2 android_external_libvpx-ca15b5fc158a9df465aaf1acfe38d8cb5042c81b.zip |
Enables encoder for libvpx.
Based on libvpx v1.2.0 this change removes the
disable-encoder flags from all build configurations
thus enabling encoder and updates other build
files in accordance with UPDATING.
Change-Id: Ief7c74593fc4a585d4a8b1768a4e1008547f0c40
Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
Diffstat (limited to 'mips-dspr2')
-rw-r--r-- | mips-dspr2/libvpx_srcs.txt | 50 | ||||
-rw-r--r-- | mips-dspr2/vpx_config.c | 2 | ||||
-rw-r--r-- | mips-dspr2/vpx_config.h | 6 | ||||
-rw-r--r-- | mips-dspr2/vpx_rtcd.h | 75 |
4 files changed, 129 insertions, 4 deletions
diff --git a/mips-dspr2/libvpx_srcs.txt b/mips-dspr2/libvpx_srcs.txt index fa2d647..8b5b727 100644 --- a/mips-dspr2/libvpx_srcs.txt +++ b/mips-dspr2/libvpx_srcs.txt @@ -81,7 +81,56 @@ vp8/decoder/onyxd_if.c vp8/decoder/onyxd_int.h vp8/decoder/threading.c vp8/decoder/treereader.h +vp8/encoder/asm_enc_offsets.c +vp8/encoder/bitstream.c +vp8/encoder/bitstream.h +vp8/encoder/block.h +vp8/encoder/boolhuff.c +vp8/encoder/boolhuff.h +vp8/encoder/dct.c +vp8/encoder/dct_value_cost.h +vp8/encoder/dct_value_tokens.h +vp8/encoder/defaultcoefcounts.h +vp8/encoder/denoising.c +vp8/encoder/denoising.h +vp8/encoder/encodeframe.c +vp8/encoder/encodeframe.h +vp8/encoder/encodeintra.c +vp8/encoder/encodeintra.h +vp8/encoder/encodemb.c +vp8/encoder/encodemb.h +vp8/encoder/encodemv.c +vp8/encoder/encodemv.h +vp8/encoder/ethreading.c +vp8/encoder/firstpass.h +vp8/encoder/lookahead.c +vp8/encoder/lookahead.h +vp8/encoder/mcomp.c +vp8/encoder/mcomp.h +vp8/encoder/modecosts.c +vp8/encoder/modecosts.h +vp8/encoder/onyx_if.c +vp8/encoder/onyx_int.h +vp8/encoder/pickinter.c +vp8/encoder/pickinter.h +vp8/encoder/picklpf.c +vp8/encoder/psnr.c +vp8/encoder/psnr.h +vp8/encoder/quantize.c +vp8/encoder/quantize.h +vp8/encoder/ratectrl.c +vp8/encoder/ratectrl.h +vp8/encoder/rdopt.c +vp8/encoder/rdopt.h +vp8/encoder/segmentation.c +vp8/encoder/segmentation.h +vp8/encoder/tokenize.c +vp8/encoder/tokenize.h +vp8/encoder/treewriter.c +vp8/encoder/treewriter.h vp8/vp8_common.mk +vp8/vp8_cx_iface.c +vp8/vp8cx.mk vp8/vp8_dx_iface.c vp8/vp8dx.mk vpx_config.c @@ -107,6 +156,7 @@ vpx/src/vpx_codec.c vpx/src/vpx_decoder.c vpx/src/vpx_encoder.c vpx/src/vpx_image.c +vpx/vp8cx.h vpx/vp8dx.h vpx/vp8.h vpx/vpx_codec.h diff --git a/mips-dspr2/vpx_config.c b/mips-dspr2/vpx_config.c index 49cf24e..42fc4cb 100644 --- a/mips-dspr2/vpx_config.c +++ b/mips-dspr2/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--force-target=mips32-android-gcc --disable-runtime-cpu-detect --sdk-path=/usr/local/google/home/johannkoenig/android-ndk --disable-vp8-encoder --disable-examples --disable-docs --enable-dspr2"; +static const char* const cfg = "--force-target=mips32-android-gcc --disable-runtime-cpu-detect --sdk-path=/usr/local/google/home/johannkoenig/android-ndk --disable-examples --disable-docs --enable-dspr2 --enable-realtime-only"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/mips-dspr2/vpx_config.h b/mips-dspr2/vpx_config.h index 3a9e711..b03bd7c 100644 --- a/mips-dspr2/vpx_config.h +++ b/mips-dspr2/vpx_config.h @@ -59,14 +59,14 @@ #define CONFIG_POSTPROC 0 #define CONFIG_MULTITHREAD 1 #define CONFIG_INTERNAL_STATS 0 -#define CONFIG_VP8_ENCODER 0 +#define CONFIG_VP8_ENCODER 1 #define CONFIG_VP8_DECODER 1 #define CONFIG_VP8 1 -#define CONFIG_ENCODERS 0 +#define CONFIG_ENCODERS 1 #define CONFIG_DECODERS 1 #define CONFIG_STATIC_MSVCRT 0 #define CONFIG_SPATIAL_RESAMPLING 1 -#define CONFIG_REALTIME_ONLY 0 +#define CONFIG_REALTIME_ONLY 1 #define CONFIG_ONTHEFLY_BITPACKING 0 #define CONFIG_ERROR_CONCEALMENT 0 #define CONFIG_SHARED 0 diff --git a/mips-dspr2/vpx_rtcd.h b/mips-dspr2/vpx_rtcd.h index 880e0f4..4e212f8 100644 --- a/mips-dspr2/vpx_rtcd.h +++ b/mips-dspr2/vpx_rtcd.h @@ -227,6 +227,81 @@ void vp8_sad16x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsign void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int ref_stride, unsigned int *sad_array); #define vp8_sad16x16x4d vp8_sad16x16x4d_c +unsigned int vp8_get_mb_ss_c(const short *); +#define vp8_get_mb_ss vp8_get_mb_ss_c + +unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_c + +unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +#define vp8_mse16x16 vp8_mse16x16_c + +unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +#define vp8_get4x4sse_cs vp8_get4x4sse_cs_c + +void vp8_short_fdct4x4_c(short *input, short *output, int pitch); +#define vp8_short_fdct4x4 vp8_short_fdct4x4_c + +void vp8_short_fdct8x4_c(short *input, short *output, int pitch); +#define vp8_short_fdct8x4 vp8_short_fdct8x4_c + +void vp8_short_walsh4x4_c(short *input, short *output, int pitch); +#define vp8_short_walsh4x4 vp8_short_walsh4x4_c + +void vp8_regular_quantize_b_c(struct block *, struct blockd *); +#define vp8_regular_quantize_b vp8_regular_quantize_b_c + +void vp8_fast_quantize_b_c(struct block *, struct blockd *); +#define vp8_fast_quantize_b vp8_fast_quantize_b_c + +void vp8_regular_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2); +#define vp8_regular_quantize_b_pair vp8_regular_quantize_b_pair_c + +void vp8_fast_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2); +#define vp8_fast_quantize_b_pair vp8_fast_quantize_b_pair_c + +void vp8_quantize_mb_c(struct macroblock *); +#define vp8_quantize_mb vp8_quantize_mb_c + +void vp8_quantize_mby_c(struct macroblock *); +#define vp8_quantize_mby vp8_quantize_mby_c + +void vp8_quantize_mbuv_c(struct macroblock *); +#define vp8_quantize_mbuv vp8_quantize_mbuv_c + +int vp8_block_error_c(short *coeff, short *dqcoeff); +#define vp8_block_error vp8_block_error_c + +int vp8_mbblock_error_c(struct macroblock *mb, int dc); +#define vp8_mbblock_error vp8_mbblock_error_c + +int vp8_mbuverror_c(struct macroblock *mb); +#define vp8_mbuverror vp8_mbuverror_c + +void vp8_subtract_b_c(struct block *be, struct blockd *bd, int pitch); +#define vp8_subtract_b vp8_subtract_b_c + +void vp8_subtract_mby_c(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride); +#define vp8_subtract_mby vp8_subtract_mby_c + +void vp8_subtract_mbuv_c(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride); +#define vp8_subtract_mbuv vp8_subtract_mbuv_c + +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv); +#define vp8_full_search_sad vp8_full_search_sad_c + +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv); +#define vp8_refining_search_sad vp8_refining_search_sad_c + +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv); +#define vp8_diamond_search_sad vp8_diamond_search_sad_c + +void vp8_yv12_copy_partial_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_partial_frame vp8_yv12_copy_partial_frame_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); +#define vp8_denoiser_filter vp8_denoiser_filter_c + void vp8_horizontal_line_4_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_4_5_scale vp8_horizontal_line_4_5_scale_c |