fix some bugs

dingminyi · Sep 21, 2016 · a43d9c8 · a43d9c8
1 parent e15ec96
commit a43d9c8
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 20 deletions.
diff --git a/silk/src/SKP_Silk_dec_API.c b/silk/src/SKP_Silk_dec_API.c
@@ -274,6 +274,6 @@ void SKP_Silk_SDK_get_TOC(
 /* Return a pointer to string specifying the version */ 
 const char *SKP_Silk_SDK_get_version()
 {
-    static const char version[] = "1.0.9";
+    static const char version[] = "1.0.9.6";
     return version;
 }
diff --git a/silk/test/Decoder.c b/silk/test/Decoder.c
@@ -100,7 +100,7 @@ unsigned long GetHighResolutionTime() /* O: time in usec*/
 static SKP_int32 rand_seed = 1;
 
 static void print_usage(char* argv[]) {
-    printf( "\nBuild By kn007 (kn007.net)");
+    printf( "\nVersion:20160922    Build By kn007 (kn007.net)");
     printf( "\nGithub: https://github.com/kn007/silk-v3-decoder\n");
     printf( "\nusage: %s in.bit out.pcm [settings]\n", argv[ 0 ] );
     printf( "\nin.bit       : Bitstream input to decoder" );

diff --git a/silk/test/Encoder.c b/silk/test/Encoder.c
@@ -94,7 +94,7 @@ unsigned long GetHighResolutionTime() /* O: time in usec*/
 #endif // _WIN32
 
 static void print_usage( char* argv[] ) {
-    printf( "\nBuild By kn007 (kn007.net)");
+    printf( "\nVersion:20160922    Build By kn007 (kn007.net)");
     printf( "\nGithub: https://github.com/kn007/silk-v3-decoder\n");
     printf( "\nusage: %s in.pcm out.bit [settings]\n", argv[ 0 ] );
     printf( "\nin.pcm               : Speech input to encoder" );
@@ -232,16 +232,14 @@ int main( int argc, char* argv[] )
     }
 
     /* Add Silk header to stream */
-    if( !tencent ) {
-        {
-            static const char Silk_header[] = "#!SILK_V3";
-            fwrite( Silk_header, sizeof( char ), strlen( Silk_header ), bitOutFile );
-        }
-    } else {
-        {
-            static const char Silk_header[] = "#!SILK_V3";
-            fwrite( Silk_header, sizeof( char ), strlen( Silk_header ), bitOutFile );
+    {
+        if( tencent ) {
+	        static const char Tencent_break[] = "";
+            fwrite( Tencent_break, sizeof( char ), strlen( Tencent_break ), bitOutFile );
         }
+
+        static const char Silk_header[] = "#!SILK_V3";
+        fwrite( Silk_header, sizeof( char ), strlen( Silk_header ), bitOutFile );
     }
 
     /* Create Encoder */
@@ -350,13 +348,15 @@ int main( int argc, char* argv[] )
     nBytes = -1;
 
     /* Write payload size */
-    fwrite( &nBytes, sizeof( SKP_int16 ), 1, bitOutFile );
+    if( !tencent ) {
+        fwrite( &nBytes, sizeof( SKP_int16 ), 1, bitOutFile );
+    }
 
     /* Free Encoder */
     free( psEnc );
 
     fclose( speechInFile );
-    fclose( bitOutFile   );
+    fclose( bitOutFile );
 
     filetime  = totPackets * 1e-3 * packetSize_ms;
     avg_rate  = 8.0 / packetSize_ms * sumBytes       / totPackets;

diff --git a/windows/CHANGELOG.md b/windows/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## ChangeLog
 
+<b>Version 1.0.0.6</b> (22 Sept 2016)
+ * Fix Wechat play Silk v3 encode file(from silk2mp3) error.
+ * Add custom output format support.
+ * Fix some bugs.
+
 <b>Version 1.0.0.5</b> (27 Jul 2016)
  * Optimized code.
  * Enable professional mode when FFmpeg has been found.
@@ -25,6 +30,11 @@
 
 ## 更新历史
 
+2016-09-22发布1.0.0.6版本：
+ * 修复编码后，微信播放完，会有杂音。
+ * 新增输出格式自定义。
+ * 修复一些Bug。
+
 2016-07-27发布1.0.0.5版本：
  * 最小加载模式。
  * 当发现程序目录下存在FFmpeg时，启用专业模式。

diff --git a/windows/README.md b/windows/README.md
@@ -36,11 +36,11 @@ Also you can download the [full version](https://dl.kn007.net/directlink/silk2mp
 
 ## Hash
 
-`MD5: F654D28098B7CF85FB73E2C87782CA8D`
+`MD5: CD3A8AC8105F6D21DD00AD27ACE4253D`
 
-`SHA1: BD526FC9F1472504B79D4DABAFB1B4D8D456FD25`
+`SHA1: 0FE5495D4B5CD814D5171FF50C8EA42056F4CB12`
 
-`CRC32: C39F3389`
+`CRC32: 6C6BE309`
 
 ## Notice
 
@@ -101,11 +101,11 @@ The test was passed when used following system:
 
 ## 程序鉴定
 
-`MD5: F654D28098B7CF85FB73E2C87782CA8D`
+`MD5: CD3A8AC8105F6D21DD00AD27ACE4253D`
 
-`SHA1: BD526FC9F1472504B79D4DABAFB1B4D8D456FD25`
+`SHA1: 0FE5495D4B5CD814D5171FF50C8EA42056F4CB12`
 
-`CRC32: C39F3389`
+`CRC32: 6C6BE309`
 
 ## 其他提示
 

diff --git a/windows/silk2mp3.exe b/windows/silk2mp3.exe
diff --git a/windows/silk_v3_decoder.exe b/windows/silk_v3_decoder.exe
diff --git a/windows/silk_v3_encoder.exe b/windows/silk_v3_encoder.exe