hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 19:24:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'fix-4x4-rc' into 'master'

Browse source 
Revert "[intra] Limit intra depth to 3 (8x8) for now"

See merge request cs/ultravideo/vvc/uvg266!10
This commit is contained in:
Joose Sainio 2022-05-05 14:45:49 +03:00
parent feb8a4d2e3 d5b6d2771c
commit a23f1c7035
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -373,7 +373,7 @@ where the names have been abbreviated to fit the layout in GitHub.
| | 0-uf | 1-sf | 2-vf | 3-fr | 4-f | 5-m | 6-s | 7-sr | 8-vs | 9-p | | | 0-uf | 1-sf | 2-vf | 3-fr | 4-f | 5-m | 6-s | 7-sr | 8-vs | 9-p |
| -------------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | | -------------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
| rd | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 2 | 2 | | rd | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 2 | 2 | 2 |
| pu-depth-intra | 2-3 | 2-3 | 2-3 | 2-3 | 1-3 | 1-3 | 1-3 | 1-3 | 1-3 | 1-3 | | pu-depth-intra | 2-3 | 2-3 | 2-3 | 2-3 | 1-3 | 1-4 | 1-4 | 1-4 | 1-4 | 1-4 |
| pu-depth-inter | 1-2 | 1-2 | 1-3 | 1-3 | 1-3 | 0-3 | 0-3 | 0-3 | 0-3 | 0-3 | | pu-depth-inter | 1-2 | 1-2 | 1-3 | 1-3 | 1-3 | 0-3 | 0-3 | 0-3 | 0-3 | 0-3 |
| me | hexbs | hexbs | hexbs | hexbs | hexbs | hexbs | hexbs | hexbs | tz | tz | | me | hexbs | hexbs | hexbs | hexbs | hexbs | hexbs | hexbs | hexbs | tz | tz |
| gop | 8 | 8 | 8 | 8 | 8 | 16 | 16 | 16 | 16 | 16 | | gop | 8 | 8 | 8 | 8 | 8 | 16 | 16 | 16 | 16 | 16 |

10
src/cfg.c
View file

