Aggressify partition pruning on spd 3/4
Performance:
TESTSET | AVG_PSNR | OVR_PSNR | SSIM | AVG_SPD | OVR_SPD
LOWRES | +0.224% | +0.237% | +0.242% | +08.999% | +08.502%
MIDRES | +0.220% | +0.234% | +0.100% | +11.022% | +10.766%
HDRES | +0.318% | +0.301% | +0.141% | +10.571% | +11.988%
STATS_CHANGED
Change-Id: I12e92bbb296da2210bf1918f85007f17da54c13a
diff --git a/av1/encoder/partition_model_weights.h b/av1/encoder/partition_model_weights.h
index 1688223..4495873 100644
--- a/av1/encoder/partition_model_weights.h
+++ b/av1/encoder/partition_model_weights.h
@@ -2475,29 +2475,29 @@
},
// Aggressiveness = 1
{
- // lowres
+ // Lowres
{
- 1.40402595879f, // p = 0.8028197
- 4.72845183649f, // p = 0.99123732
- 1.86517797783f, // p = 0.86589934
- 1.58715223005f, // p = 0.83021506
- 7.22695596987f, // p = 0.9992738
+ 100.0000f, // p = 1.000000
+ 4.952535f, // p = 0.992984
+ 1.720880f, // p = 0.848242
+ 1.426233f, // p = 0.806314
+ 1.491905f, // p = 0.816364
},
- // midres
+ // Midres
{
- 5.839480f, // p = 0.997098
- 1.877167f, // p = 0.867285
- 3.073499f, // p = 0.955783
- 1.405601f, // p = 0.803071
- 2.555636f, // p = 0.927951
+ 100.0000f, // p = 100.0000
+ 3.137263f, // p = 0.958404
+ 2.703262f, // p = 0.937219
+ 1.877166f, // p = 0.867285
+ 2.221149f, // p = 0.902133
},
- // hdres
+ // Hdres
{
- 5.839480f, // p = 0.997098
- 1.877167f, // p = 0.867285
- 3.073499f, // p = 0.955783
- 1.405601f, // p = 0.803071
- 2.555636f, // p = 0.927951
+ 4.417680f, // p = 0.988082
+ 3.086898f, // p = 0.956349
+ 3.966704f, // p = 0.981416
+ 1.532565f, // p = 0.822381
+ 3.449975f, // p = 0.969230
},
},
// Aggressiveness = 2
@@ -2559,29 +2559,29 @@
},
// Aggressiveness = 1
{
- // lowres
+ // Lowres
{
- -100.0f, // p = 0.0
- -100.0f, // p = 0.0
- -100.0f, // p = 0.0
- -100.0f, // p = 0.0
- -100.0f, // p = 0.0
+ -100.0000f, // p = 0.0
+ -4.893793f, // p = 0.007437
+ -3.387766f, // p = 0.032680
+ -2.982806f, // p = 0.048209
+ -2.330372f, // p = 0.088639
},
- // midres
+ // Midres
{
- -3.38168078f, // p = 0.032872917
- -4.08610739f, // p = 0.016526795
- -1.78302370f, // p = 0.15270848
- -100.000000f, // p = 0.0
- -100.000000f, // p = 0.0
+ -100.0000f, // p = 0.000000
+ -6.131853f, // p = 0.002168
+ -2.346579f, // p = 0.087338
+ -2.712849f, // p = 0.062219
+ -3.195430f, // p = 0.039338
},
- // hdres
+ // Hdres
{
- -100.000000f, // p = 0.0
- -100.000000f, // p = 0.0
- -2.98718897f, // p = 0.048008
- -100.000000f, // p = 0.0
- -3.33229488f, // p = 0.03447975
+ -3.491416f, // p = 0.029557
+ -2.192853f, // p = 0.100394
+ -3.620180f, // p = 0.026079
+ -2.030855f, // p = 0.116001
+ -2.797586f, // p = 0.057455
},
},
// Aggressiveness = 2
@@ -3296,14 +3296,29 @@
// Aggressivness = 1
{
// Lowres
- { 0.0288721601835f, 0.0281573780991f, 0.0225501403434f,
- 0.000961189195907f, 0.0f },
+ {
+ 0.000000f,
+ 0.116076f,
+ 0.049759f,
+ 0.057747f,
+ 0.006001f,
+ },
// Midres
- { 0.0288721601835f, 0.0281573780991f, 0.0225501403434f,
- 0.000961189195907f, 0.0f },
+ {
+ 0.000000f,
+ 0.017380f,
+ 0.026077f,
+ 0.078111f,
+ 0.064477f,
+ },
// Hdres
- { 0.0288721601835f, 0.0281573780991f, 0.0225501403434f,
- 0.000961189195907f, 0.0f },
+ {
+ 0.002994f,
+ 0.103093f,
+ 0.076408f,
+ 0.010456f,
+ 0.187211f,
+ },
},
// Aggressiveness = 2
{
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 43bbf58..7424121 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -379,6 +379,7 @@
frame_is_intra_only(&cpi->common) ? 0 : 1;
sf->reduce_wiener_window_size = is_boosted_arf2_bwd_type ? 0 : 1;
sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED;
+ sf->simple_motion_search_prune_agg = 1;
}
if (speed >= 4) {
