From dd2cccec192496940d396e75d1a3892ee09efd81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
Date: Wed, 16 Jul 2025 01:32:14 +0200
Subject: [PATCH] sub/ass_mp: revert some unwanted changes

We want to add padding around the whole bitmap, not within it. Smaller
parts are rendered onto bigger bitmap. Remove leftover padding code.

Fixes: e2fc75434edeba95dacf2035871a6eb3809203f6
---
 sub/ass_mp.c      | 14 +++++++-------
 sub/img_convert.c | 10 +++++-----
 sub/img_convert.h |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sub/ass_mp.c b/sub/ass_mp.c
index a9dbdf374e..4cbebc872a 100644
--- a/sub/ass_mp.c
+++ b/sub/ass_mp.c
@@ -329,9 +329,8 @@ static bool pack_libass(struct mp_ass_packer *p, struct sub_bitmaps *res)
 
 static bool pack_rgba(struct mp_ass_packer *p, struct sub_bitmaps *res)
 {
-    int padding = p->packer->padding;
     struct mp_rect bb_list[MP_SUB_BB_LIST_MAX];
-    int num_bb = mp_get_sub_bb_list(res, bb_list, MP_SUB_BB_LIST_MAX, padding);
+    int num_bb = mp_get_sub_bb_list(res, bb_list, MP_SUB_BB_LIST_MAX);
 
     struct sub_bitmaps imgs = {
         .change_id = res->change_id,
@@ -348,6 +347,7 @@ static bool pack_rgba(struct mp_ass_packer *p, struct sub_bitmaps *res)
     if (!pack(p, &imgs, IMGFMT_BGRA))
         return false;
 
+    int padding = p->packer->padding;
     uint8_t *base = imgs.packed->planes[0];
     int stride = imgs.packed->stride[0];
 
@@ -355,10 +355,10 @@ static bool pack_rgba(struct mp_ass_packer *p, struct sub_bitmaps *res)
         struct mp_rect bb = bb_list[n];
         struct sub_bitmap *b = &imgs.parts[n];
 
-        b->x = bb.x0 + padding;
-        b->y = bb.y0 + padding;
-        b->w = b->dw = mp_rect_w(bb) - padding * 2;
-        b->h = b->dh = mp_rect_h(bb) - padding * 2;
+        b->x = bb.x0;
+        b->y = bb.y0;
+        b->w = b->dw = mp_rect_w(bb);
+        b->h = b->dh = mp_rect_h(bb);
         b->stride = stride;
         b->bitmap = base + b->stride * b->src_y + b->src_x * 4;
         memset_pic(b->bitmap, 0, b->w * 4, b->h, b->stride);
@@ -376,8 +376,8 @@ static bool pack_rgba(struct mp_ass_packer *p, struct sub_bitmaps *res)
                           b->bitmap, b->stride,
                           s->x - b->x, s->y - b->y,
                           s->libass.color);
-            fill_padding_4(b->bitmap, b->w, b->h, b->stride, padding);
         }
+        fill_padding_4(b->bitmap, b->w, b->h, b->stride, padding);
     }
 
     *res = imgs;
diff --git a/sub/img_convert.c b/sub/img_convert.c
index 9fe4bd24b4..5621e59769 100644
--- a/sub/img_convert.c
+++ b/sub/img_convert.c
@@ -100,16 +100,16 @@ static void remove_intersecting_rcs(struct mp_rect *list, int *count)
 // NOTE: some callers assume that sub bitmaps are never split or partially
 //       covered by returned rectangles.
 int mp_get_sub_bb_list(struct sub_bitmaps *sbs, struct mp_rect *out_rc_list,
-                       int rc_list_count, int padding)
+                       int rc_list_count)
 {
     int M = MERGE_RC_PIXELS;
     int num_rc = 0;
     for (int n = 0; n < sbs->num_parts; n++) {
         struct sub_bitmap *sb = &sbs->parts[n];
-        struct mp_rect bb = {sb->x - padding,
-                             sb->y - padding,
-                             sb->x + sb->dw + padding,
-                             sb->y + sb->dh + padding};
+        struct mp_rect bb = {sb->x,
+                             sb->y,
+                             sb->x + sb->dw,
+                             sb->y + sb->dh};
         bool intersects = false;
         for (int r = 0; r < num_rc; r++) {
             struct mp_rect *rc = &out_rc_list[r];
diff --git a/sub/img_convert.h b/sub/img_convert.h
index c299908797..e03c155f46 100644
--- a/sub/img_convert.h
+++ b/sub/img_convert.h
@@ -18,6 +18,6 @@ bool mp_sub_bitmaps_bb(struct sub_bitmaps *imgs, struct mp_rect *out_bb);
 #define MP_SUB_BB_LIST_MAX 15
 
 int mp_get_sub_bb_list(struct sub_bitmaps *sbs, struct mp_rect *out_rc_list,
-                       int rc_list_count, int padding);
+                       int rc_list_count);
 
 #endif