X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=qdc.cpp;h=0339e12af0ad07ba2616530b30bd1b2012258745;hb=5e1d27014149311318e97b8e04a6e05ec858e57c;hp=41ef04df00f95f3714e1617326fb4d4c4f5ddefa;hpb=79aa73c43af43f8f497e5920c83459f3e94d3612;p=narabu diff --git a/qdc.cpp b/qdc.cpp index 41ef04d..0339e12 100644 --- a/qdc.cpp +++ b/qdc.cpp @@ -235,22 +235,14 @@ public: //printf("post-flush = %08x\n", rans); uint32_t num_rans_bytes = out_end - ptr; -#if 0 - if (num_rans_bytes == 4) { - uint32_t block; - memcpy(&block, ptr, 4); - - if (block == last_block) { - write_varint(0, codedfp); - clear(); - return 1; - } - - last_block = block; + if (num_rans_bytes == last_block.size() && + memcmp(last_block.data(), ptr, last_block.size()) == 0) { + write_varint(0, codedfp); + clear(); + return 1; } else { - last_block = 0; + last_block = string((const char *)ptr, num_rans_bytes); } -#endif write_varint(num_rans_bytes, codedfp); //fwrite(&num_rans_bytes, 1, 4, codedfp); @@ -294,7 +286,7 @@ private: RansEncSymbol esyms[NUM_SYMS]; uint32_t sign_bias; - uint32_t last_block = 0; // Not a valid 4-byte rANS block (?) + std::string last_block; }; static constexpr int dc_scalefac = 8; // Matches the FDCT's gain.