diff options
| author | wm4 <wm4@nowhere> | 2020-05-11 19:37:16 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2020-05-11 19:57:34 +0200 |
| commit | 6db890ebab2839443ddbfc34a4a0246d464bd14f (patch) | |
| tree | bed087dd0f72b1365fa9ebb69462504db80e4474 /sub | |
| parent | b5284a68296519480d9d4142880c13a8112feb18 (diff) | |
| download | mpv-6db890ebab2839443ddbfc34a4a0246d464bd14f.tar.bz2 mpv-6db890ebab2839443ddbfc34a4a0246d464bd14f.tar.xz | |
video: remove RGB32/BGR32 aliases
They are sort of confusing, and they hide the fact that they have an
alpha component. Using the actual formats directly is no problem, sicne
these were useful only for big endian systems, something we can't test
anyway.
Diffstat (limited to 'sub')
| -rw-r--r-- | sub/draw_bmp.c | 10 | ||||
| -rw-r--r-- | sub/osd.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sub/draw_bmp.c b/sub/draw_bmp.c index e1caea1e0a..c411c539b5 100644 --- a/sub/draw_bmp.c +++ b/sub/draw_bmp.c @@ -408,13 +408,13 @@ static bool render_rgba(struct mp_draw_sub_cache *p, struct part *part, if (!scaled) { struct mp_image src_img = {0}; - mp_image_setfmt(&src_img, IMGFMT_BGR32); + mp_image_setfmt(&src_img, IMGFMT_BGRA); mp_image_set_size(&src_img, sw, sh); src_img.planes[0] = s_ptr; src_img.stride[0] = s_stride; src_img.params.alpha = MP_ALPHA_PREMUL; - scaled = mp_image_alloc(IMGFMT_BGR32, dw, dh); + scaled = mp_image_alloc(IMGFMT_BGRA, dw, dh); if (!scaled) return false; part->imgs[i] = talloc_steal(p, scaled); @@ -457,7 +457,7 @@ static bool render_sb(struct mp_draw_sub_cache *p, struct sub_bitmaps *sb) static void clear_rgba_overlay(struct mp_draw_sub_cache *p) { - assert(p->rgba_overlay->imgfmt == IMGFMT_BGR32); + assert(p->rgba_overlay->imgfmt == IMGFMT_BGRA); for (int y = 0; y < p->rgba_overlay->h; y++) { uint32_t *px = mp_image_pixel_ptr(p->rgba_overlay, 0, 0, y); @@ -519,7 +519,7 @@ static bool reinit(struct mp_draw_sub_cache *p, struct mp_image_params *params) int overlay_fmt = 0; if (params->color.space == MP_CSP_RGB && vfdesc.num_planes >= 3) { // No point in doing anything fancy. - overlay_fmt = IMGFMT_BGR32; + overlay_fmt = IMGFMT_BGRA; p->scale_in_tiles = false; } else { struct mp_regular_imgfmt odesc = vfdesc; @@ -586,7 +586,7 @@ static bool reinit(struct mp_draw_sub_cache *p, struct mp_image_params *params) h = MP_ALIGN_UP(h, TILE_H); } - p->rgba_overlay = talloc_steal(p, mp_image_alloc(IMGFMT_BGR32, w, h)); + p->rgba_overlay = talloc_steal(p, mp_image_alloc(IMGFMT_BGRA, w, h)); p->overlay_tmp = talloc_steal(p, mp_image_alloc(render_fmt, SLICE_W, slice_h)); p->video_tmp = talloc_steal(p, mp_image_alloc(vid_f32_fmt, SLICE_W, slice_h)); if (!p->rgba_overlay || !p->overlay_tmp || !p->video_tmp) @@ -28,7 +28,7 @@ enum sub_bitmap_format { SUBBITMAP_EMPTY = 0,// no bitmaps; always has num_parts==0 SUBBITMAP_LIBASS, // A8, with a per-surface blend color (libass.color) - SUBBITMAP_RGBA, // B8G8R8A8 (MSB=A, LSB=B), scaled, premultiplied alpha + SUBBITMAP_RGBA, // IMGFMT_BGRA (MSB=A, LSB=B), scaled, premultiplied alpha SUBBITMAP_COUNT }; |