BaseTools/LzmaCompress: Add two switches

As is requested in the BZ 2077, add two switches to support setting
compression mode and dictionary size.
(https://bugzilla.tianocore.org/show_bug.cgi?id=2077)

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/C/LzmaCompress/GNUmakefile b/BaseTools/Source/C/LzmaCompress/GNUmakefile
index 533f0a59a0af04003953bd9c98a15f669b83b2cb..c837e77823737d7541476be65faf89a33c2a42f5 100644 (file)
--- a/BaseTools/Source/C/LzmaCompress/GNUmakefile
+++ b/BaseTools/Source/C/LzmaCompress/GNUmakefile
@@ -1,13 +1,15 @@
 ## @file\r
 # GNU/Linux makefile for 'LzmaCompress' module build.\r
 #\r
-# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 MAKEROOT ?= ..\r
 \r
 APPNAME = LzmaCompress\r
 \r
+LIBS = -lCommon\r
+\r
 SDK_C = Sdk/C\r
 \r
 OBJECTS = \\r

diff --git a/BaseTools/Source/C/LzmaCompress/LzmaCompress.c b/BaseTools/Source/C/LzmaCompress/LzmaCompress.c
index a3607f9b20844a95133124de1c1745870f7fa4da..856fcf9ffb17bacce3143840a6f3ecdd9ebf218d 100644 (file)
--- a/BaseTools/Source/C/LzmaCompress/LzmaCompress.c
+++ b/BaseTools/Source/C/LzmaCompress/LzmaCompress.c
@@ -5,7 +5,7 @@
     LzmaUtil.c -- Test application for LZMA compression\r
     2018-04-30 : Igor Pavlov : Public domain\r
 \r
-  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -23,6 +23,7 @@
 #include "Sdk/C/LzmaEnc.h"\r
 #include "Sdk/C/Bra.h"\r
 #include "CommonLib.h"\r
+#include "ParseInf.h"\r
 \r
 #define LZMA_HEADER_SIZE (LZMA_PROPS_SIZE + 8)\r
 \r
@@ -36,10 +37,14 @@ const char *kCantReadMessage = "Can not read input file";
 const char *kCantWriteMessage = "Can not write output file";\r
 const char *kCantAllocateMessage = "Can not allocate memory";\r
 const char *kDataErrorMessage = "Data error";\r
+const char *kInvalidParamValMessage = "Invalid parameter value";\r
 \r
 static Bool mQuietMode = False;\r
 static CONVERTER_TYPE mConType = NoConverter;\r
 \r
+UINT64 mDictionarySize = 31;\r
+UINT64 mCompressionMode = 2;\r
+\r
 #define UTILITY_NAME "LzmaCompress"\r
 #define UTILITY_MAJOR_VERSION 0\r
 #define UTILITY_MINOR_VERSION 2\r
@@ -58,6 +63,8 @@ void PrintHelp(char *buffer)
              "  -v, --verbose: increase output messages\n"\r
              "  -q, --quiet: reduce output messages\n"\r
              "  --debug [0-9]: set debug level\n"\r
+             "  -a: set compression mode 0 = fast, 1 = normal, default: 1 (normal)\n"\r
+             "  d: sets Dictionary size - [0, 30], default: 23 (8MB)\n"\r
              "  --version: display the program version and exit\n"\r
              "  -h, --help: display this help text\n"\r
              );\r
@@ -87,7 +94,7 @@ void PrintVersion(char *buffer)
   sprintf (buffer, "%s Version %d.%d %s ", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);\r
 }\r
 \r
