From 8ed32e90c933c13ce128f1edf44624616f8efca0 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 3 Jul 2016 19:29:43 +0200
Subject: sub: move RGBA scaling to vo_vaapi

vo_vaapi is the only thing which can't scale RGBA on the GPU. (Other
cases of RGBA scaling are handled in draw_bmp.c for some reason.)

Move this code and get rid of the osd_conv_cache thing.

Functionally, nothing changes.
---
 sub/img_convert.c | 62 -------------------------------------------------------
 sub/img_convert.h |  4 ----
 2 files changed, 66 deletions(-)

(limited to 'sub')

diff --git a/sub/img_convert.c b/sub/img_convert.c
index e49b7785af..0ce5c7ac0a 100644
--- a/sub/img_convert.c
+++ b/sub/img_convert.c
@@ -30,17 +30,6 @@
 #include "video/mp_image.h"
 #include "video/sws_utils.h"
 
-struct osd_conv_cache {
-    struct sub_bitmap part[MP_SUB_BB_LIST_MAX];
-    struct sub_bitmap *parts;
-    void *scratch;
-};
-
-struct osd_conv_cache *osd_conv_cache_new(void)
-{
-    return talloc_zero(NULL, struct osd_conv_cache);
-}
-
 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);
@@ -58,57 +47,6 @@ void mp_blur_rgba_sub_bitmap(struct sub_bitmap *d, double gblur)
     talloc_free(tmp1);
 }
 
-// If RGBA parts need scaling, scale them.
-bool osd_scale_rgba(struct osd_conv_cache *c, struct sub_bitmaps *imgs)
-{
-    struct sub_bitmaps src = *imgs;
-    if (src.format != SUBBITMAP_RGBA)
-        return false;
-
-    bool need_scale = false;
-    for (int n = 0; n < src.num_parts; n++) {
-        struct sub_bitmap *sb = &src.parts[n];
-        if (sb->w != sb->dw || sb->h != sb->dh)
-            need_scale = true;
-    }
-    if (!need_scale)
-        return false;
-
-    talloc_free(c->parts);
-    imgs->parts = c->parts = talloc_array(c, struct sub_bitmap, src.num_parts);
-    imgs->packed = NULL;
-
-    // Note: we scale all parts, since most likely all need scaling anyway, and
-    //       to get a proper copy of all data in the imgs list.
-    for (int n = 0; n < src.num_parts; n++) {
-        struct sub_bitmap *d = &imgs->parts[n];
-        struct sub_bitmap *s = &src.parts[n];
-
-        struct mp_image src_image = {0};
-        mp_image_setfmt(&src_image, IMGFMT_BGRA);
-        mp_image_set_size(&src_image, s->w, s->h);
-        src_image.planes[0] = s->bitmap;
-        src_image.stride[0] = s->stride;
-
-        d->x = s->x;
-        d->y = s->y;
-        d->w = d->dw = s->dw;
-        d->h = d->dh = s->dh;
-        struct mp_image *image = mp_image_alloc(IMGFMT_BGRA, d->w, d->h);
-        talloc_steal(c->parts, image);
-        if (image) {
-            d->stride = image->stride[0];
-            d->bitmap = image->planes[0];
-
-            mp_image_swscale(image, &src_image, mp_sws_fast_flags);
-        } else {
-            // on OOM, skip the region; just don't scale it
-            *d = *s;
-        }
-    }
-    return true;
-}
-
 bool mp_sub_bitmaps_bb(struct sub_bitmaps *imgs, struct mp_rect *out_bb)
 {
     struct mp_rect bb = {INT_MAX, INT_MAX, INT_MIN, INT_MIN};
diff --git a/sub/img_convert.h b/sub/img_convert.h
index bf228a1f65..e03c155f46 100644
--- a/sub/img_convert.h
+++ b/sub/img_convert.h
@@ -3,16 +3,12 @@
 
 #include <stdbool.h>
 
-struct osd_conv_cache;
 struct sub_bitmaps;
 struct sub_bitmap;
 struct mp_rect;
 
-struct osd_conv_cache *osd_conv_cache_new(void);
-
 // Sub postprocessing
 void mp_blur_rgba_sub_bitmap(struct sub_bitmap *d, double gblur);
-bool osd_scale_rgba(struct osd_conv_cache *c, struct sub_bitmaps *imgs);
 
 bool mp_sub_bitmaps_bb(struct sub_bitmaps *imgs, struct mp_rect *out_bb);
 
-- 
cgit v1.2.3