@ -699,7 +699,7 @@ int uvg_config_parse(uvg_config *cfg, const char *name, const char *value)
{ {
"medium", "medium",
"rd", "0", "rd", "0",
"pu-depth-intra", "1-3", "pu-depth-intra", "1-4",
"pu-depth-inter", "0-3", "pu-depth-inter", "0-3",
"me", "hexbs", "me", "hexbs",
"gop", "16", "gop", "16",
@ -725,7 +725,7 @@ int uvg_config_parse(uvg_config *cfg, const char *name, const char *value)
{ {
"slow", "slow",
"rd", "1", "rd", "1",
"pu-depth-intra", "1-3", "pu-depth-intra", "1-4",
"pu-depth-inter", "0-3", "pu-depth-inter", "0-3",
"me", "hexbs", "me", "hexbs",
"gop", "16", "gop", "16",
@ -751,7 +751,7 @@ int uvg_config_parse(uvg_config *cfg, const char *name, const char *value)
{ {
"slower", "slower",
"rd", "2", "rd", "2",
"pu-depth-intra", "1-3", "pu-depth-intra", "1-4",
"pu-depth-inter", "0-3", "pu-depth-inter", "0-3",
"me", "hexbs", "me", "hexbs",
"gop", "16", "gop", "16",
@ -777,7 +777,7 @@ int uvg_config_parse(uvg_config *cfg, const char *name, const char *value)
{ {
"veryslow", "veryslow",
"rd", "2", "rd", "2",
"pu-depth-intra", "1-3", "pu-depth-intra", "1-4",
"pu-depth-inter", "0-3", "pu-depth-inter", "0-3",
"me", "tz", "me", "tz",
"gop", "16", "gop", "16",
@ -803,7 +803,7 @@ int uvg_config_parse(uvg_config *cfg, const char *name, const char *value)
{ {
"placebo", "placebo",
"rd", "2", "rd", "2",
"pu-depth-intra", "1-3", "pu-depth-intra", "1-4",
"pu-depth-inter", "0-3", "pu-depth-inter", "0-3",
"me", "tz", "me", "tz",
"gop", "16", "gop", "16",

2
src/encode_coding_tree.c
View file

@ -570,7 +570,7 @@ static void encode_transform_coeff(encoder_state_t * const state,
} }
if (cb_flag_y | cb_flag_u | cb_flag_v) { if (cb_flag_y | cb_flag_u | cb_flag_v) {
if (state->must_code_qp_delta) { if (state->must_code_qp_delta && (only_chroma || cb_flag_y || depth != 4) ) {
const int qp_pred = uvg_get_cu_ref_qp(state, x_cu, y_cu, state->last_qp); const int qp_pred = uvg_get_cu_ref_qp(state, x_cu, y_cu, state->last_qp);
const int qp_delta = cur_cu->qp - qp_pred; const int qp_delta = cur_cu->qp - qp_pred;
// Possible deltaQP range depends on bit depth as stated in HEVC specification. // Possible deltaQP range depends on bit depth as stated in HEVC specification.

2
src/global.h
View file

@ -149,7 +149,7 @@ typedef int16_t mv_t;
#define PU_DEPTH_INTER_MIN 0 #define PU_DEPTH_INTER_MIN 0
#define PU_DEPTH_INTER_MAX 3 #define PU_DEPTH_INTER_MAX 3
#define PU_DEPTH_INTRA_MIN 0 #define PU_DEPTH_INTRA_MIN 0
#define PU_DEPTH_INTRA_MAX 3 #define PU_DEPTH_INTRA_MAX 4
//! Maximum number of layers in GOP structure (for allocating structures) //! Maximum number of layers in GOP structure (for allocating structures)
#define MAX_GOP_LAYERS 6 #define MAX_GOP_LAYERS 6

2
tests/test_intra.sh
View file

@ -6,7 +6,7 @@ set -eu
. "${0%/*}/util.sh" . "${0%/*}/util.sh"
common_args='256x128 10 yuv420p -p1 --preset=ultrafast --threads=0 --no-wpp --no-tmvp --no-deblock --sao=0 --pu-depth-intra 0-3' common_args='256x128 10 yuv420p -p1 --preset=ultrafast --threads=0 --no-wpp --no-tmvp --no-deblock --sao=0 --pu-depth-intra 0-4'
valgrind_test $common_args --rd=1 valgrind_test $common_args --rd=1
valgrind_test $common_args --rd=2 --no-transform-skip --qp 37 valgrind_test $common_args --rd=2 --no-transform-skip --qp 37
valgrind_test $common_args --rd=2 --no-transform-skip --qp 37 --signhide --rdoq valgrind_test $common_args --rd=2 --no-transform-skip --qp 37 --signhide --rdoq

2
tests/test_lmcs.sh
View file

@ -6,6 +6,6 @@ set -eu
. "${0%/*}/util.sh" . "${0%/*}/util.sh"
common_args='256x128 10 yuv420p -p1 --preset=ultrafast --threads=0 --no-wpp --no-tmvp --no-deblock --sao=0 --cpuid=0 --pu-depth-intra 0-3 --lmcs' common_args='256x128 10 yuv420p -p1 --preset=ultrafast --threads=0 --no-wpp --no-tmvp --no-deblock --sao=0 --cpuid=0 --pu-depth-intra 0-4 --lmcs'
valgrind_test $common_args --deblock --sao=full --alf=full valgrind_test $common_args --deblock --sao=full --alf=full

2
tests/test_monochrome.sh
View file

@ -6,7 +6,7 @@ set -eu
. "${0%/*}/util.sh" . "${0%/*}/util.sh"
common_args='256x128 10 gray --hash none --preset=ultrafast --input-format P400 --threads=0 --no-wpp --no-tmvp --no-deblock --sao=0 --cpuid=0 --pu-depth-intra 0-3' common_args='256x128 10 gray --hash none --preset=ultrafast --input-format P400 --threads=0 --no-wpp --no-tmvp --no-deblock --sao=0 --cpuid=0 --pu-depth-intra 0-4'
valgrind_test $common_args --rd=1 -p1 valgrind_test $common_args --rd=1 -p1
valgrind_test $common_args --rd=2 -p1 valgrind_test $common_args --rd=2 -p1
valgrind_test $common_args --rd=2 -p1 --deblock 0:0 valgrind_test $common_args --rd=2 -p1 --deblock 0:0