Johann 32a5c52856 Merge branch 'master' into experimental ...

Conflicts:
	vp9/common/vp9_findnearmv.c
	vp9/common/vp9_rtcd_defs.sh
	vp9/decoder/vp9_decodframe.c
	vp9/decoder/x86/vp9_dequantize_sse2.c
	vp9/encoder/vp9_rdopt.c
	vp9/vp9_common.mk

Resolve file name changes in favor of master. Resolve rdopt changes in
favor of experimental, preserving the newer experiments.

Change-Id: If51ed8f457470281c7b20a5c1a2f4ce2cf76c20f

2013-04-26 12:57:10 -07:00

..

x86

Merge branch 'master' into experimental

2013-04-26 12:57:10 -07:00

vp9_asm_enc_offsets.c

Restore vp9_asm_enc_offsets.c

2013-04-26 10:01:49 -07:00

vp9_bitstream.c

Adding is_inter_mode function.

2013-04-25 10:23:00 -07:00

vp9_bitstream.h

Use standard integer types for pixel values and coefficients.

2012-12-18 15:31:19 -08:00

vp9_block.h

quantize: make 4x4, 8x8 common with larger transforms

2013-04-25 14:44:54 -07:00

vp9_boolhuff.c

disambiguate superframe index in vp9_stop_encode()

2013-03-12 14:30:23 -07:00

vp9_boolhuff.h

Use standard integer types for pixel values and coefficients.

2012-12-18 15:31:19 -08:00

vp9_dct.c

Faster vp9_short_fdct4x4 and vp9_short_fdct8x4.

2013-04-16 16:38:30 -07:00

vp9_encodeframe.c

Removed bmi from blockd

2013-04-26 10:19:43 -04:00

vp9_encodeframe.h

Remove BLOCK structure

2013-04-25 11:33:17 -07:00

vp9_encodeintra.c

Merge "quantize: make 4x4, 8x8 common with larger transforms" into experimental

2013-04-26 09:08:49 -07:00

vp9_encodeintra.h

Move qcoeff, dqcoeff from BLOCKD to per-plane data

2013-04-04 16:30:57 -07:00

vp9_encodemb.c

Use b_width/height_log2 instead of mb_ where appropriate.

2013-04-25 14:20:59 -07:00

vp9_encodemb.h

Move src_diff to per-plane MACROBLOCK data

2013-04-23 12:18:51 -07:00

vp9_encodemv.c

Changing argument type of vp9_get_mv_joint from MV to MV*.

2013-04-17 11:21:28 -07:00

vp9_encodemv.h

Use standard integer types for pixel values and coefficients.

2012-12-18 15:31:19 -08:00

vp9_firstpass.c

Remove predictor pointers from BLOCKD

2013-04-25 12:04:07 -07:00

vp9_firstpass.h

Code cleanup.

2013-02-21 13:50:15 -08:00

vp9_lookahead.c

Fix pulsing issue with scaling

2013-03-13 19:10:10 -07:00

vp9_lookahead.h

Code cleanup.

2013-03-11 17:02:27 -07:00

vp9_mbgraph.c

Remove predictor pointers from BLOCKD

2013-04-25 12:04:07 -07:00

vp9_mbgraph.h

Code cleanup.

2013-02-28 13:18:02 -08:00

vp9_mcomp.c

Removed bmi from blockd

2013-04-26 10:19:43 -04:00

vp9_mcomp.h

Removed bmi from blockd

2013-04-26 10:19:43 -04:00

vp9_modecosts.c

fixed includes to be fully specified

2012-11-28 10:53:17 -08:00

vp9_modecosts.h

Use standard integer types for pixel values and coefficients.

2012-12-18 15:31:19 -08:00

vp9_onyx_if.c

Remove implicit assumption that mode_info_stride == mb_cols + 1.

2013-04-25 14:21:01 -07:00

vp9_onyx_int.h

Remove write-only variables that store refframe, signbias and mv.

2013-04-25 14:21:01 -07:00

vp9_picklpf.c

Remove obselete code

2013-04-10 13:45:22 -07:00

vp9_picklpf.h

Remove obselete code

2013-04-10 13:45:22 -07:00

vp9_psnr.c

Code cleanup.

2013-02-21 10:34:33 -08:00

vp9_psnr.h

Code cleanup.

2013-02-21 10:34:33 -08:00

vp9_quantize.c

Merge "quantize: make 4x4, 8x8 common with larger transforms" into experimental

2013-04-26 09:08:49 -07:00

vp9_quantize.h

quantize: make 4x4, 8x8 common with larger transforms

2013-04-25 14:44:54 -07:00

vp9_ratectrl.c

Removes the code_nonzerocount experiment

2013-04-22 10:58:49 -07:00

vp9_ratectrl.h

Minor rate control refactoring and experiments.

2013-02-25 17:07:45 +00:00

vp9_rdopt.c

Merge "quantize: make 4x4, 8x8 common with larger transforms" into experimental

2013-04-26 09:08:49 -07:00

vp9_rdopt.h

Merge pick_sb_modes and pick_sb64_modes.

2013-04-11 09:33:49 -07:00

vp9_sad_c.c

Merge branch 'master' into experimental

2013-04-26 12:57:10 -07:00

vp9_segmentation.c

Merge "Move sbsegment out of experimental list" into experimental

2013-04-25 09:18:01 -07:00

vp9_segmentation.h

Clean out some legacy code.

2013-04-19 22:16:28 +01:00

vp9_ssim.c

Use standard integer types for pixel values and coefficients.

2012-12-18 15:31:19 -08:00

vp9_temporal_filter.c

Removed bmi from blockd

2013-04-26 10:19:43 -04:00

vp9_temporal_filter.h

Move configure_arnr_filter function

2013-04-16 15:58:27 -07:00

vp9_tokenize.c

Use b_width/height_log2 instead of mb_ where appropriate.

2013-04-25 14:20:59 -07:00

vp9_tokenize.h

Remove unused stuffing function.

2013-04-23 11:18:42 -07:00

vp9_treewriter.c

Use above/left (instead of previous in scan-order) as token context.

2013-03-26 16:46:09 -07:00

vp9_treewriter.h

Adding vp9_write_prob function (macro for now).

2013-04-16 16:23:17 -07:00

vp9_variance_c.c

Move sbsegment out of experimental list

2013-04-24 15:19:17 -07:00

vp9_variance.h

Add unit test for x4 multi-SAD functions

2013-03-01 18:14:02 -08:00