Move 2pass partition model to partition_model_weights.h
Change-Id: Iec3cbd9986d35241bc0efbe3eba7f109ef3c8992
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 16f341d..7cf3247 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -2787,77 +2787,6 @@
}
}
-#define FEATURE_SIZE 19
-static const float two_pass_split_partition_weights_128[FEATURE_SIZE + 1] = {
- 2.683936f, -0.193620f, -4.106470f, -0.141320f, -0.282289f,
- 0.125296f, -1.134961f, 0.862757f, -0.418799f, -0.637666f,
- 0.016232f, 0.345013f, 0.018823f, -0.393394f, -1.130700f,
- 0.695357f, 0.112569f, -0.341975f, -0.513882f, 5.7488966f,
-};
-
-static const float two_pass_split_partition_weights_64[FEATURE_SIZE + 1] = {
- 2.990993f, 0.423273f, -0.926544f, 0.454646f, -0.292698f,
- -1.311632f, -0.284432f, 0.717141f, -0.419257f, -0.574760f,
- -0.674444f, 0.669047f, -0.374255f, 0.380624f, -0.804036f,
- 0.264021f, 0.004163f, 1.896802f, 0.924287f, 0.13490619f,
-};
-
-static const float two_pass_split_partition_weights_32[FEATURE_SIZE + 1] = {
- 2.795181f, -0.136943f, -0.924842f, 0.405330f, -0.463505f,
- -0.584076f, -0.831472f, 0.382985f, -0.597544f, -0.138915f,
- -1.354350f, 0.466035f, -0.553961f, 0.213202f, -1.166429f,
- 0.010776f, -0.096236f, 2.335084f, 1.699857f, -0.58178353f,
-};
-
-static const float two_pass_split_partition_weights_16[FEATURE_SIZE + 1] = {
- 1.987888f, -0.431100f, -1.687703f, 0.262602f, -0.425298f,
- -0.463870f, -1.493457f, 0.470917f, -0.528457f, -0.087700f,
- -1.815092f, 0.152883f, -0.337908f, 0.093679f, -1.548267f,
- -0.042387f, -0.000861f, 2.556746f, 1.619192f, 0.03643292f,
-};
-
-static const float two_pass_split_partition_weights_8[FEATURE_SIZE + 1] = {
- 2.188344f, -0.817528f, -2.119219f, 0.000000f, -0.348167f,
- -0.658074f, -1.960362f, 0.000000f, -0.403080f, 0.282699f,
- -2.061088f, 0.000000f, -0.431919f, -0.127960f, -1.099550f,
- 0.000000f, 0.121622f, 2.017455f, 2.058228f, -0.15475988f,
-};
-
-static const float two_pass_none_partition_weights_128[FEATURE_SIZE + 1] = {
- -1.006689f, 0.777908f, 4.461072f, -0.395782f, -0.014610f,
- -0.853863f, 0.729997f, -0.420477f, 0.282429f, -1.194595f,
- 3.181220f, -0.511416f, 0.117084f, -1.149348f, 1.507990f,
- -0.477212f, 0.202963f, -1.469581f, 0.624461f, -0.89081228f,
-};
-
-static const float two_pass_none_partition_weights_64[FEATURE_SIZE + 1] = {
- -1.241117f, 0.844878f, 5.638803f, -0.489780f, -0.108796f,
- -4.576821f, 1.540624f, -0.477519f, 0.227791f, -1.443968f,
- 1.586911f, -0.505125f, 0.140764f, -0.464194f, 1.466658f,
- -0.641166f, 0.195412f, 1.427905f, 2.080007f, -1.98272777f,
-};
-
-static const float two_pass_none_partition_weights_32[FEATURE_SIZE + 1] = {
- -2.130825f, 0.476023f, 5.907343f, -0.516002f, -0.097471f,
- -2.662754f, 0.614858f, -0.576728f, 0.085261f, -0.031901f,
- 0.727842f, -0.600034f, 0.079326f, 0.324328f, 0.504502f,
- -0.547105f, -0.037670f, 0.304995f, 0.369018f, -2.66299987f,
-};
-
-static const float two_pass_none_partition_weights_16[FEATURE_SIZE + 1] = {
- -1.626410f, 0.872047f, 5.414965f, -0.554781f, -0.084514f,
- -3.020550f, 0.467632f, -0.382280f, 0.199568f, 0.426220f,
- 0.829426f, -0.467100f, 0.153098f, 0.662994f, 0.327545f,
- -0.560106f, -0.141610f, 0.403372f, 0.523991f, -3.02891231f,
-};
-
-static const float two_pass_none_partition_weights_8[FEATURE_SIZE + 1] = {
- -1.463349f, 0.375376f, 4.751430f, 0.000000f, -0.184451f,
- -1.655447f, 0.443214f, 0.000000f, 0.127961f, 0.152435f,
- 0.083288f, 0.000000f, 0.143105f, 0.438012f, 0.073238f,
- 0.000000f, -0.278137f, 0.186134f, 0.073737f, -1.6494962f,
-};
-
// split_score indicates confidence of picking split partition;
// none_score indicates confidence of picking none partition;
static int ml_prune_2pass_split_partition(const PC_TREE_STATS *pc_tree_stats,
diff --git a/av1/encoder/partition_model_weights.h b/av1/encoder/partition_model_weights.h
index 0bec4cc..2e7b2c6 100644
--- a/av1/encoder/partition_model_weights.h
+++ b/av1/encoder/partition_model_weights.h
@@ -3784,6 +3784,77 @@
#undef NUM_LAYER_0_UNITS_8
#undef NUM_LOGITS_8
+#define FEATURE_SIZE 19
+static const float two_pass_split_partition_weights_128[FEATURE_SIZE + 1] = {
+ 2.683936f, -0.193620f, -4.106470f, -0.141320f, -0.282289f,
+ 0.125296f, -1.134961f, 0.862757f, -0.418799f, -0.637666f,
+ 0.016232f, 0.345013f, 0.018823f, -0.393394f, -1.130700f,
+ 0.695357f, 0.112569f, -0.341975f, -0.513882f, 5.7488966f,
+};
+
+static const float two_pass_split_partition_weights_64[FEATURE_SIZE + 1] = {
+ 2.990993f, 0.423273f, -0.926544f, 0.454646f, -0.292698f,
+ -1.311632f, -0.284432f, 0.717141f, -0.419257f, -0.574760f,
+ -0.674444f, 0.669047f, -0.374255f, 0.380624f, -0.804036f,
+ 0.264021f, 0.004163f, 1.896802f, 0.924287f, 0.13490619f,
+};
+
+static const float two_pass_split_partition_weights_32[FEATURE_SIZE + 1] = {
+ 2.795181f, -0.136943f, -0.924842f, 0.405330f, -0.463505f,
+ -0.584076f, -0.831472f, 0.382985f, -0.597544f, -0.138915f,
+ -1.354350f, 0.466035f, -0.553961f, 0.213202f, -1.166429f,
+ 0.010776f, -0.096236f, 2.335084f, 1.699857f, -0.58178353f,
+};
+
+static const float two_pass_split_partition_weights_16[FEATURE_SIZE + 1] = {
+ 1.987888f, -0.431100f, -1.687703f, 0.262602f, -0.425298f,
+ -0.463870f, -1.493457f, 0.470917f, -0.528457f, -0.087700f,
+ -1.815092f, 0.152883f, -0.337908f, 0.093679f, -1.548267f,
+ -0.042387f, -0.000861f, 2.556746f, 1.619192f, 0.03643292f,
+};
+
+static const float two_pass_split_partition_weights_8[FEATURE_SIZE + 1] = {
+ 2.188344f, -0.817528f, -2.119219f, 0.000000f, -0.348167f,
+ -0.658074f, -1.960362f, 0.000000f, -0.403080f, 0.282699f,
+ -2.061088f, 0.000000f, -0.431919f, -0.127960f, -1.099550f,
+ 0.000000f, 0.121622f, 2.017455f, 2.058228f, -0.15475988f,
+};
+
+static const float two_pass_none_partition_weights_128[FEATURE_SIZE + 1] = {
+ -1.006689f, 0.777908f, 4.461072f, -0.395782f, -0.014610f,
+ -0.853863f, 0.729997f, -0.420477f, 0.282429f, -1.194595f,
+ 3.181220f, -0.511416f, 0.117084f, -1.149348f, 1.507990f,
+ -0.477212f, 0.202963f, -1.469581f, 0.624461f, -0.89081228f,
+};
+
+static const float two_pass_none_partition_weights_64[FEATURE_SIZE + 1] = {
+ -1.241117f, 0.844878f, 5.638803f, -0.489780f, -0.108796f,
+ -4.576821f, 1.540624f, -0.477519f, 0.227791f, -1.443968f,
+ 1.586911f, -0.505125f, 0.140764f, -0.464194f, 1.466658f,
+ -0.641166f, 0.195412f, 1.427905f, 2.080007f, -1.98272777f,
+};
+
+static const float two_pass_none_partition_weights_32[FEATURE_SIZE + 1] = {
+ -2.130825f, 0.476023f, 5.907343f, -0.516002f, -0.097471f,
+ -2.662754f, 0.614858f, -0.576728f, 0.085261f, -0.031901f,
+ 0.727842f, -0.600034f, 0.079326f, 0.324328f, 0.504502f,
+ -0.547105f, -0.037670f, 0.304995f, 0.369018f, -2.66299987f,
+};
+
+static const float two_pass_none_partition_weights_16[FEATURE_SIZE + 1] = {
+ -1.626410f, 0.872047f, 5.414965f, -0.554781f, -0.084514f,
+ -3.020550f, 0.467632f, -0.382280f, 0.199568f, 0.426220f,
+ 0.829426f, -0.467100f, 0.153098f, 0.662994f, 0.327545f,
+ -0.560106f, -0.141610f, 0.403372f, 0.523991f, -3.02891231f,
+};
+
+static const float two_pass_none_partition_weights_8[FEATURE_SIZE + 1] = {
+ -1.463349f, 0.375376f, 4.751430f, 0.000000f, -0.184451f,
+ -1.655447f, 0.443214f, 0.000000f, 0.127961f, 0.152435f,
+ 0.083288f, 0.000000f, 0.143105f, 0.438012f, 0.073238f,
+ 0.000000f, -0.278137f, 0.186134f, 0.073737f, -1.6494962f,
+};
+
#ifdef __cplusplus
} // extern "C"
#endif