-static SRes Encode(ISeqOutStream *outStream, ISeqInStream *inStream, UInt64 fileSize)\r
+static SRes Encode(ISeqOutStream *outStream, ISeqInStream *inStream, UInt64 fileSize, CLzmaEncProps *props)\r
 {\r
   SRes res;\r
   size_t inSize = (size_t)fileSize;\r
@@ -95,10 +102,6 @@ static SRes Encode(ISeqOutStream *outStream, ISeqInStream *inStream, UInt64 file
   Byte *outBuffer = 0;\r
   Byte *filteredStream = 0;\r
   size_t outSize;\r
-  CLzmaEncProps props;\r
-\r
-  LzmaEncProps_Init(&props);\r
-  LzmaEncProps_Normalize(&props);\r
 \r
   if (inSize != 0) {\r
     inBuffer = (Byte *)MyAlloc(inSize);\r
@@ -151,7 +154,7 @@ static SRes Encode(ISeqOutStream *outStream, ISeqInStream *inStream, UInt64 file
 \r
     res = LzmaEncode(outBuffer + LZMA_HEADER_SIZE, &outSizeProcessed,\r
         mConType != NoConverter ? filteredStream : inBuffer, inSize,\r
-        &props, outBuffer, &outPropsSize, 0,\r
+        props, outBuffer, &outPropsSize, 0,\r
         NULL, &g_Alloc, &g_Alloc);\r
 \r
     if (res != SZ_OK)\r
@@ -246,6 +249,10 @@ int main2(int numArgs, const char *args[], char *rs)
   const char *outputFile = "file.tmp";\r
   int param;\r
   UInt64 fileSize;\r
+  CLzmaEncProps props;\r
+\r
+  LzmaEncProps_Init(&props);\r
+  LzmaEncProps_Normalize(&props);\r
 \r
   FileSeqInStream_CreateVTable(&inStream);\r
   File_Construct(&inStream.file);\r
@@ -280,6 +287,24 @@ int main2(int numArgs, const char *args[], char *rs)
       // parameter compatibility with other build tools.\r
       //\r
       param++;\r
+    } else if (strcmp(args[param], "-a") == 0) {\r
+      AsciiStringToUint64(args[param + 1],FALSE,&mCompressionMode);\r
+      if ((mCompressionMode == 0)||(mCompressionMode == 1)){\r
+        props.algo = (int)mCompressionMode;\r
+        param++;\r
+        continue;\r
+      } else {\r
+        return PrintError(rs, kInvalidParamValMessage);\r
+      }\r
+    } else if (strcmp(args[param], "d") == 0) {\r
+      AsciiStringToUint64(args[param + 1],FALSE,&mDictionarySize);\r
+      if (mDictionarySize <= 30){\r
+        props.dictSize = (UINT32)mDictionarySize;\r
+        param++;\r
+        continue;\r
+      } else {\r
+        return PrintError(rs, kInvalidParamValMessage);\r
+      }\r
     } else if (\r
                 strcmp(args[param], "-h") == 0 ||\r
                 strcmp(args[param], "--help") == 0\r
@@ -335,7 +360,7 @@ int main2(int numArgs, const char *args[], char *rs)
     if (!mQuietMode) {\r
       printf("Encoding\n");\r
     }\r
-    res = Encode(&outStream.vt, &inStream.vt, fileSize);\r
+    res = Encode(&outStream.vt, &inStream.vt, fileSize, &props);\r
   }\r
   else\r
   {\r

diff --git a/BaseTools/Source/C/LzmaCompress/Makefile b/BaseTools/Source/C/LzmaCompress/Makefile
index 12be48de29408f5124823ee2c6a33d5ad389dcb6..055f5d3ac3caec1e259e6385e74c11efdc30ba37 100644 (file)
--- a/BaseTools/Source/C/LzmaCompress/Makefile
+++ b/BaseTools/Source/C/LzmaCompress/Makefile
@@ -1,14 +1,14 @@
 ## @file\r
 # Windows makefile for 'LzmaCompress' module build.\r
 #\r
-# Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 !INCLUDE ..\Makefiles\ms.common\r
 \r
 APPNAME = LzmaCompress\r
 \r
-#LIBS = $(LIB_PATH)\Common.lib\r
+LIBS = $(LIB_PATH)\Common.lib\r
 \r
 SDK_C = Sdk\C\r
 \r