diff options
Diffstat (limited to 'libass/ass_cache.c')
| -rw-r--r-- | libass/ass_cache.c | 440 |
1 files changed, 221 insertions, 219 deletions
diff --git a/libass/ass_cache.c b/libass/ass_cache.c index dc217bd75e..643d9912ed 100644 --- a/libass/ass_cache.c +++ b/libass/ass_cache.c @@ -1,5 +1,3 @@ -// -*- c-basic-offset: 8; indent-tabs-mode: t -*- -// vim:ts=8:sw=8:noet:ai: /* * Copyright (C) 2006 Evgeniy Stepanov <eugeni.stepanov@gmail.com> * @@ -29,225 +27,209 @@ #include <assert.h> -#include "mputils.h" +#include "ass_utils.h" #include "ass.h" #include "ass_fontconfig.h" #include "ass_font.h" #include "ass_bitmap.h" #include "ass_cache.h" - -typedef struct hashmap_item_s { - void* key; - void* value; - struct hashmap_item_s* next; -} hashmap_item_t; -typedef hashmap_item_t* hashmap_item_p; - -struct hashmap_s { - int nbuckets; - size_t key_size, value_size; - hashmap_item_p* root; - hashmap_item_dtor_t item_dtor; // a destructor for hashmap key/value pairs - hashmap_key_compare_t key_compare; - hashmap_hash_t hash; - // stats - int hit_count; - int miss_count; - int count; -}; - -#define FNV1_32A_INIT (unsigned)0x811c9dc5 - -static inline unsigned fnv_32a_buf(void* buf, size_t len, unsigned hval) -{ - unsigned char *bp = buf; - unsigned char *be = bp + len; - while (bp < be) { - hval ^= (unsigned)*bp++; - hval += (hval<<1) + (hval<<4) + (hval<<7) + (hval<<8) + (hval<<24); - } - return hval; -} -static inline unsigned fnv_32a_str(char* str, unsigned hval) +static unsigned hashmap_hash(void *buf, size_t len) { - unsigned char* s = (unsigned char*)str; - while (*s) { - hval ^= (unsigned)*s++; - hval += (hval<<1) + (hval<<4) + (hval<<7) + (hval<<8) + (hval<<24); - } - return hval; + return fnv_32a_buf(buf, len, FNV1_32A_INIT); } -static unsigned hashmap_hash(void* buf, size_t len) +static int hashmap_key_compare(void *a, void *b, size_t size) { - return fnv_32a_buf(buf, len, FNV1_32A_INIT); + return memcmp(a, b, size) == 0; } -static int hashmap_key_compare(void* a, void* b, size_t size) +static void hashmap_item_dtor(void *key, size_t key_size, void *value, + size_t value_size) { - return memcmp(a, b, size) == 0; + free(key); + free(value); } -static void hashmap_item_dtor(void* key, size_t key_size, void* value, size_t value_size) +Hashmap *hashmap_init(ASS_Library *library, size_t key_size, + size_t value_size, int nbuckets, + HashmapItemDtor item_dtor, + HashmapKeyCompare key_compare, + HashmapHash hash) { - free(key); - free(value); + Hashmap *map = calloc(1, sizeof(Hashmap)); + map->library = library; + map->nbuckets = nbuckets; + map->key_size = key_size; + map->value_size = value_size; + map->root = calloc(nbuckets, sizeof(hashmap_item_p)); + map->item_dtor = item_dtor ? item_dtor : hashmap_item_dtor; + map->key_compare = key_compare ? key_compare : hashmap_key_compare; + map->hash = hash ? hash : hashmap_hash; + return map; } -hashmap_t* hashmap_init(size_t key_size, size_t value_size, int nbuckets, - hashmap_item_dtor_t item_dtor, hashmap_key_compare_t key_compare, - hashmap_hash_t hash) +void hashmap_done(Hashmap *map) { - hashmap_t* map = calloc(1, sizeof(hashmap_t)); - map->nbuckets = nbuckets; - map->key_size = key_size; - map->value_size = value_size; - map->root = calloc(nbuckets, sizeof(hashmap_item_p)); - map->item_dtor = item_dtor ? item_dtor : hashmap_item_dtor; - map->key_compare = key_compare ? key_compare : hashmap_key_compare; - map->hash = hash ? hash : hashmap_hash; - return map; -} - -void hashmap_done(hashmap_t* map) -{ - int i; - // print stats - if (map->count > 0 || map->hit_count + map->miss_count > 0) - mp_msg(MSGT_ASS, MSGL_V, "cache statistics: \n total accesses: %d\n hits: %d\n misses: %d\n object count: %d\n", - map->hit_count + map->miss_count, map->hit_count, map->miss_count, map->count); + int i; + // print stats + if (map->count > 0 || map->hit_count + map->miss_count > 0) + ass_msg(map->library, MSGL_V, + "cache statistics: \n total accesses: %d\n hits: %d\n " + "misses: %d\n object count: %d", + map->hit_count + map->miss_count, map->hit_count, + map->miss_count, map->count); - for (i = 0; i < map->nbuckets; ++i) { - hashmap_item_t* item = map->root[i]; - while (item) { - hashmap_item_t* next = item->next; - map->item_dtor(item->key, map->key_size, item->value, map->value_size); - free(item); - item = next; - } - } - free(map->root); - free(map); + for (i = 0; i < map->nbuckets; ++i) { + HashmapItem *item = map->root[i]; + while (item) { + HashmapItem *next = item->next; + map->item_dtor(item->key, map->key_size, item->value, + map->value_size); + free(item); + item = next; + } + } + free(map->root); + free(map); } // does nothing if key already exists -void* hashmap_insert(hashmap_t* map, void* key, void* value) -{ - unsigned hash = map->hash(key, map->key_size); - hashmap_item_t** next = map->root + (hash % map->nbuckets); - while (*next) { - if (map->key_compare(key, (*next)->key, map->key_size)) - return (*next)->value; - next = &((*next)->next); - assert(next); - } - (*next) = malloc(sizeof(hashmap_item_t)); - (*next)->key = malloc(map->key_size); - (*next)->value = malloc(map->value_size); - memcpy((*next)->key, key, map->key_size); - memcpy((*next)->value, value, map->value_size); - (*next)->next = 0; - - map->count ++; - return (*next)->value; -} - -void* hashmap_find(hashmap_t* map, void* key) -{ - unsigned hash = map->hash(key, map->key_size); - hashmap_item_t* item = map->root[hash % map->nbuckets]; - while (item) { - if (map->key_compare(key, item->key, map->key_size)) { - map->hit_count++; - return item->value; - } - item = item->next; - } - map->miss_count++; - return 0; +void *hashmap_insert(Hashmap *map, void *key, void *value) +{ + unsigned hash = map->hash(key, map->key_size); + HashmapItem **next = map->root + (hash % map->nbuckets); + while (*next) { + if (map->key_compare(key, (*next)->key, map->key_size)) + return (*next)->value; + next = &((*next)->next); + assert(next); + } + (*next) = malloc(sizeof(HashmapItem)); + (*next)->key = malloc(map->key_size); + (*next)->value = malloc(map->value_size); + memcpy((*next)->key, key, map->key_size); + memcpy((*next)->value, value, map->value_size); + (*next)->next = 0; + + map->count++; + return (*next)->value; +} + +void *hashmap_find(Hashmap *map, void *key) +{ + unsigned hash = map->hash(key, map->key_size); + HashmapItem *item = map->root[hash % map->nbuckets]; + while (item) { + if (map->key_compare(key, item->key, map->key_size)) { + map->hit_count++; + return item->value; + } + item = item->next; + } + map->miss_count++; + return 0; } //--------------------------------- // font cache -hashmap_t* font_cache; - -static unsigned font_desc_hash(void* buf, size_t len) +static unsigned font_desc_hash(void *buf, size_t len) { - ass_font_desc_t* desc = buf; - unsigned hval; - hval = fnv_32a_str(desc->family, FNV1_32A_INIT); - hval = fnv_32a_buf(&desc->bold, sizeof(desc->bold), hval); - hval = fnv_32a_buf(&desc->italic, sizeof(desc->italic), hval); - return hval; + ASS_FontDesc *desc = buf; + unsigned hval; + hval = fnv_32a_str(desc->family, FNV1_32A_INIT); + hval = fnv_32a_buf(&desc->bold, sizeof(desc->bold), hval); + hval = fnv_32a_buf(&desc->italic, sizeof(desc->italic), hval); + return hval; } -static int font_compare(void* key1, void* key2, size_t key_size) { - ass_font_desc_t* a = key1; - ass_font_desc_t* b = key2; - if (strcmp(a->family, b->family) != 0) - return 0; - if (a->bold != b->bold) - return 0; - if (a->italic != b->italic) - return 0; - if (a->treat_family_as_pattern != b->treat_family_as_pattern) - return 0; - return 1; +static int font_compare(void *key1, void *key2, size_t key_size) +{ + ASS_FontDesc *a = key1; + ASS_FontDesc *b = key2; + if (strcmp(a->family, b->family) != 0) + return 0; + if (a->bold != b->bold) + return 0; + if (a->italic != b->italic) + return 0; + if (a->treat_family_as_pattern != b->treat_family_as_pattern) + return 0; + return 1; } -static void font_hash_dtor(void* key, size_t key_size, void* value, size_t value_size) +static void font_hash_dtor(void *key, size_t key_size, void *value, + size_t value_size) { - ass_font_free(value); - free(key); + ass_font_free(value); + free(key); } -ass_font_t* ass_font_cache_find(ass_font_desc_t* desc) +ASS_Font *ass_font_cache_find(Hashmap *font_cache, + ASS_FontDesc *desc) { - return hashmap_find(font_cache, desc); + return hashmap_find(font_cache, desc); } /** * \brief Add a face struct to cache. * \param font font struct */ -void* ass_font_cache_add(ass_font_t* font) +void *ass_font_cache_add(Hashmap *font_cache, ASS_Font *font) { - return hashmap_insert(font_cache, &(font->desc), font); + return hashmap_insert(font_cache, &(font->desc), font); } -void ass_font_cache_init(void) +Hashmap *ass_font_cache_init(ASS_Library *library) { - font_cache = hashmap_init(sizeof(ass_font_desc_t), - sizeof(ass_font_t), - 1000, - font_hash_dtor, font_compare, font_desc_hash); + Hashmap *font_cache; + font_cache = hashmap_init(library, sizeof(ASS_FontDesc), + sizeof(ASS_Font), + 1000, + font_hash_dtor, font_compare, font_desc_hash); + return font_cache; } -void ass_font_cache_done(void) +void ass_font_cache_done(Hashmap *font_cache) { - hashmap_done(font_cache); + hashmap_done(font_cache); } + +// Create hash/compare functions for bitmap and glyph +#define CREATE_HASH_FUNCTIONS +#include "ass_cache_template.h" +#define CREATE_COMPARISON_FUNCTIONS +#include "ass_cache_template.h" + //--------------------------------- // bitmap cache -hashmap_t* bitmap_cache; - -static void bitmap_hash_dtor(void* key, size_t key_size, void* value, size_t value_size) +static void bitmap_hash_dtor(void *key, size_t key_size, void *value, + size_t value_size) { - bitmap_hash_val_t* v = value; - if (v->bm) ass_free_bitmap(v->bm); - if (v->bm_o) ass_free_bitmap(v->bm_o); - if (v->bm_s) ass_free_bitmap(v->bm_s); - free(key); - free(value); + BitmapHashValue *v = value; + if (v->bm) + ass_free_bitmap(v->bm); + if (v->bm_o) + ass_free_bitmap(v->bm_o); + if (v->bm_s) + ass_free_bitmap(v->bm_s); + free(key); + free(value); } -void* cache_add_bitmap(bitmap_hash_key_t* key, bitmap_hash_val_t* val) +void *cache_add_bitmap(Hashmap *bitmap_cache, BitmapHashKey *key, + BitmapHashValue *val) { - return hashmap_insert(bitmap_cache, key, val); + // Note: this is only an approximation + if (val->bm_o) + bitmap_cache->cache_size += val->bm_o->w * val->bm_o->h * 3; + else if (val->bm) + bitmap_cache->cache_size += val->bm->w * val->bm->h * 3; + + return hashmap_insert(bitmap_cache, key, val); } /** @@ -255,47 +237,56 @@ void* cache_add_bitmap(bitmap_hash_key_t* key, bitmap_hash_val_t* val) * \param key hash key * \return requested hash val or 0 if not found */ -bitmap_hash_val_t* cache_find_bitmap(bitmap_hash_key_t* key) +BitmapHashValue *cache_find_bitmap(Hashmap *bitmap_cache, + BitmapHashKey *key) { - return hashmap_find(bitmap_cache, key); + return hashmap_find(bitmap_cache, key); } -void ass_bitmap_cache_init(void) +Hashmap *ass_bitmap_cache_init(ASS_Library *library) { - bitmap_cache = hashmap_init(sizeof(bitmap_hash_key_t), - sizeof(bitmap_hash_val_t), - 0xFFFF + 13, - bitmap_hash_dtor, NULL, NULL); + Hashmap *bitmap_cache; + bitmap_cache = hashmap_init(library, + sizeof(BitmapHashKey), + sizeof(BitmapHashValue), + 0xFFFF + 13, + bitmap_hash_dtor, bitmap_compare, + bitmap_hash); + return bitmap_cache; } -void ass_bitmap_cache_done(void) +void ass_bitmap_cache_done(Hashmap *bitmap_cache) { - hashmap_done(bitmap_cache); + hashmap_done(bitmap_cache); } -void ass_bitmap_cache_reset(void) +Hashmap *ass_bitmap_cache_reset(Hashmap *bitmap_cache) { - ass_bitmap_cache_done(); - ass_bitmap_cache_init(); + ASS_Library *lib = bitmap_cache->library; + + ass_bitmap_cache_done(bitmap_cache); + return ass_bitmap_cache_init(lib); } //--------------------------------- // glyph cache -hashmap_t* glyph_cache; - -static void glyph_hash_dtor(void* key, size_t key_size, void* value, size_t value_size) +static void glyph_hash_dtor(void *key, size_t key_size, void *value, + size_t value_size) { - glyph_hash_val_t* v = value; - if (v->glyph) FT_Done_Glyph(v->glyph); - if (v->outline_glyph) FT_Done_Glyph(v->outline_glyph); - free(key); - free(value); + GlyphHashValue *v = value; + if (v->glyph) + FT_Done_Glyph(v->glyph); + if (v->outline_glyph) + FT_Done_Glyph(v->outline_glyph); + free(key); + free(value); } -void* cache_add_glyph(glyph_hash_key_t* key, glyph_hash_val_t* val) +void *cache_add_glyph(Hashmap *glyph_cache, GlyphHashKey *key, + GlyphHashValue *val) { - return hashmap_insert(glyph_cache, key, val); + return hashmap_insert(glyph_cache, key, val); } /** @@ -303,48 +294,54 @@ void* cache_add_glyph(glyph_hash_key_t* key, glyph_hash_val_t* val) * \param key hash key * \return requested hash val or 0 if not found */ -glyph_hash_val_t* cache_find_glyph(glyph_hash_key_t* key) +GlyphHashValue *cache_find_glyph(Hashmap *glyph_cache, + GlyphHashKey *key) { - return hashmap_find(glyph_cache, key); + return hashmap_find(glyph_cache, key); } -void ass_glyph_cache_init(void) +Hashmap *ass_glyph_cache_init(ASS_Library *library) { - glyph_cache = hashmap_init(sizeof(glyph_hash_key_t), - sizeof(glyph_hash_val_t), - 0xFFFF + 13, - glyph_hash_dtor, NULL, NULL); + Hashmap *glyph_cache; + glyph_cache = hashmap_init(library, sizeof(GlyphHashKey), + sizeof(GlyphHashValue), + 0xFFFF + 13, + glyph_hash_dtor, glyph_compare, glyph_hash); + return glyph_cache; } -void ass_glyph_cache_done(void) +void ass_glyph_cache_done(Hashmap *glyph_cache) { - hashmap_done(glyph_cache); + hashmap_done(glyph_cache); } -void ass_glyph_cache_reset(void) +Hashmap *ass_glyph_cache_reset(Hashmap *glyph_cache) { - ass_glyph_cache_done(); - ass_glyph_cache_init(); + ASS_Library *lib = glyph_cache->library; + + ass_glyph_cache_done(glyph_cache); + return ass_glyph_cache_init(lib); } //--------------------------------- // composite cache -hashmap_t* composite_cache; - -static void composite_hash_dtor(void* key, size_t key_size, void* value, size_t value_size) +static void composite_hash_dtor(void *key, size_t key_size, void *value, + size_t value_size) { - composite_hash_val_t* v = value; - free(v->a); - free(v->b); - free(key); - free(value); + CompositeHashValue *v = value; + free(v->a); + free(v->b); + free(key); + free(value); } -void* cache_add_composite(composite_hash_key_t* key, composite_hash_val_t* val) +void *cache_add_composite(Hashmap *composite_cache, + CompositeHashKey *key, + CompositeHashValue *val) { - return hashmap_insert(composite_cache, key, val); + return hashmap_insert(composite_cache, key, val); } /** @@ -352,27 +349,32 @@ void* cache_add_composite(composite_hash_key_t* key, composite_hash_val_t* val) * \param key hash key * \return requested hash val or 0 if not found */ -composite_hash_val_t* cache_find_composite(composite_hash_key_t* key) +CompositeHashValue *cache_find_composite(Hashmap *composite_cache, + CompositeHashKey *key) { - return hashmap_find(composite_cache, key); + return hashmap_find(composite_cache, key); } -void ass_composite_cache_init(void) +Hashmap *ass_composite_cache_init(ASS_Library *library) { - composite_cache = hashmap_init(sizeof(composite_hash_key_t), - sizeof(composite_hash_val_t), - 0xFFFF + 13, - composite_hash_dtor, NULL, NULL); + Hashmap *composite_cache; + composite_cache = hashmap_init(library, sizeof(CompositeHashKey), + sizeof(CompositeHashValue), + 0xFFFF + 13, + composite_hash_dtor, composite_compare, + composite_hash); + return composite_cache; } -void ass_composite_cache_done(void) +void ass_composite_cache_done(Hashmap *composite_cache) { - hashmap_done(composite_cache); + hashmap_done(composite_cache); } -void ass_composite_cache_reset(void) +Hashmap *ass_composite_cache_reset(Hashmap *composite_cache) { - ass_composite_cache_done(); - ass_composite_cache_init(); -} + ASS_Library *lib = composite_cache->library; + ass_composite_cache_done(composite_cache); + return ass_composite_cache_init(lib); +} |