stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some minor mods and fixes to the huffman decoder.

Browse source
This commit is contained in:
Adam Sutton 2012-06-17 13:55:46 +01:00
parent b8709a89e8
commit cbc7aa26fc
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/huffman.c
View file

@ -35,8 +35,11 @@ void huffman_tree_destroy ( huffman_node_t *n )
huffman_node_t *huffman_tree_load ( const char *path ) huffman_node_t *huffman_tree_load ( const char *path )
{ {
htsmsg_t *m; htsmsg_t *m;
huffman_node_t *ret;
if (!(m = hts_settings_load(path))) return NULL; if (!(m = hts_settings_load(path))) return NULL;
return huffman_tree_build(m); ret = huffman_tree_build(m);
htsmsg_destroy(m);
return ret;
} }
huffman_node_t *huffman_tree_build ( htsmsg_t *m ) huffman_node_t *huffman_tree_build ( htsmsg_t *m )
@ -68,8 +71,6 @@ huffman_node_t *huffman_tree_build ( htsmsg_t *m )
node->data = strdup(data); node->data = strdup(data);
} }
} }
htsmsg_destroy(m);
return root; return root;
} }
@ -77,7 +78,7 @@ char *huffman_decode
( huffman_node_t *tree, const char *data, size_t len, uint8_t mask ) ( huffman_node_t *tree, const char *data, size_t len, uint8_t mask )
{ {
char* ret; char* ret;
size_t nalloc = len, nused = 0; size_t nalloc = len*4, nused = 0;
huffman_node_t *node = tree; huffman_node_t *node = tree;
if (!len) return NULL; if (!len) return NULL;
@ -104,6 +105,7 @@ char *huffman_decode
} }
} }
mask = 0x80; mask = 0x80;
data++;
} }
return ret; return ret;
} }