demostf/demo.js
1
0
Fork 0
mirror of https://github.com/demostf/demo.js synced 2026-06-04 09:04:13 +02:00
Code Issues Releases Wiki Activity

Better encoding of stringtable updates

Browse source
This commit is contained in:
Robin Appelman 2017-11-20 23:23:24 +01:00
commit 3bf5111108
3 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Parser/Packet/UpdateStringTable.ts
View file

@ -1,7 +1,7 @@
import {BitStream} from 'bit-buffer'; import {BitStream} from 'bit-buffer';
import {UpdateStringTablePacket} from '../../Data/Packet'; import {UpdateStringTablePacket} from '../../Data/Packet';
import {ParserState} from '../../Data/ParserState'; import {ParserState} from '../../Data/ParserState';
import {encodeStringTableEntries, guessStringTableEntryLength, parseStringTableEntries} from '../StringTableParser'; import {encodeStringTableEntries, parseStringTableEntries} from '../StringTableParser';
export function ParseUpdateStringTable(stream: BitStream, state: ParserState): UpdateStringTablePacket { // 12: updateStringTable export function ParseUpdateStringTable(stream: BitStream, state: ParserState): UpdateStringTablePacket { // 12: updateStringTable
const tableId = stream.readBits(5); const tableId = stream.readBits(5);
@ -41,13 +41,17 @@ export function EncodeUpdateStringTable(packet: UpdateStringTablePacket, stream:
if (!state.stringTables[packet.tableId]) { if (!state.stringTables[packet.tableId]) {
throw new Error(`Table not found for update: ${packet.tableId}`); throw new Error(`Table not found for update: ${packet.tableId}`);
} }
const lengthStart = stream.index;
stream.index += 20;
const lengthEnd = stream.index;
const table = state.stringTables[packet.tableId]; const table = state.stringTables[packet.tableId];
const entryData = new BitStream(new ArrayBuffer(guessStringTableEntryLength(table, packet.entries))); encodeStringTableEntries(stream, table, packet.entries, table.entries);
encodeStringTableEntries(entryData, table, packet.entries);
const entryLength = entryData.index;
entryData.index = 0;
const dataEnd = stream.index;
stream.index = lengthStart;
const entryLength = dataEnd - lengthEnd;
stream.writeBits(entryLength, 20); stream.writeBits(entryLength, 20);
stream.writeBitStream(entryData, entryLength); stream.index = dataEnd;
} }

4
src/Parser/StringTableParser.ts
View file

@ -95,7 +95,7 @@ export function guessStringTableEntryLength(table: StringTable, entries: StringT
}, 1); }, 1);
} }
export function encodeStringTableEntries(stream: BitStream, table: StringTable, entries: StringTableEntry[]) { export function encodeStringTableEntries(stream: BitStream, table: StringTable, entries: StringTableEntry[], oldEntries: StringTableEntry[] = []) {
const entryBits = logBase2(table.maxEntries); const entryBits = logBase2(table.maxEntries);
const lastIndex = -1; const lastIndex = -1;
for (let i = 0; i < entries.length; i++) { for (let i = 0; i < entries.length; i++) {
@ -108,7 +108,7 @@ export function encodeStringTableEntries(stream: BitStream, table: StringTable,
stream.writeBoolean(true); stream.writeBoolean(true);
} }
if (typeof entry.text !== 'undefined') { if (typeof entry.text !== 'undefined' && !(oldEntries[i] && entry.text === oldEntries[i].text)) {
stream.writeBoolean(true); stream.writeBoolean(true);
// we don't encode substring optimizations // we don't encode substring optimizations
stream.writeBoolean(false); stream.writeBoolean(false);

8
src/tests/unit/Parser/Packet/UpdateStringTableTest.ts
View file

@ -3,7 +3,7 @@ import {UpdateStringTablePacket} from '../../../../Data/Packet';
import {createParserState} from '../../../../Data/ParserState'; import {createParserState} from '../../../../Data/ParserState';
import {StringTable} from '../../../../Data/StringTable'; import {StringTable} from '../../../../Data/StringTable';
import {EncodeUpdateStringTable, ParseUpdateStringTable} from '../../../../Parser/Packet/UpdateStringTable'; import {EncodeUpdateStringTable, ParseUpdateStringTable} from '../../../../Parser/Packet/UpdateStringTable';
import {assertEncoder, assertParser, getStream} from './PacketTest'; import {assertEncoder, assertParser, assertReEncode, getStream} from './PacketTest';
const exampleData = [200, 3, 0, 48, 130, 53]; const exampleData = [200, 3, 0, 48, 130, 53];
@ -61,7 +61,11 @@ suite('UpdateStringTable', () => {
}); });
test('Encode updateStringTable', () => { test('Encode updateStringTable', () => {
assertEncoder(ParseUpdate, EncodeUpdate, examplePacket, 266); assertEncoder(ParseUpdate, EncodeUpdate, examplePacket, 41);
assertEncoder(ParseUpdate, EncodeUpdate, examplePacket2, 299); assertEncoder(ParseUpdate, EncodeUpdate, examplePacket2, 299);
}); });
test('Re-encode updateStringTable', () => {
assertReEncode(ParseUpdate, EncodeUpdate, getStream(exampleData));
});
}); });