diff options
-rw-r--r-- | libass/ass.h | 12 | ||||
-rw-r--r-- | libass/ass_render.c | 22 |
2 files changed, 27 insertions, 7 deletions
diff --git a/libass/ass.h b/libass/ass.h index b92960a1..3c8c1f65 100644 --- a/libass/ass.h +++ b/libass/ass.h @@ -30,11 +30,21 @@ /* Libass renderer object. Contents are private. */ typedef struct ass_renderer_s ass_renderer_t; -/* A linked list of images produced by ass renderer. */ +/* + * A linked list of images produced by an ass renderer. + * + * These images have to be rendered in-order for the correct screen + * composition. The libass renderer clips these bitmaps to the frame size. + * w/h can be zero, in this case the bitmap should not be rendered at all. + * The last bitmap row is not guaranteed to be padded up to stride size, + * e.g. in the worst case a bitmap has the size stride * (h - 1) + w. + */ typedef struct ass_image_s { int w, h; // Bitmap width/height int stride; // Bitmap stride unsigned char *bitmap; // 1bpp stride*h alpha buffer + // Note: the last row may not be padded to + // bitmap stride! uint32_t color; // Bitmap color and alpha, RGBA int dst_x, dst_y; // Bitmap placement inside the video frame diff --git a/libass/ass_render.c b/libass/ass_render.c index f6234828..23c93fba 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -611,6 +611,20 @@ static ass_image_t **render_glyph(ass_renderer_t *render_priv, } /** + * \brief Replace the bitmap buffer in ass_image_t with a copy + * \param img ass_image_t to operate on + * \return pointer to old bitmap buffer + */ +static unsigned char *clone_bitmap_buffer(ass_image_t *img) +{ + unsigned char *old_bitmap = img->bitmap; + int size = img->stride * (img->h - 1) + img->w; + img->bitmap = malloc(size); + memcpy(img->bitmap, old_bitmap, size); + return old_bitmap; +} + +/** * \brief Calculate overlapping area of two consecutive bitmaps and in case they * overlap, composite them together * Mainly useful for translucent glyphs and especially borders, to avoid the @@ -680,12 +694,8 @@ render_overlap(ass_renderer_t *render_priv, ass_image_t **last_tail, return; } // Allocate new bitmaps and copy over data - a = (*last_tail)->bitmap; - b = (*tail)->bitmap; - (*last_tail)->bitmap = malloc(as * ah); - (*tail)->bitmap = malloc(bs * bh); - memcpy((*last_tail)->bitmap, a, as * ah); - memcpy((*tail)->bitmap, b, bs * bh); + a = clone_bitmap_buffer(*last_tail); + b = clone_bitmap_buffer(*tail); // Composite overlapping area for (y = 0; y < h; y++) |