Jingning Han 48c7de0fce Fix enc/dec mismatch in var-tx experiment ...

This commit fixes an enc/dec mismatch issue in recursive transform
partitioning experiment due to merge conflict.

Change-Id: I66146ef806c008902c91d54f4f8c7ccf47996b78

2015-10-23 13:58:38 -07:00

..

arm/neon

Remove vp9_ prefix from vp10 files

2015-08-11 21:24:08 -07:00

mips/msa

Remove vp9_ prefix from vp10 files

2015-08-11 21:24:08 -07:00

x86

Remove vp9_ prefix from vp10 files

2015-08-11 21:24:08 -07:00

aq_complexity.c

Include vpx_dsp_common.h when using VPXMIN/MAX

2015-08-31 14:36:35 -07:00

aq_complexity.h

VP9_COMP -> VP10_COMP

2015-08-13 11:37:17 -07:00

aq_cyclicrefresh.c

Include vpx_dsp_common.h when using VPXMIN/MAX

2015-08-31 14:36:35 -07:00

aq_cyclicrefresh.h

vp10 cleanup: remove svc code

2015-08-28 11:53:32 -07:00

aq_variance.c

VP9_COMP -> VP10_COMP

2015-08-13 11:37:17 -07:00

aq_variance.h

VP9_COMP -> VP10_COMP

2015-08-13 11:37:17 -07:00

avg.c

Remove vp9_ prefix from vp10 files

2015-08-11 21:24:08 -07:00

bitstream.c

Merge branch 'masterbase' into nextgenv2

2015-10-22 18:31:26 -07:00

bitstream.h

Merge branch 'masterbase' into nextgenv2

2015-10-22 11:40:44 -07:00

block.h

VP10: Add palette mode part 1

2015-10-12 10:02:17 -07:00

blockiness.c

Sync vp10 with vpx_ports/system_state.h

2015-08-12 09:21:25 -07:00

context_tree.c

VP10: Add palette mode part 1

2015-10-12 10:02:17 -07:00

context_tree.h

VP10: Add palette mode part 1

2015-10-12 10:02:17 -07:00

cost.c

Remove vp9_ prefix from vp10 files

2015-08-11 21:24:08 -07:00

cost.h

Correct guard macros in header files

2015-08-13 09:25:39 -07:00

dct.c

Fix forward transform bit range limits

2015-10-15 09:09:44 -07:00

denoiser.c

Include vpx_dsp_common.h when using VPXMIN/MAX

2015-08-31 14:36:35 -07:00

denoiser.h

Remove vp9_ prefix from vp10 files

2015-08-11 21:24:08 -07:00

encodeframe.c

Merge branch 'masterbase' into nextgenv2

2015-10-22 18:31:26 -07:00

encodeframe.h

VP9_COMP -> VP10_COMP

2015-08-13 11:37:17 -07:00

encodemb.c

Fix merge defects

2015-10-22 18:25:41 -07:00

encodemb.h

Use explicit block position in foreach_transformed_block

2015-10-07 16:32:19 -07:00

encodemv.c

vp10: use subexp probability updates for MV probs.

2015-10-05 20:58:32 -04:00

encodemv.h

VP9_COMP -> VP10_COMP

2015-08-13 11:37:17 -07:00

encoder.c

Merge branch 'masterbase' into nextgenv2

2015-10-22 11:40:44 -07:00

encoder.h

Merge branch 'masterbase' into nextgenv2

2015-10-22 11:40:44 -07:00

ethread.c

Fix palette mode in multi-thread encoding setting

2015-10-15 15:00:57 -07:00

ethread.h

vp10: add extern "C" to headers

2015-09-09 23:15:59 -07:00

extend.c

Include vpx_dsp_common.h when using VPXMIN/MAX

2015-08-31 14:36:35 -07:00

extend.h

Correct guard macros in header files

2015-08-13 09:25:39 -07:00

