version 0.3.0-rc31

Continue to fine-tune the nhw_kernel weights
rcanut · Oct 17, 2024 · 88f2f18 · 88f2f18
1 parent be48d80
commit 88f2f18
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 7 deletions.
diff --git a/encoder/image_processing.c b/encoder/image_processing.c
@@ -2,8 +2,8 @@
 ****************************************************************************
 *  NHW Image Codec 													       *
 *  file: image_processing.c  										       *
-*  version: 0.3.0-rc30 						     		     			   *
-*  last update: $ 10152024 nhw exp $							           *
+*  version: 0.3.0-rc31 						     		     			   *
+*  last update: $ 10172024 nhw exp $							           *
 *																		   *
 ****************************************************************************
 ****************************************************************************
@@ -557,7 +557,7 @@ void im_recons_wavelet_band(image_buffer *im)
 
 void pre_processing(image_buffer *im)
 {
-    int i,j,scan,res,res2,res3,res4,count,e=0,f=0,a=0,sharpness=0,sharpn2=0,n1,t,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15;
+    int i,j,scan,res,res2,res3,res4,count,e=0,f=0,a=0,sharpness=0,sharpn2=0,n1,t,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16;
     int nps,w1,w2,w3,w4,w5,w6,w7,w8;
 	short *nhw_process, *nhw_kernel;
 	char lower_quality_setting_on, *nhw_sharp_on;
@@ -767,7 +767,7 @@ void pre_processing(image_buffer *im)
 
 	if (im->setup->quality_setting<=LOW4) nhw_sharp_on=(char*)calloc(4*IM_SIZE,sizeof(char));
 
-	for (i=(2*IM_DIM),t1=0,t2=0,t3=0,t4=0,t5=0,t6=8,t7=0,t8=0,t9=0,t10=10,t11=15,t12=0,t13=0,t14=0,t15=0;i<((4*IM_SIZE)-(2*IM_DIM));i+=(2*IM_DIM))
+	for (i=(2*IM_DIM),t1=0,t2=0,t3=0,t4=0,t5=0,t6=8,t7=0,t8=0,t9=0,t10=10,t11=15,t12=0,t13=0,t14=0,t15=0,t16=0;i<((4*IM_SIZE)-(2*IM_DIM));i+=(2*IM_DIM))
 	{
 		for (scan=i+1,j=1;j<((2*IM_DIM)-2);j++,scan++)
 		{   
@@ -1007,6 +1007,73 @@ void pre_processing(image_buffer *im)
 
 								t11 = 9;
 							}
+							else if (t7>=4)
+							{
+								if (!t16)
+								{
+									t10 = 10;
+
+									t11 = 15;
+
+									t16 = 1;
+								}
+								else if (t16==1)
+								{
+									t10 = 8;
+
+									t11 = 12;
+
+									t16 = 2;
+								}
+								else if (t16==2)
+								{
+									t10 = 10;
+
+									t11 = 15;
+
+									t16 = 3;
+								}
+								else if (t16==3)
+								{
+									t10 = 8;
+
+									t11 = 12;
+
+									t16 = 4;
+								}
+								else if (t16==4)
+								{
+									t10 = 10;
+
+									t11 = 15;
+
+									t16 = 5;
+								}
+								else if (t16==5)
+								{
+									t10 = 10;
+
+									t11 = 15;
+
+									t16 = 6;
+								}
+								else if (t16==6)
+								{
+									t10 = 8;
+
+									t11 = 12;
+
+									t16 = 7;
+								}
+								else if (t16==7)
+								{
+									t10 = 8;
+
+									t11 = 12;
+
+									t16 = 0;
+								}
+							}
 							else
 							{
 								if (t10==8) t10 = 10;else t10 = 8;

diff --git a/encoder/nhw_encoder_cli.c b/encoder/nhw_encoder_cli.c
@@ -2,8 +2,8 @@
 ****************************************************************************
 *  NHW Image Codec                                                         *
 *  file: nhw_encoder_cli.c                                                 *
-*  version: 0.3.0-rc30                                                     *
-*  last update: $ 10152024 nhw exp $                                       *
+*  version: 0.3.0-rc31                                                     *
+*  last update: $ 10172024 nhw exp $                                       *
 *                                                                          *
 ****************************************************************************
 ****************************************************************************
@@ -50,7 +50,7 @@
 #include "codec.h"
 
 #define PROGRAM "nhw-enc"
-#define VERSION "0.3.0-rc30"
+#define VERSION "0.3.0-rc31"
 
 #define NHW_QUALITY_MIN LOW20
 #define NHW_QUALITY_MAX HIGH3