BaseTools: Update Brotli Compress to the latest one 1.0.6

[mirror_edk2.git] / BaseTools / Source / C / BrotliCompress / enc / prefix.h

diff --git a/BaseTools/Source/C/BrotliCompress/enc/prefix.h b/BaseTools/Source/C/BrotliCompress/enc/prefix.h
index 850c21e54bc1db522be1f3cf80a1f811061d8174..e52edd1faa78057a2d436d6e0013bae1245e98ad 100644 (file)
--- a/BaseTools/Source/C/BrotliCompress/enc/prefix.h
+++ b/BaseTools/Source/C/BrotliCompress/enc/prefix.h
@@ -11,14 +11,16 @@
 #define BROTLI_ENC_PREFIX_H_\r
 \r
 #include "../common/constants.h"\r
-#include "../common/port.h"\r
-#include "../common/types.h"\r
+#include "../common/platform.h"\r
+#include <brotli/types.h>\r
 #include "./fast_log.h"\r
 \r
 #if defined(__cplusplus) || defined(c_plusplus)\r
 extern "C" {\r
 #endif\r
 \r
+/* Here distance_code is an intermediate code, i.e. one of the special codes or\r
+   the actual distance increased by BROTLI_NUM_DISTANCE_SHORT_CODES - 1. */\r
 static BROTLI_INLINE void PrefixEncodeCopyDistance(size_t distance_code,\r
                                                    size_t num_direct_codes,\r
                                                    size_t postfix_bits,\r
@@ -37,11 +39,10 @@ static BROTLI_INLINE void PrefixEncodeCopyDistance(size_t distance_code,
     size_t prefix = (dist >> bucket) & 1;\r
     size_t offset = (2 + prefix) << bucket;\r
     size_t nbits = bucket - postfix_bits;\r
-    *code = (uint16_t)(\r
+    *code = (uint16_t)((nbits << 10) |\r
         (BROTLI_NUM_DISTANCE_SHORT_CODES + num_direct_codes +\r
          ((2 * (nbits - 1) + prefix) << postfix_bits) + postfix));\r
-    *extra_bits = (uint32_t)(\r
-        (nbits << 24) | ((dist - offset) >> postfix_bits));\r
+    *extra_bits = (uint32_t)((dist - offset) >> postfix_bits);\r
   }\r
 }\r
 \r