firstpass.c

vp10: per-segment lossless coding.

2015-10-16 19:30:39 -04:00

firstpass.h

vp10 cleanup: remove svc code

2015-08-28 11:53:32 -07:00

lookahead.c

Change vp9_ prefix function names in vpx_scale to vpx_

2015-08-14 15:27:43 -07:00

lookahead.h

vp10 cleanup: remove svc code

2015-08-28 11:53:32 -07:00

mbgraph.c

vp10: add extended-intra prediction edges experiment.

2015-10-16 19:30:39 -04:00

mbgraph.h

VP9_COMP -> VP10_COMP

2015-08-13 11:37:17 -07:00

mcomp.c

Include vpx_dsp_common.h when using VPXMIN/MAX

2015-08-31 14:36:35 -07:00

mcomp.h

VP9_COMP -> VP10_COMP

2015-08-13 11:37:17 -07:00

palette.c

VP10: some changes to palette mode

2015-10-16 11:41:26 -07:00

palette.h

VP10: Add palette mode part 1

2015-10-12 10:02:17 -07:00

picklpf.c

Include vpx_dsp_common.h when using VPXMIN/MAX

2015-08-31 14:36:35 -07:00

picklpf.h

VP9_COMP -> VP10_COMP

2015-08-13 11:37:17 -07:00

quantize.c

VP9_COMP -> VP10_COMP

2015-08-13 11:37:17 -07:00

quantize.h

VP9Common -> VP10Common

2015-08-13 15:00:19 -07:00

ratectrl.c

Include vpx_dsp_common.h when using VPXMIN/MAX

2015-08-31 14:36:35 -07:00

ratectrl.h

vp10 cleanup: remove svc code

2015-08-28 11:53:32 -07:00

rd.c

Merge branch 'masterbase' into nextgenv2

2015-10-22 11:40:44 -07:00

rd.h

VP9_COMP -> VP10_COMP

2015-08-13 11:37:17 -07:00

rdopt.c

Merge "Fix merge defects" into nextgenv2

2015-10-23 01:28:32 +00:00

rdopt.h

VP9_COMP -> VP10_COMP

2015-08-13 11:37:17 -07:00

resize.c

Use sizeof(variable) instead of sizeof(type)

2015-08-12 11:25:38 -07:00

resize.h

vp10: add extern "C" to headers

2015-09-09 23:15:59 -07:00

segmentation.c

vp10: make segmentation probs use generic probability model.

2015-10-16 19:30:38 -04:00

segmentation.h

vp10: make segmentation probs use generic probability model.

2015-10-16 19:30:38 -04:00

skin_detection.c

Change vp9_ prefix function names in vpx_scale to vpx_

2015-08-14 15:27:43 -07:00

skin_detection.h

VP9_COMP -> VP10_COMP

2015-08-13 11:37:17 -07:00

speed_features.c

Take out reference_masking speed feature

2015-09-10 12:57:48 -07:00

speed_features.h

Take out reference_masking speed feature

2015-09-10 12:57:48 -07:00

subexp.c

Backport EXT_TX experiment from nextgen

2015-09-09 09:42:51 -07:00

subexp.h

Backport EXT_TX experiment from nextgen

2015-09-09 09:42:51 -07:00

temporal_filter.c

Include vpx_dsp_common.h when using VPXMIN/MAX

2015-08-31 14:36:35 -07:00

temporal_filter.h

VP9_COMP -> VP10_COMP

2015-08-13 11:37:17 -07:00

tokenize.c

Fix enc/dec mismatch in var-tx experiment

2015-10-23 13:58:38 -07:00

tokenize.h

Merge branch 'masterbase' into nextgenv2

2015-10-22 11:40:44 -07:00

treewriter.c

Remove vp9_ prefix from vp10 files

2015-08-11 21:24:08 -07:00

treewriter.h

Correct guard macros in header files

2015-08-13 09:25:39 -07:00