summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sub/img_convert.c8
-rw-r--r--sub/sd_lavc.c10
2 files changed, 11 insertions, 7 deletions
diff --git a/sub/img_convert.c b/sub/img_convert.c
index 348811e773..78be881fdf 100644
--- a/sub/img_convert.c
+++ b/sub/img_convert.c
@@ -44,8 +44,7 @@ struct osd_conv_cache *osd_conv_cache_new(void)
void mp_blur_rgba_sub_bitmap(struct sub_bitmap *d, double gblur)
{
struct mp_image *tmp1 = mp_image_alloc(IMGFMT_BGRA, d->w, d->h);
- struct mp_image *tmp2 = mp_image_alloc(IMGFMT_BGRA, d->w, d->h);
- if (tmp1 && tmp2) { // on OOM, skip region
+ if (tmp1) { // on OOM, skip region
struct mp_image s = {0};
mp_image_setfmt(&s, IMGFMT_BGRA);
mp_image_set_size(&s, d->w, d->h);
@@ -54,12 +53,9 @@ void mp_blur_rgba_sub_bitmap(struct sub_bitmap *d, double gblur)
mp_image_copy(tmp1, &s);
- mp_image_sw_blur_scale(tmp2, tmp1, gblur);
-
- mp_image_copy(&s, tmp2);
+ mp_image_sw_blur_scale(&s, tmp1, gblur);
}
talloc_free(tmp1);
- talloc_free(tmp2);
}
// If RGBA parts need scaling, scale them.
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c
index 71bb551013..6661e4fac8 100644
--- a/sub/sd_lavc.c
+++ b/sub/sd_lavc.c
@@ -223,6 +223,10 @@ static void read_sub_bitmaps(struct sd *sd, struct sub *sub)
priv->packer->padding = padding;
+ // For the sake of libswscale, which in some cases takes sub-rects as
+ // source images, and wants 16 byte start pointer and stride alignment.
+ int align = 4;
+
for (int i = 0; i < avsub->num_rects; i++) {
struct AVSubtitleRect *r = avsub->rects[i];
struct sub_bitmap *b = &sub->inbitmaps[sub->count];
@@ -238,7 +242,7 @@ static void read_sub_bitmaps(struct sd *sd, struct sub *sub)
b->bitmap = r; // save for later (dumb hack to avoid more complexity)
- priv->packer->in[sub->count] = (struct pos){r->w, r->h};
+ priv->packer->in[sub->count] = (struct pos){r->w + (align - 1), r->h};
sub->count++;
}
@@ -283,6 +287,10 @@ static void read_sub_bitmaps(struct sd *sd, struct sub *sub)
b->h = r->h;
b->x = r->x;
b->y = r->y;
+
+ // Choose such that the extended start position is aligned.
+ pos.x = MP_ALIGN_UP(pos.x - extend, align * 4) + extend;
+
b->src_x = pos.x;
b->src_y = pos.y;
b->stride = sub->data->stride[0];