Replace residue bootstrap model with plain bootstrap one

README.md

@@ -38,7 +38,7 @@ Usage
   * 1 = harmonic mean
   * 2 = min
 
-* ci: Whether to enable confidence interval. Refer to the [VMAF confidence interval](https://github.com/Netflix/vmaf/blob/master/resource/doc/conf_interval.md) page for more details.
+* ci: Whether to enable confidence interval. If True, it uses vmaf_b_v0.6.3 for `model=0` and vmaf_4k_rb_v0.6.2 for `model=1`. Refer to the [VMAF confidence interval](https://github.com/Netflix/vmaf/blob/master/resource/doc/conf_interval.md) page for more details.
 
 
 Compilation

VMAF/VMAF.cpp

@@ -221,7 +221,7 @@ static void VS_CC vmafCreate(const VSMap *in, VSMap *out, void *userData, VSCore
         const std::string pluginPath{ vsapi->getPluginPath(vsapi->getPluginById("com.holywu.vmaf", core)) };
         std::string modelPath{ pluginPath.substr(0, pluginPath.find_last_of('/')) };
         if (model == 0)
-            modelPath += d->ci ? "/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl" : "/model/vmaf_v0.6.1.pkl";
+            modelPath += d->ci ? "/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl" : "/model/vmaf_v0.6.1.pkl";
         else
             modelPath += d->ci ? "/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.pkl" : "/model/vmaf_4k_v0.6.1.pkl";
         d->modelPath = std::make_unique<char[]>(modelPath.length() + 1);

VMAF/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl → VMAF/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl

@@ -94,7 +94,7 @@ aF-0.7577185792093722
 aF-1.083428597549764
 asS'model_type'
 p41
-S'RESIDUEBOOTSTRAP_LIBSVMNUSVR'
+S'BOOTSTRAP_LIBSVMNUSVR'
 p42
 sS'model'
 p43

VMAF/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0001 → VMAF/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0001

@@ -94,7 +94,7 @@ aF-0.7577185792093722
 aF-1.083428597549764
 asS'model_type'
 p41
-S'RESIDUEBOOTSTRAP_LIBSVMNUSVR'
+S'BOOTSTRAP_LIBSVMNUSVR'
 p42
 sS'model'
 p43

VMAF/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0003 → VMAF/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0002

@@ -94,7 +94,7 @@ aF-0.7577185792093722
 aF-1.083428597549764
 asS'model_type'
 p41
-S'RESIDUEBOOTSTRAP_LIBSVMNUSVR'
+S'BOOTSTRAP_LIBSVMNUSVR'
 p42
 sS'model'
 p43

VMAF/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.pkl.0002 → VMAF/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0003

@@ -94,7 +94,7 @@ aF-0.7577185792093722
 aF-1.083428597549764
 asS'model_type'
 p41
-S'RESIDUEBOOTSTRAP_LIBSVMNUSVR'
+S'BOOTSTRAP_LIBSVMNUSVR'
 p42
 sS'model'
 p43

VMAF/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0004

@@ -0,0 +1,111 @@
+(dp0
+S'param_dict'
+p1
+(dp2
+S'C'
+p3
+F4.0
+sS'score_transform'
+p4
+(dp5
+S'p2'
+p6
+F-0.00705305
+sS'out_gte_in'
+p7
+S'true'
+p8
+sS'p0'
+p9
+F1.70674692
+sS'p1'
+p10
+F1.72643844
+ssS'norm_type'
+p11
+S'clip_0to1'
+p12
+sS'score_clip'
+p13
+(lp14
+F0.0
+aF100.0
+asS'num_models'
+p15
+I21
+sS'nu'
+p16
+F0.9
+sS'gamma'
+p17
+F0.04
+ssS'model_dict'
+p18
+(dp19
+g4
+g5
+sS'feature_dict'
+p20
+(dp21
+S'VMAF_feature'
+p22
+(lp23
+S'vif_scale0'
+p24
+aS'vif_scale1'
+p25
+aS'vif_scale2'
+p26
+aS'vif_scale3'
+p27
+aS'adm2'
+p28
+aS'motion2'
+p29
+assg11
+S'linear_rescale'
+p30
+sg13
+g14
+sS'feature_names'
+p31
+(lp32
+S'VMAF_feature_adm2_score'
+p33
+aS'VMAF_feature_motion2_score'
+p34
+aS'VMAF_feature_vif_scale0_score'
+p35
+aS'VMAF_feature_vif_scale1_score'
+p36
+aS'VMAF_feature_vif_scale2_score'
+p37
+aS'VMAF_feature_vif_scale3_score'
+p38
+asS'intercepts'
+p39
+(lp40
+F-0.3092981927591963
+aF-1.778561646908718
+aF-0.003017198086831897
+aF-0.1728125095425364
+aF-0.5294309090081222
+aF-0.7577185792093722
+aF-1.083428597549764
+asS'model_type'
+p41
+S'BOOTSTRAP_LIBSVMNUSVR'
+p42
+sS'model'
+p43
+NsS'slopes'
+p44
+(lp45
+F0.012020766332648465
+aF2.7863890579902773
+aF0.06264407466686016
+aF1.222763456258933
+aF1.5360318811084146
+aF1.7620864995501058
+aF2.08656468286432
+ass.

VMAF/model/vmaf_b_v0.6.3/vmaf_b_v0.6.3.pkl.0005

@@ -0,0 +1,111 @@
+(dp0
+S'param_dict'
+p1
+(dp2
+S'C'
+p3
+F4.0
+sS'score_transform'
+p4
+(dp5
+S'p2'
+p6
+F-0.00705305
+sS'out_gte_in'
+p7
+S'true'
+p8
+sS'p0'
+p9
+F1.70674692
+sS'p1'
+p10
+F1.72643844
+ssS'norm_type'
+p11
+S'clip_0to1'
+p12
+sS'score_clip'
+p13
+(lp14
+F0.0
+aF100.0
+asS'num_models'
+p15
+I21
+sS'nu'
+p16
+F0.9
+sS'gamma'
+p17
+F0.04
+ssS'model_dict'
+p18
+(dp19
+g4
+g5
+sS'feature_dict'
+p20
+(dp21
+S'VMAF_feature'
+p22
+(lp23
+S'vif_scale0'
+p24
+aS'vif_scale1'
+p25
+aS'vif_scale2'
+p26
+aS'vif_scale3'
+p27
+aS'adm2'
+p28
+aS'motion2'
+p29
+assg11
+S'linear_rescale'
+p30
+sg13
+g14
+sS'feature_names'
+p31
+(lp32
+S'VMAF_feature_adm2_score'
+p33
+aS'VMAF_feature_motion2_score'
+p34
+aS'VMAF_feature_vif_scale0_score'
+p35
+aS'VMAF_feature_vif_scale1_score'
+p36
+aS'VMAF_feature_vif_scale2_score'
+p37
+aS'VMAF_feature_vif_scale3_score'
+p38
+asS'intercepts'
+p39
+(lp40
+F-0.3092981927591963
+aF-1.778561646908718
+aF-0.003017198086831897
+aF-0.1728125095425364
+aF-0.5294309090081222
+aF-0.7577185792093722
+aF-1.083428597549764
+asS'model_type'
+p41
+S'BOOTSTRAP_LIBSVMNUSVR'
+p42
+sS'model'
+p43
+NsS'slopes'
+p44
+(lp45
+F0.012020766332648465
+aF2.7863890579902773
+aF0.06264407466686016
+aF1.222763456258933
+aF1.5360318811084146
+aF1.7620864995501058
+aF2.08656468286432
+ass.