version 0.3.0-rc29

Continue to fine-tune the nhw_kernel weights
rcanut · Oct 10, 2024 · d152080 · d152080
1 parent aaa336f
commit d152080
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 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-rc28 						     		     			   *
-*  last update: $ 10062024 nhw exp $							           *
+*  version: 0.3.0-rc29 						     		     			   *
+*  last update: $ 10102024 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;
+    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;
     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;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;i<((4*IM_SIZE)-(2*IM_DIM));i+=(2*IM_DIM))
 	{
 		for (scan=i+1,j=1;j<((2*IM_DIM)-2);j++,scan++)
 		{   
@@ -852,7 +852,7 @@ void pre_processing(image_buffer *im)
 
 					if (abs(count)>sharpness)
 					{
-                        if (t2==1)
+                        if (t2==1 || t12==1)
                         {
                             if (!t3)
                             {
@@ -1013,21 +1013,27 @@ void pre_processing(image_buffer *im)
 					{
                         t5++;
 
-                        if (!t12)
+                        if (t5<35)
                         {
-                            if (t5<35)
+                            t1 = 0;
+
+                            if (!t13)
                             {
-                                t1 = 0;
+                                t12 = 1;
+
+                                t13 = 1;
                             }
-                            else if (t5>36)
+                            else
                             {
-                                t12 = 1;
+                                t12 = 0;
+
+                                t13++;
+
+                                if (t13>3) t13 = 0;
                             }
+
                         }
-                        else
-                        {
-							t12 = 0;
-                        }
+                        else t12 = 0;
 					}
 
 					if (t1>15)

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-rc28                                                     *
-*  last update: $ 10062024 nhw exp $                                       *
+*  version: 0.3.0-rc29                                                     *
+*  last update: $ 10102024 nhw exp $                                       *
 *                                                                          *
 ****************************************************************************
 ****************************************************************************
@@ -50,7 +50,7 @@
 #include "codec.h"
 
 #define PROGRAM "nhw-enc"
-#define VERSION "0.3.0-rc28"
+#define VERSION "0.3.0-rc29"
 
 #define NHW_QUALITY_MIN LOW20
 #define NHW_QUALITY_MAX HIGH3