Skip to content

Fix ass_render_frame's change detection when using BorderStyle=4 #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tmm1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix ass_render_frame's change detection when using BorderStyle=4 #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
659c56b
render: keep track of background images
tmm1 Jul 19, 2018
e719786
render: ensure ass_image_compare does not trip over background images
tmm1 Jul 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion libass/ass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ typedef struct ass_image {
enum {
IMAGE_TYPE_CHARACTER,
IMAGE_TYPE_OUTLINE,
IMAGE_TYPE_SHADOW
IMAGE_TYPE_SHADOW,
IMAGE_TYPE_BACKGROUND
} type;

} ASS_Image;
Expand Down
6 changes: 5 additions & 1 deletion libass/ass_render.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2291,6 +2291,7 @@ static void add_background(ASS_Renderer *render_priv, EventImages *event_images)
ASS_Image *img = my_draw_bitmap(nbuffer, w, h, w, left, top,
render_priv->state.c[3], NULL);
if (img) {
img->type = IMAGE_TYPE_BACKGROUND;
img->next = event_images->imgs;
event_images->imgs = img;
}
Expand Down Expand Up @@ -2789,7 +2790,10 @@ static int ass_image_compare(ASS_Image *i1, ASS_Image *i2)
return 2;
if (i1->color != i2->color)
return 2;
if (i1->bitmap != i2->bitmap)
if (i1->type != i2->type)
return 2;
if (i1->type != IMAGE_TYPE_BACKGROUND &&
i1->bitmap != i2->bitmap)
return 2;
if (i1->dst_x != i2->dst_x)
return 1;
Expand Down