head 1.2; access; symbols netbsd-11-1-RELEASE:1.1.1.1.2.1 netbsd-11-0-RELEASE:1.1.1.1 netbsd-11-0-RC7:1.1.1.1 netbsd-11-0-RC6:1.1.1.1 netbsd-11-0-RC5:1.1.1.1 netbsd-11-0-RC4:1.1.1.1 netbsd-11-0-RC3:1.1.1.1 netbsd-11-0-RC2:1.1.1.1 netbsd-11-0-RC1:1.1.1.1 netbsd-11:1.1.1.1.0.2 netbsd-11-base:1.1.1.1 brotli-1-0-9:1.1.1.1 GOOGLE:1.1.1; locks; strict; comment @ * @; 1.2 date 2026.10.28.21.13.09; author mrg; state dead; branches; next 1.1; commitid WySy0JIemcP5Wh1H; 1.1 date 2023.01.29.06.38.34; author mrg; state Exp; branches 1.1.1.1; next ; commitid gOcuvoN6w4Ry1pbE; 1.1.1.1 date 2023.01.29.06.38.34; author mrg; state Exp; branches 1.1.1.1.2.1; next ; commitid gOcuvoN6w4Ry1pbE; 1.1.1.1.2.1 date 2026.10.29.16.03.51; author martin; state dead; branches; next ; commitid Zd6vMoBhuWqLbo1H; desc @@ 1.2 log @merge brotli 1.2.1. @ text @/* Copyright 2013 Google Inc. All Rights Reserved. Distributed under MIT license. See file LICENSE for detail or copy at https://opensource.org/licenses/MIT */ /* This class models a sequence of literals and a backward reference copy. */ #ifndef BROTLI_ENC_COMMAND_H_ #define BROTLI_ENC_COMMAND_H_ #include "../common/constants.h" #include "../common/platform.h" #include #include "./fast_log.h" #include "./params.h" #include "./prefix.h" #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif BROTLI_INTERNAL extern const uint32_t kBrotliInsBase[BROTLI_NUM_INS_COPY_CODES]; BROTLI_INTERNAL extern const uint32_t kBrotliInsExtra[BROTLI_NUM_INS_COPY_CODES]; BROTLI_INTERNAL extern const uint32_t kBrotliCopyBase[BROTLI_NUM_INS_COPY_CODES]; BROTLI_INTERNAL extern const uint32_t kBrotliCopyExtra[BROTLI_NUM_INS_COPY_CODES]; static BROTLI_INLINE uint16_t GetInsertLengthCode(size_t insertlen) { if (insertlen < 6) { return (uint16_t)insertlen; } else if (insertlen < 130) { uint32_t nbits = Log2FloorNonZero(insertlen - 2) - 1u; return (uint16_t)((nbits << 1) + ((insertlen - 2) >> nbits) + 2); } else if (insertlen < 2114) { return (uint16_t)(Log2FloorNonZero(insertlen - 66) + 10); } else if (insertlen < 6210) { return 21u; } else if (insertlen < 22594) { return 22u; } else { return 23u; } } static BROTLI_INLINE uint16_t GetCopyLengthCode(size_t copylen) { if (copylen < 10) { return (uint16_t)(copylen - 2); } else if (copylen < 134) { uint32_t nbits = Log2FloorNonZero(copylen - 6) - 1u; return (uint16_t)((nbits << 1) + ((copylen - 6) >> nbits) + 4); } else if (copylen < 2118) { return (uint16_t)(Log2FloorNonZero(copylen - 70) + 12); } else { return 23u; } } static BROTLI_INLINE uint16_t CombineLengthCodes( uint16_t inscode, uint16_t copycode, BROTLI_BOOL use_last_distance) { uint16_t bits64 = (uint16_t)((copycode & 0x7u) | ((inscode & 0x7u) << 3u)); if (use_last_distance && inscode < 8u && copycode < 16u) { return (copycode < 8u) ? bits64 : (bits64 | 64u); } else { /* Specification: 5 Encoding of ... (last table) */ /* offset = 2 * index, where index is in range [0..8] */ uint32_t offset = 2u * ((copycode >> 3u) + 3u * (inscode >> 3u)); /* All values in specification are K * 64, where K = [2, 3, 6, 4, 5, 8, 7, 9, 10], i + 1 = [1, 2, 3, 4, 5, 6, 7, 8, 9], K - i - 1 = [1, 1, 3, 0, 0, 2, 0, 1, 2] = D. All values in D require only 2 bits to encode. Magic constant is shifted 6 bits left, to avoid final multiplication. */ offset = (offset << 5u) + 0x40u + ((0x520D40u >> offset) & 0xC0u); return (uint16_t)(offset | bits64); } } static BROTLI_INLINE void GetLengthCode(size_t insertlen, size_t copylen, BROTLI_BOOL use_last_distance, uint16_t* code) { uint16_t inscode = GetInsertLengthCode(insertlen); uint16_t copycode = GetCopyLengthCode(copylen); *code = CombineLengthCodes(inscode, copycode, use_last_distance); } static BROTLI_INLINE uint32_t GetInsertBase(uint16_t inscode) { return kBrotliInsBase[inscode]; } static BROTLI_INLINE uint32_t GetInsertExtra(uint16_t inscode) { return kBrotliInsExtra[inscode]; } static BROTLI_INLINE uint32_t GetCopyBase(uint16_t copycode) { return kBrotliCopyBase[copycode]; } static BROTLI_INLINE uint32_t GetCopyExtra(uint16_t copycode) { return kBrotliCopyExtra[copycode]; } typedef struct Command { uint32_t insert_len_; /* Stores copy_len in low 25 bits and copy_code - copy_len in high 7 bit. */ uint32_t copy_len_; /* Stores distance extra bits. */ uint32_t dist_extra_; uint16_t cmd_prefix_; /* Stores distance code in low 10 bits and number of extra bits in high 6 bits. */ uint16_t dist_prefix_; } Command; /* distance_code is e.g. 0 for same-as-last short code, or 16 for offset 1. */ static BROTLI_INLINE void InitCommand(Command* self, const BrotliDistanceParams* dist, size_t insertlen, size_t copylen, int copylen_code_delta, size_t distance_code) { /* Don't rely on signed int representation, use honest casts. */ uint32_t delta = (uint8_t)((int8_t)copylen_code_delta); self->insert_len_ = (uint32_t)insertlen; self->copy_len_ = (uint32_t)(copylen | (delta << 25)); /* The distance prefix and extra bits are stored in this Command as if npostfix and ndirect were 0, they are only recomputed later after the clustering if needed. */ PrefixEncodeCopyDistance( distance_code, dist->num_direct_distance_codes, dist->distance_postfix_bits, &self->dist_prefix_, &self->dist_extra_); GetLengthCode( insertlen, (size_t)((int)copylen + copylen_code_delta), TO_BROTLI_BOOL((self->dist_prefix_ & 0x3FF) == 0), &self->cmd_prefix_); } static BROTLI_INLINE void InitInsertCommand(Command* self, size_t insertlen) { self->insert_len_ = (uint32_t)insertlen; self->copy_len_ = 4 << 25; self->dist_extra_ = 0; self->dist_prefix_ = BROTLI_NUM_DISTANCE_SHORT_CODES; GetLengthCode(insertlen, 4, BROTLI_FALSE, &self->cmd_prefix_); } static BROTLI_INLINE uint32_t CommandRestoreDistanceCode( const Command* self, const BrotliDistanceParams* dist) { if ((self->dist_prefix_ & 0x3FFu) < BROTLI_NUM_DISTANCE_SHORT_CODES + dist->num_direct_distance_codes) { return self->dist_prefix_ & 0x3FFu; } else { uint32_t dcode = self->dist_prefix_ & 0x3FFu; uint32_t nbits = self->dist_prefix_ >> 10; uint32_t extra = self->dist_extra_; uint32_t postfix_mask = (1U << dist->distance_postfix_bits) - 1U; uint32_t hcode = (dcode - dist->num_direct_distance_codes - BROTLI_NUM_DISTANCE_SHORT_CODES) >> dist->distance_postfix_bits; uint32_t lcode = (dcode - dist->num_direct_distance_codes - BROTLI_NUM_DISTANCE_SHORT_CODES) & postfix_mask; uint32_t offset = ((2U + (hcode & 1U)) << nbits) - 4U; return ((offset + extra) << dist->distance_postfix_bits) + lcode + dist->num_direct_distance_codes + BROTLI_NUM_DISTANCE_SHORT_CODES; } } static BROTLI_INLINE uint32_t CommandDistanceContext(const Command* self) { uint32_t r = self->cmd_prefix_ >> 6; uint32_t c = self->cmd_prefix_ & 7; if ((r == 0 || r == 2 || r == 4 || r == 7) && (c <= 2)) { return c; } return 3; } static BROTLI_INLINE uint32_t CommandCopyLen(const Command* self) { return self->copy_len_ & 0x1FFFFFF; } static BROTLI_INLINE uint32_t CommandCopyLenCode(const Command* self) { uint32_t modifier = self->copy_len_ >> 25; int32_t delta = (int8_t)((uint8_t)(modifier | ((modifier & 0x40) << 1))); return (uint32_t)((int32_t)(self->copy_len_ & 0x1FFFFFF) + delta); } #if defined(__cplusplus) || defined(c_plusplus) } /* extern "C" */ #endif #endif /* BROTLI_ENC_COMMAND_H_ */ @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @initial import of brotli 1.0.9. modern blender wants freetype to have brotli support enabled or it won't build. fortunately, enabling the decoder support (all it needs currently) is relatively easy and small (~160k on amd64) without exposing brotli as a first class citizen is easy, so this will be linked into xsrc freetype directly. XXX: pullup-10? or perhaps force -10 to use pkgsrc freetype? from pkgsrc DESCR: Brotli is a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling, with a compression ratio comparable to the best currently available general-purpose compression methods. It is similar in speed with deflate but offers more dense compression. @ text @@ 1.1.1.1.2.1 log @Pull up the following, requested by mrg in ticket #562: external/mit/brotli/dist/BUILD.bazel up to 1.1.1.1 external/mit/brotli/dist/c/common/dictionary_inc.h up to 1.1.1.1 external/mit/brotli/dist/c/common/shared_dictionary.c up to 1.1.1.1 external/mit/brotli/dist/c/common/shared_dictionary_internal.h up to 1.1.1.1 external/mit/brotli/dist/c/common/static_init.h up to 1.1.1.1 external/mit/brotli/dist/c/dec/prefix.c up to 1.1.1.1 external/mit/brotli/dist/c/dec/prefix_inc.h up to 1.1.1.1 external/mit/brotli/dist/c/dec/static_init.c up to 1.1.1.1 external/mit/brotli/dist/c/dec/static_init.h up to 1.1.1.1 external/mit/brotli/dist/c/include/brotli/shared_dictionary.h up to 1.1.1.1 external/mit/brotli/dist/docs/brotli.svg up to 1.1.1.1 external/mit/brotli/dist/scripts/download_testdata.sh up to 1.1.1.1 external/mit/brotli/dist/tests/testdata/zerosukkanooa.compressed up to 1.1.1.1 external/mit/brotli/dist/tests/cli_test.sh up to 1.1.1.1 external/mit/brotli/dist/SECURITY.md up to 1.1.1.1 external/mit/brotli/dist/.bazelignore up to 1.1.1.1 external/mit/brotli/dist/CHANGELOG.md up to 1.1.1.1 external/mit/brotli/dist/BUILD delete external/mit/brotli/dist/Makefile delete external/mit/brotli/dist/Makefile.am delete external/mit/brotli/dist/WORKSPACE delete external/mit/brotli/dist/bootstrap delete external/mit/brotli/dist/compiler_config_setting.bzl delete external/mit/brotli/dist/configure delete external/mit/brotli/dist/configure-cmake delete external/mit/brotli/dist/configure.ac delete external/mit/brotli/dist/premake5.lua delete external/mit/brotli/dist/c/enc/backward_references.c delete external/mit/brotli/dist/c/enc/backward_references.h delete external/mit/brotli/dist/c/enc/backward_references_hq.c delete external/mit/brotli/dist/c/enc/backward_references_hq.h delete external/mit/brotli/dist/c/enc/backward_references_inc.h delete external/mit/brotli/dist/c/enc/bit_cost.c delete external/mit/brotli/dist/c/enc/bit_cost.h delete external/mit/brotli/dist/c/enc/bit_cost_inc.h delete external/mit/brotli/dist/c/enc/block_encoder_inc.h delete external/mit/brotli/dist/c/enc/block_splitter.c delete external/mit/brotli/dist/c/enc/block_splitter.h delete external/mit/brotli/dist/c/enc/block_splitter_inc.h delete external/mit/brotli/dist/c/enc/brotli_bit_stream.c delete external/mit/brotli/dist/c/enc/brotli_bit_stream.h delete external/mit/brotli/dist/c/enc/cluster.c delete external/mit/brotli/dist/c/enc/cluster.h delete external/mit/brotli/dist/c/enc/cluster_inc.h delete external/mit/brotli/dist/c/enc/command.c delete external/mit/brotli/dist/c/enc/command.h delete external/mit/brotli/dist/c/enc/compress_fragment.c delete external/mit/brotli/dist/c/enc/compress_fragment.h delete external/mit/brotli/dist/c/enc/compress_fragment_two_pass.c delete external/mit/brotli/dist/c/enc/compress_fragment_two_pass.h delete external/mit/brotli/dist/c/enc/dictionary_hash.c delete external/mit/brotli/dist/c/enc/dictionary_hash.h delete external/mit/brotli/dist/c/enc/encode.c delete external/mit/brotli/dist/c/enc/encoder_dict.c delete external/mit/brotli/dist/c/enc/encoder_dict.h delete external/mit/brotli/dist/c/enc/entropy_encode.c delete external/mit/brotli/dist/c/enc/entropy_encode.h delete external/mit/brotli/dist/c/enc/entropy_encode_static.h delete external/mit/brotli/dist/c/enc/fast_log.c delete external/mit/brotli/dist/c/enc/fast_log.h delete external/mit/brotli/dist/c/enc/find_match_length.h delete external/mit/brotli/dist/c/enc/hash.h delete external/mit/brotli/dist/c/enc/hash_composite_inc.h delete external/mit/brotli/dist/c/enc/hash_forgetful_chain_inc.h delete external/mit/brotli/dist/c/enc/hash_longest_match64_inc.h delete external/mit/brotli/dist/c/enc/hash_longest_match_inc.h delete external/mit/brotli/dist/c/enc/hash_longest_match_quickly_inc.h delete external/mit/brotli/dist/c/enc/hash_rolling_inc.h delete external/mit/brotli/dist/c/enc/hash_to_binary_tree_inc.h delete external/mit/brotli/dist/c/enc/histogram.c delete external/mit/brotli/dist/c/enc/histogram.h delete external/mit/brotli/dist/c/enc/histogram_inc.h delete external/mit/brotli/dist/c/enc/literal_cost.c delete external/mit/brotli/dist/c/enc/literal_cost.h delete external/mit/brotli/dist/c/enc/memory.c delete external/mit/brotli/dist/c/enc/memory.h delete external/mit/brotli/dist/c/enc/metablock.c delete external/mit/brotli/dist/c/enc/metablock.h delete external/mit/brotli/dist/c/enc/metablock_inc.h delete external/mit/brotli/dist/c/enc/params.h delete external/mit/brotli/dist/c/enc/prefix.h delete external/mit/brotli/dist/c/enc/quality.h delete external/mit/brotli/dist/c/enc/utf8_util.c delete external/mit/brotli/dist/c/enc/ringbuffer.h delete external/mit/brotli/dist/c/enc/static_dict.c delete external/mit/brotli/dist/c/enc/static_dict.h delete external/mit/brotli/dist/c/enc/static_dict_lut.h delete external/mit/brotli/dist/c/enc/utf8_util.h delete external/mit/brotli/dist/c/enc/write_bits.h delete external/mit/brotli/dist/python/Makefile delete external/mit/brotli/dist/python/README.md delete external/mit/brotli/dist/python/_brotli.cc delete external/mit/brotli/dist/python/bro.py delete external/mit/brotli/dist/python/brotli.py delete external/mit/brotli/dist/python/tests/__init__.py delete external/mit/brotli/dist/python/tests/_test_utils.py delete external/mit/brotli/dist/python/tests/bro_test.py delete external/mit/brotli/dist/python/tests/compress_test.py delete external/mit/brotli/dist/python/tests/compressor_test.py delete external/mit/brotli/dist/python/tests/decompress_test.py delete external/mit/brotli/dist/python/tests/decompressor_test.py delete external/mit/brotli/dist/scripts/sources.lst delete external/mit/brotli/dist/tests/Makefile delete external/mit/brotli/dist/tests/compatibility_test.sh delete external/mit/brotli/dist/tests/roundtrip_test.sh delete external/mit/brotli/dist/CMakeLists.txt up to 1.1.1.2 external/mit/brotli/dist/CONTRIBUTING.md up to 1.1.1.2 external/mit/brotli/dist/MANIFEST.in up to 1.1.1.2 external/mit/brotli/dist/README up to 1.1.1.2 external/mit/brotli/dist/README.md up to 1.1.1.2 external/mit/brotli/dist/setup.cfg up to 1.1.1.2 external/mit/brotli/dist/setup.py up to 1.1.1.2 external/mit/brotli/dist/c/common/constants.c up to 1.1.1.2 external/mit/brotli/dist/c/common/constants.h up to 1.1.1.2 external/mit/brotli/dist/c/common/context.c up to 1.1.1.2 external/mit/brotli/dist/c/common/context.h up to 1.1.1.2 external/mit/brotli/dist/c/common/dictionary.c up to 1.1.1.2 external/mit/brotli/dist/c/common/dictionary.h up to 1.1.1.2 external/mit/brotli/dist/c/common/platform.c up to 1.1.1.2 external/mit/brotli/dist/c/common/platform.h up to 1.2 external/mit/brotli/dist/c/common/transform.c up to 1.1.1.2 external/mit/brotli/dist/c/common/transform.h up to 1.1.1.2 external/mit/brotli/dist/c/common/version.h up to 1.1.1.2 external/mit/brotli/dist/c/dec/bit_reader.c up to 1.1.1.2 external/mit/brotli/dist/c/dec/bit_reader.h up to 1.1.1.2 external/mit/brotli/dist/c/dec/decode.c up to 1.1.1.2 external/mit/brotli/dist/c/dec/huffman.c up to 1.1.1.2 external/mit/brotli/dist/c/dec/huffman.h up to 1.1.1.2 external/mit/brotli/dist/c/dec/prefix.h up to 1.1.1.2 external/mit/brotli/dist/c/dec/state.c up to 1.1.1.2 external/mit/brotli/dist/c/dec/state.h up to 1.1.1.2 external/mit/brotli/dist/c/include/brotli/decode.h up to 1.1.1.2 external/mit/brotli/dist/c/include/brotli/encode.h up to 1.1.1.2 external/mit/brotli/dist/c/include/brotli/port.h up to 1.1.1.2 external/mit/brotli/dist/c/include/brotli/types.h up to 1.1.1.2 external/mit/brotli/dist/c/tools/brotli.c up to 1.1.1.2 external/mit/brotli/dist/c/tools/brotli.md up to 1.1.1.2 external/mit/brotli/dist/docs/brotli.1 up to 1.1.1.2 external/mit/brotli/dist/docs/constants.h.3 up to 1.1.1.2 external/mit/brotli/dist/docs/decode.h.3 up to 1.1.1.2 external/mit/brotli/dist/docs/encode.h.3 up to 1.1.1.2 external/mit/brotli/dist/docs/types.h.3 up to 1.1.1.2 external/mit/brotli/dist/scripts/libbrotlicommon.pc.in up to 1.1.1.2 external/mit/brotli/dist/scripts/libbrotlidec.pc.in up to 1.1.1.2 external/mit/brotli/dist/scripts/libbrotlienc.pc.in up to 1.1.1.2 Initial import of brotli 1.2.1, that fixes CVE 2026-111497. @ text @@