统一版本号

uavs3 · Aug 23, 2022 · 3094f1f · 3094f1f
1 parent 6123115
commit 3094f1f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/bin/encoder_ra.cfg b/bin/encoder_ra.cfg
@@ -5,23 +5,23 @@
 ##########################################################################################
 # Files
 ##########################################################################################
-InputFile                = "E:\sequence\huawei\sintel_trailer_2k_720p24.yuv"     # Input sequence, YUV 4:2:0
-FramesToBeEncoded        = 10000          # Number of frames to be coded
+InputFile                = "A:\test_seq\huawei\sintel_trailer_2k_720p24.yuv"     # Input sequence, YUV 4:2:0
+FramesToBeEncoded        = 500         # Number of frames to be coded
 SourceWidth              = 1280         # Image width  in Pels, must be multiple of 16
 SourceHeight             = 720         # Image height in Pels, must be multiple of 16
 FrameRate                = 24        
 FrameRateDen             = 1 
 SampleBitDepth           = 8
 CodingBitDepth           = 8      
 TraceFile                = "psnr.txt"
-ReconFile                = "D:\work\huawei\sing\test.yuv"
-OutputFile               = "D:\work\huawei\sing\test.avs"
+ReconFile                = ""
+OutputFile               = "out.avs"
 
 threads-wpp              = 1
 threads-frm              = 1
 threads-gop              = 8
 LcuRowInSlice            = 0            # (0: one slice)
-SpeedLevel               = 5            # (5 ~ 6) 
+SpeedLevel               = 5            # (5 ~ 7) 
 
 ##########################################################################################
 # Encoder Control

diff --git a/uAVS3lib/armv8/arm64.c b/uAVS3lib/armv8/arm64.c
@@ -53,7 +53,7 @@ void com_funs_init_arm64()
 
     g_funs_handle.sub_trans[1] = sub_trans_4x4_arm64;
     g_funs_handle.sub_trans[2] = sub_trans_8x8_arm64_8bit;
-    //g_funs_handle.sub_trans[3] = sub_trans_16x16_arm64;
+    g_funs_handle.sub_trans[3] = sub_trans_16x16_arm64;
     g_funs_handle.sub_trans[4] = sub_trans_32x32_arm64;
 
     g_funs_handle.pix_sub[0] = pix_sub_4_arm64;

diff --git a/uAVS3lib/uAVS3lib.c b/uAVS3lib/uAVS3lib.c
@@ -418,8 +418,8 @@ void* avs3_lib_create(cfg_param_t *input_init, strm_out_t strm_callbak, rec_out_
             com_funs_init_intrinsic_functions_10bit();
 
             if (simd_avx_level(NULL) >= 2) {
-                //com_funs_init_intrinsic_functions_avx2_10bit();
-                //com_funs_init_intrinsic_functions_avx512_10bit();
+                com_funs_init_intrinsic_functions_avx2_10bit();
+                com_funs_init_intrinsic_functions_avx512_10bit();
             }
         #endif
     #endif
@@ -444,7 +444,7 @@ void* avs3_lib_create(cfg_param_t *input_init, strm_out_t strm_callbak, rec_out_
         com_funs_init_intrinsic_functions();
 
         if (simd_avx_level(NULL) >= 2) {
-            //com_funs_init_intrinsic_functions_avx2();
+            com_funs_init_intrinsic_functions_avx2();
         }
         #endif
     #endif

diff --git a/version.sh b/version.sh
@@ -9,11 +9,11 @@
 # get version of remote and local repository
 
 VER_R=`git rev-list origin/master | sort | wc -l | gawk '{print $1}'`
-VER_L=`git rev-list HEAD | sort | wc -l | gawk '{print $1}'`
+VER_L=`git rev-list HEAD ^6123115581dab0d5fcc4e564d9e5d23af5312c8c | sort | wc -l | gawk '{print $1}'`
 VER_SHA1=`git log -n 1 | head -n 1 | cut -d ' ' -f 2`
 
 major_version="1"
-minor_version="0"
+minor_version="1"
 type_version="release"
 
 # generate the file version.h