- all elements of SPSNext are moved into SPS
- syntax elements of SPS are sorted according to draft (as far as possible)
- comments were added where software and draft diverge

There is a conflict with JVET_M0427_INLOOP_RESHAPER that is triggering a debug assertion that checks that the width is not 1.

- sps_sao_enabled_flag
- sps_alf_enabled_flag
- pcm_enabled_flag
- pcm_sample_bit_depth_luma_minus1
- pcm_sample_bit_depth_chroma_minus1
- log2_min_pcm_luma_coding_block_size_minus3
- log2_diff_max_min_pcm_luma_coding_block_size
- pcm_loop_filter_disabled_flag
- sps_ref_wraparound_enabled_flag
- sps_ref_wraparound_offset
- sps_temporal_mvp_enabled_flag
- sps_sbtmvp_enabled_flag
- sps_bdof_enabled_flag

add corresponding tool macros for CPR code, to prevent compiling errors when some tools are disabled

code optimization of triangle weighting process