Joose Sainio
450cbd356c
Merge branch 'joint_cbcr' into 'master'
...
[jccr] Add joint coding of chroma residual
See merge request cs/ultravideo/vvc/uvg266!6
2021-09-06 11:43:06 +03:00
Joose Sainio
91374e95a9
[MTS] Move chroma outside of mts search
2021-09-06 11:28:33 +03:00
Joose Sainio
276f0bf006
[jccr] fix undefined behaviour that did not really affect anything
2021-09-06 11:28:33 +03:00
Joose Sainio
3a73abd264
[jccr] disable jccr for blocks when tr-depth != depth, i.e. 64×64
2021-09-06 11:28:32 +03:00
Joose Sainio
0592cc65a0
[jccr] enable rdoq with jccr
2021-09-06 11:28:20 +03:00
Joose Sainio
072b84711a
[jccr] fix 64×64 CUs
2021-09-06 11:28:20 +03:00
Joose Sainio
29d86aea84
[jccr] cmdline option
2021-09-06 11:28:08 +03:00
Joose Sainio
042b5078d8
[jccr] WIP initial implementation
...
Add somekind of search for joint chroma residual coding.
Bitstream is currently correct but prediction is incorrect because the jccr
is actually not used in the search.
Hard coded to be enabled
2021-09-06 11:28:08 +03:00
Marko Viitanen
839b9527af
Fix nal unit debug printing when VERBOSE is used
2021-09-01 14:28:07 +03:00
Marko Viitanen
26f18865f7
[alf] Change the processing in alf_get_blk_stats_avx2() to allow utilizing the whole 256bit register
2021-08-27 13:40:28 +03:00
Marko Viitanen
fdf125f406
[alf] Fix incorrect conversion in alf_get_blk_stats_avx2
2021-08-27 10:25:20 +03:00
Marko Viitanen
6714973264
[alf] Change _mm_store_si128 to _mm_storeu_si128 in alf_get_blk_stats_avx2()
2021-08-26 18:05:06 +03:00
Marko Viitanen
5df8add046
[alf] Change order of alf_covariance.y array for better AVX2 optimization in alf_get_blk_stats_avx2()
2021-08-26 15:37:01 +03:00
Marko Viitanen
be9527cf1d
[alf] Change the order of alf_covariance.ee values to get better optimized solution for alf_get_blk_stats_avx2()
2021-08-26 11:07:13 +03:00
Marko Viitanen
f4de5cfd0f
[alf] Cleanup alf_calc_covariance_avx2() and use integers in alf_get_blk_stats_avx2()
2021-08-26 10:20:57 +03:00
Marko Viitanen
915bf3ca24
[alf] Fix AVX2 priority
2021-08-25 20:29:58 +03:00
Marko Viitanen
8ef3e6a126
[alf] Add strategy for alf_get_blk_stats() and an initial AVX2 version
2021-08-25 20:22:24 +03:00
Marko Viitanen
f61b9138cd
[alf] Import SSE4.1 optimized 5x5 and 7x7 filters from VTM13
...
* Modified to work with 8-bit pixels
2021-08-25 11:50:37 +03:00
Marko Viitanen
dc6a29b0d8
[alf] Initial generic strategies for 5x5 and 7x7 filtering
2021-08-25 10:50:00 +03:00
Marko Viitanen
c3c96d69c2
[alf] Add modified alf_derive_classification_blk_sse41() from VTM 13.0
...
* Modified to work with bitdepth 8
2021-08-20 11:45:02 +03:00
Marko Viitanen
b158d05bca
[alf] rename strategy function to include prefix
2021-08-19 17:19:17 +03:00
Marko Viitanen
3efaeede76
[alf] Define the strategy for alf_derive_classification_blk()
2021-08-19 17:04:35 +03:00
Marko Viitanen
dee8a167e4
Clean up entropy tables and some unused code / comments
2021-08-17 10:31:14 +03:00
Marko Viitanen
9e9a8058c5
[alf] Allocate alf covariance and classifier memory only when needed
2021-08-15 10:44:05 +03:00
Marko Viitanen
2007132937
[alf] Make the alf structs a bit more memory efficient
2021-08-15 10:44:04 +03:00
Marko Viitanen
d742f57779
Remove angular_pred_avx2 so we don't need extra parameter
2021-08-15 10:43:48 +03:00
Marko Viitanen
ef287ee00c
[alf] Add math.h header to alf.c for sqrt()
2021-08-15 10:41:55 +03:00
Marko Viitanen
b5bc981d2a
Add entropy bits back to intra luma mode cost
...
* Makes things better after the entropies were fixed
2021-08-15 08:10:45 +03:00
Marko Viitanen
1e925ec980
[rdoq] fix kvz_ts_rdoq error scale
2021-08-14 22:52:32 +03:00
Marko Viitanen
8fcf5cf55c
[rdoq] Fix a lot of things
...
* Fix entropy table
* fix float entropy
* use dest_coeff instead of coef in ctx_idx_abs calculation
* Calculate new ctx_sig in correct place
2021-08-14 22:12:08 +03:00
Marko Viitanen
b412a96820
[cleanup] Change mentions of Kvazaar to uvg266 in README.md and remove crypto parameters
2021-07-27 10:18:45 +03:00
Marko Viitanen
5604b6f946
[cleanup] remove all crypto related stuff, fix warnings, move estimate.m to tools/
2021-07-27 09:27:51 +03:00
Marko Viitanen
99a2b0384d
[cleanup] remove some warnings
2021-07-26 11:42:19 +03:00
Marko Viitanen
226d7a9f53
[alf] remove alf clipping functions and free tqj_alf_process also when new job is allocated
2021-07-26 11:21:57 +03:00
Marko Viitanen
eb491ecea2
[alf] free state->tqj_alf_process to not leak memory
2021-07-26 10:26:50 +03:00
Marko Viitanen
0f8f422ad6
[alf] use correct lcu index with wpp and use proper cabac context for alf search
2021-07-25 20:19:17 +03:00
Marko Viitanen
90ed51a6ad
[alf] remove encoder_state_worker_encode_lcu since it is not used
2021-07-23 21:58:36 +03:00
Marko Viitanen
070dcc1924
[alf] fix alf_info passing to sub_states
2021-07-23 21:54:52 +03:00
Marko Viitanen
dc6862051e
[alf] Initialize all the alf tables in one place
2021-07-23 21:44:09 +03:00
Marko Viitanen
9e70707fba
[alf] Add new wf_recon_jobs and change search/bitstream writing to use local coeff instead of state->coeff
2021-07-23 10:40:19 +03:00
Marko Viitanen
b538f33838
[alf] add new thread queue job alf_process ran before the final bitstream writing
2021-07-22 23:21:00 +03:00
Marko Viitanen
20041740f2
[alf] move parameters to state and fix some static variables causing problems in multithreading
2021-07-22 23:18:56 +03:00
Marko Viitanen
3146f2d17f
[alf] Add job for ALF processing just before writing the bitstream out
2021-07-22 18:46:53 +03:00
Marko Viitanen
c188b1fdf9
[alf] Use correct LCU count
2021-07-22 18:45:33 +03:00
Marko Viitanen
0cad1ac3c9
[mts] Add a comment about idct8/idst7 16x16 being unoptimized
2021-07-21 14:02:23 +03:00
Marko Viitanen
d5ef036d35
[mts] change mts_subset tables back to static
2021-07-21 13:54:59 +03:00
Marko Viitanen
60caf2c378
[mts] fix 32x32 idst/idct
2021-07-21 13:44:25 +03:00
Marko Viitanen
c2cd5fb98e
[mts] replace AVX2 DST7/DCT8 16x16 with unoptimized for now
2021-07-21 13:38:17 +03:00
Marko Viitanen
7e089f518d
[mts] add optimized versions of DCT8 and DST7, inverse not yet working properly
...
* Includes new unit tests for the mts
2021-07-21 11:53:15 +03:00
Marko Viitanen
7f67009511
Fix MD5 calculations from HEVC to VVC way
2021-06-24 15:03:29 +03:00
Marko Viitanen
c9e48f253d
Fix hash message with monochrome
2021-06-24 14:48:48 +03:00
Marko Viitanen
1d436844da
Remove duplicated code from kvz_rdoq
2021-06-24 13:20:02 +03:00
Marko Viitanen
ca0c357268
[rdoq] Fix chroma bit calculations to include >>3 for width and height
2021-06-24 13:19:20 +03:00
Marko Viitanen
c004735821
[LMCS] Fix casting of the chroma scaled residual
2021-06-18 09:35:06 +03:00
Marko Viitanen
b22fd61c7f
[intrapred] Change kvz_luma_mode_bits to make it return more correct costs
2021-06-18 09:35:06 +03:00
Joose Sainio
cfffd7166c
Use correct context for calculating coeff costs for transform skip
2021-06-07 13:06:03 +03:00
Marko Viitanen
4594bf0ca8
Merge branch 'lmcs_chroma'
2021-06-02 15:05:04 +03:00
Marko Viitanen
cc6ff368df
[LMCS] Store calculated chroma scaling values for speedup
2021-06-02 09:33:45 +03:00
Marko Viitanen
5babb14ee7
[LMCS] Use chroma scaling
2021-06-01 12:17:03 +03:00
Marko Viitanen
fad11a5c92
[LMCS] Import LMCS chroma functions from VTM13.0
2021-06-01 09:01:55 +03:00
Joose Sainio
f9de8ebc4f
Merge branch 'master' into '4x4-rd'
...
# Conflicts:
# src/encoder.c
# tests/test_intra.sh
2021-05-28 11:43:55 +00:00
Marko Viitanen
ddea6d73c9
[LMCS] Fix blank references in some cases by selecting between source_lmcs and source in init_lcu_t()
2021-05-28 10:57:25 +03:00
Marko Viitanen
96a12d9830
Disable SPS extension writing if they are not used -> compatible with VTM 11 and 13
2021-05-28 10:17:19 +03:00
Marko Viitanen
1bbe1204e4
[LMCS] set ph_lmcs_enabled_flag according to the sliceReshaperEnableFlag
2021-05-27 16:09:34 +03:00
Marko Viitanen
4ea9bee0b6
Add rrc_rice extension flags to make bitstream correct with VTM 13.0 and update the CI VTM binary
2021-05-27 11:37:07 +03:00
Marko Viitanen
5aa04035d8
[LMCS] Fix a bug where floor_log2 function is used with 0 value
2021-05-27 08:39:58 +03:00
Joose Sainio
2df94f6a17
Fix rd=3
2021-05-27 08:39:41 +03:00
Marko Viitanen
9231ed4869
[LMCS] Update kvz_lmcs_preanalyzer inter side from VTM
2021-05-26 18:01:57 +03:00
Marko Viitanen
d040a4238c
[LMCS] Allocate LMCS images with the config flag since the actual enabled flag is checked later
2021-05-26 17:16:45 +03:00
Marko Viitanen
bb12894575
[LMCS] Always allocate the LMCS APS struct to simplify things
2021-05-26 17:01:19 +03:00
Marko Viitanen
a5ff9284a8
[LMCS] Enable LMCS per slice according to the pre-analyzer
2021-05-26 16:48:57 +03:00
Marko Viitanen
be9776e40f
Fix a bug causing tmvp related flag being written on intra frames
2021-05-26 14:31:34 +03:00
Marko Viitanen
e9044bfbc5
[LMCS] free source_lmcs and rec_lmcs in encoder_state_encode (as done with normal source and rec)
2021-05-25 17:42:34 +03:00
Marko Viitanen
3dae3f072e
[LMCS] Actually allocate the source_lmcs and rec_lmcs
2021-05-25 14:27:21 +03:00
Marko Viitanen
e5684b0be1
[LMCS] Free rec_lmcs and source_lmcs in kvz_encoder_prepare
2021-05-25 14:04:06 +03:00
Marko Viitanen
252d5c7eaf
[LMCS] Add top-level indicator for LMCS to know when we can free the images
2021-05-25 11:00:46 +03:00
Marko Viitanen
c69d456040
[LMCS] Fix memory leak and remove debug printing
2021-05-24 22:23:45 +03:00
Marko Viitanen
dbc7fd48bf
[LMCS] Initialize some m_reshapeCW values to avoid division by zero
2021-05-24 18:57:37 +03:00
Marko Viitanen
73ac3b68bf
[LMCS] add missing header in quant-avx2.c
2021-05-24 17:25:38 +03:00
Marko Viitanen
4cd5bc38a1
[LMCS] Luma mapping working after some rework, have to keep the reconstruction in the mapped domain
2021-05-24 17:23:17 +03:00
Marko Viitanen
88bec75306
[LMCS] keep the original reference data intact and keep lcu.rec in LMCS domain
2021-05-20 16:40:49 +03:00
Marko Viitanen
9b986c5359
[LMCS] fix division by zero
2021-05-20 16:38:46 +03:00
Marko Viitanen
3516972237
[LMCS] Move LMCS mapping / inverse to the source LCU data
2021-05-18 21:22:22 +03:00
Marko Viitanen
c6746b709c
[LMCS] Use calloc for lmcs_aps, makes it behave deterministic
2021-05-18 16:27:07 +03:00
Joose Sainio
cfd7d2666b
slightly optimize intra-generic.c
2021-05-14 10:23:37 +03:00
Marko Viitanen
178d62bde3
[LMCS] Move LMCS data structures under the frame
2021-05-12 11:42:34 +03:00
Joose Sainio
34fddeb85d
Re-enable LUMA_MULT and CHROMA_MULT
2021-05-07 14:20:48 +03:00
Joose Sainio
132a8b3d96
Try to fix rd=0 for 4x4 blocks
2021-05-07 09:30:12 +03:00
Marko Viitanen
f36c4e71ed
[LMCS] Fix source_lmcs and rec_lmcs deallocation
2021-05-06 13:15:39 +03:00
Marko Viitanen
d2670ccdc8
[LMCS] Create separate pictures for LMCS mapped pixels
2021-05-05 13:28:39 +03:00
Marko Viitanen
703cb155cb
[LMCS] Disable aps_chroma_present_flag -> decoded with hash mismatch
2021-05-04 16:54:14 +03:00
Marko Viitanen
e2ebfc946a
[LMCS] Free lmcs_aps in correct place
2021-05-04 16:44:05 +03:00
Marko Viitanen
73908b5237
[LMCS] Run the reshaper contruction and fix an assert
2021-05-04 15:48:01 +03:00
Marko Viitanen
d5abc3eb17
[LMCS] fix ReshapeCW.binCW array size
2021-05-04 12:17:59 +03:00
Marko Viitanen
19a3274770
[LMCS] Enable initial LMCS processing and APS writing
2021-05-04 12:04:22 +03:00
Joose Sainio
7674e94fd1
[rdoq] transform skip RDOQ
...
Copy the implementation from VTM
2021-05-03 12:52:10 +03:00
Marko Viitanen
69c1c3f4ea
[LMCS] Add kvz_construct_reshaper_lmcs and related functions
2021-05-03 09:13:53 +03:00
Marko Viitanen
3fadd91fb5
[LMCS] Add an assert in deriveReshapeParametersSDR to remove static analyser warning
2021-04-30 16:41:06 +03:00
Marko Viitanen
915057c0c5
[LMCS] Replace some dynamic arrays with static
2021-04-30 16:37:00 +03:00
Marko Viitanen
81ec3c3a1a
[LMCS] Converted kvz_lmcs_preanalyzer and related functions from VTM
2021-04-30 16:25:03 +03:00
Marko Viitanen
291ec70ccd
[LMCS] Convert stats generation function kvz_calc_seq_stats from VTM
2021-04-30 11:38:15 +03:00
Joose Sainio
d2b9893bb7
[transform skip] Fix misunderstanding that caused TS to use QP 52>=
2021-04-30 10:55:23 +03:00
Joose Sainio
a998f3ed74
[transform-skip] Convert the HEVC transfrom skip to VVC
...
For some reason transform skip uses QP MAX(52, QP) and the coeffs are
no longer shifted
2021-04-30 10:55:23 +03:00
Joose Sainio
7ff904fd9d
[transform-skip] Bitstream generation for transform-skip
2021-04-30 10:54:45 +03:00
Marko Viitanen
38eafbbf78
[LMCS] initial bitstream writing and LMCS structures
2021-04-30 10:04:41 +03:00
Marko Viitanen
3d9d1930d8
[LMCS] Add commandline option to enable LMCS
2021-04-30 09:51:41 +03:00
Joose Sainio
0cc1bf197f
Add monochrome tests and fix monochrome
2021-04-23 13:50:09 +03:00
Joose Sainio
56f163357b
Fix minor mistake in rewriting the history
2021-04-23 11:06:07 +03:00
Joose Sainio
fda73ded4a
Parameterize chroma qp scaling.
2021-04-23 10:57:30 +03:00
Joose Sainio
09b738061c
Fix deblocking
2021-04-23 10:57:30 +03:00
Joose Sainio
4f0ce14e53
Make internal symbols static
2021-04-23 10:57:30 +03:00
Joose Sainio
a12f99b7a3
Fix deblocking for luma
2021-04-23 10:57:29 +03:00
Joose Sainio
2ab005692d
Enable 4x4 intra CUs
2021-04-23 10:57:29 +03:00
Joose Sainio
d5a62c96b0
Properly implement chroma filtering
2021-04-23 10:57:29 +03:00
Joose Sainio
e521a59cd5
Perform deblocking on 4x4 grid instead of 8x8
2021-04-23 10:57:29 +03:00
Joose Sainio
1aaa95601c
Merge remote-tracking branch 'remotes/kvz_github/master' into Fix-monochrome
...
# Conflicts:
# .gitlab-ci.yml
# build/kvazaar_lib/kvazaar_lib.vcxproj.filters
# src/cfg.c
# src/encoder.h
# src/kvazaar.h
# src/rdo.c
2021-04-23 10:56:50 +03:00
Joose Sainio
764d23cdf5
Update entropy tables and correct order
2021-04-23 10:54:11 +03:00
Joose Sainio
119f80054a
Update get_ic_rate
2021-04-23 10:53:20 +03:00
Joose Sainio
15b710f4f6
update calc_last_bits
2021-04-23 10:52:50 +03:00
Joose Sainio
27e46ab7f4
ctx_set was incorrect for second iteration of coefficient level estimation
2021-04-23 10:51:52 +03:00
Joose Sainio
e8eab326fb
Update context selection to match VVC
2021-04-23 10:51:01 +03:00
Joose Sainio
1fd583eae0
go_rice_param calculation fix
2021-04-23 10:49:31 +03:00
Joose Sainio
8049ebb597
Fix header writing for monochrome. WIP: checksum header still incorrect
2021-03-17 13:01:26 +02:00
Joose Sainio
bdcf2210ed
reverse
2021-03-17 08:23:07 +02:00
Joose Sainio
7929c4bfe5
Test c_lambda instead of CHROMA_MULT
2021-03-17 08:22:38 +02:00
Joose Sainio
b2076d3b39
Enable chroma scaling
...
WIP: user defined scaling array
2021-03-16 10:31:26 +02:00
Joose Sainio
412781db41
[scalinglist] Fix quant-generic
2021-03-09 10:42:40 +02:00
Joose Sainio
21bc9aa3c2
[scalinglist] Fix memory leak
2021-03-09 10:04:11 +02:00
Joose Sainio
30e573c261
[scalinglist] WIP: Update scalinglist for VVC
...
Seems to work when rdoq is enabled but not when it is disabled
2021-03-09 09:51:49 +02:00
Ari Lemmetti
dad3d6818e
Only read left and right border pixels if necessary
2021-03-08 22:36:10 +02:00
Ari Lemmetti
b72ab583b4
Handle "don't care" rows in the end separately
2021-03-08 22:36:09 +02:00
Ari Lemmetti
33295bf350
Use AVX2 luma interpolation for SMP and AMP as well
2021-03-08 22:36:09 +02:00
Ari Lemmetti
7ce68761c2
Add a reminder to fix a rare case for bipred
2021-03-08 22:36:09 +02:00
Ari Lemmetti
475f1d79d5
Add some defines for important interpolation related sizes
2021-03-08 22:36:09 +02:00
Ari Lemmetti
4314f3a9a7
Rename some interpolation functions and strategies for consistency
2021-03-08 22:36:08 +02:00
Ari Lemmetti
5a70b49f69
Require 64-bit build for AVX2 interpolation filter functions
2021-03-08 22:36:08 +02:00
Ari Lemmetti
5631651469
Remove unused functions and variables
2021-03-08 22:36:08 +02:00
Ari Lemmetti
d8e7aac380
Do not use nonstandard extension for struct initialization.
2021-03-08 22:36:07 +02:00
Ari Lemmetti
e38219e489
Fix epol_func signature and function definition
2021-03-08 22:36:07 +02:00
Ari Lemmetti
7e6ba9750f
Add new AVX2 ip filters for chroma
2021-03-08 22:36:07 +02:00
Ari Lemmetti
3476fc62c7
Fix parameter to signed
2021-03-08 22:36:06 +02:00
Ari Lemmetti
e572066e46
Add new AVX2 vertical ip filter for pixel precision
2021-03-08 22:36:06 +02:00
Ari Lemmetti
9e4b62a891
Use the new horizontal filter for pixel precision as well
2021-03-08 22:36:06 +02:00
Ari Lemmetti
2175023843
Relocate function
2021-03-08 22:36:06 +02:00
Ari Lemmetti
f5b0e3c52b
Add new AVX2 horizontal ip filter capable of every luma PB
2021-03-08 22:36:05 +02:00
Ari Lemmetti
d9a3225ae5
Add new AVX2 vertical ip filter for high-precision
2021-03-08 22:36:05 +02:00
Ari Lemmetti
84222cf3e7
Replace old block extrapolation with more capable one.
...
Separate paddings for different directions can be now specified.
2021-03-08 22:36:04 +02:00
Jaakko Laitinen
845902062c
Fix warning and limit intra qp offset to -3
2021-03-04 18:08:59 +02:00
Marko Viitanen
29dee4e32a
[rdoq] implement more parts of rdoq like in VTM related to reg_bins value usage
2021-02-26 22:11:47 +02:00
Marko Viitanen
7dcf00d536
[rdoq] Change kvz_get_coeff_cost() to match current VTM
2021-02-26 20:43:33 +02:00