From 9e2c0b8baa3f9ccba997129a1c1023f61611e4dd Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Tue, 11 Jan 2022 21:03:27 +0100 Subject: sub: rename SUBBITMAP_RGBA to SUBBITMAP_BGRA This was a misnomer, the actual channel order is IMGFMT_BGRA (as the comment explicitly point out). Rename the enum for consistency. --- video/out/gpu/osd.c | 6 +++--- video/out/vo_gpu_next.c | 6 +++--- video/out/vo_sdl.c | 6 +++--- video/out/vo_vdpau.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'video/out') diff --git a/video/out/gpu/osd.c b/video/out/gpu/osd.c index 63a04481d2..75538dbdf4 100644 --- a/video/out/gpu/osd.c +++ b/video/out/gpu/osd.c @@ -31,7 +31,7 @@ static const int blend_factors[SUBBITMAP_COUNT][4] = { [SUBBITMAP_LIBASS] = {RA_BLEND_SRC_ALPHA, RA_BLEND_ONE_MINUS_SRC_ALPHA, RA_BLEND_ONE, RA_BLEND_ONE_MINUS_SRC_ALPHA}, - [SUBBITMAP_RGBA] = {RA_BLEND_ONE, RA_BLEND_ONE_MINUS_SRC_ALPHA, + [SUBBITMAP_BGRA] = {RA_BLEND_ONE, RA_BLEND_ONE_MINUS_SRC_ALPHA, RA_BLEND_ONE, RA_BLEND_ONE_MINUS_SRC_ALPHA}, }; @@ -86,7 +86,7 @@ struct mpgl_osd *mpgl_osd_init(struct ra *ra, struct mp_log *log, }; ctx->fmt_table[SUBBITMAP_LIBASS] = ra_find_unorm_format(ra, 1, 1); - ctx->fmt_table[SUBBITMAP_RGBA] = ra_find_unorm_format(ra, 1, 4); + ctx->fmt_table[SUBBITMAP_BGRA] = ra_find_unorm_format(ra, 1, 4); for (int n = 0; n < MAX_OSD_PARTS; n++) ctx->parts[n] = talloc_zero(ctx, struct mpgl_osd_part); @@ -215,7 +215,7 @@ bool mpgl_osd_draw_prepare(struct mpgl_osd *ctx, int index, gl_sc_uniform_texture(sc, "osdtex", part->texture); switch (fmt) { - case SUBBITMAP_RGBA: { + case SUBBITMAP_BGRA: { GLSL(color = texture(osdtex, texcoord).bgra;) break; } diff --git a/video/out/vo_gpu_next.c b/video/out/vo_gpu_next.c index 98c673eb57..40b142bc50 100644 --- a/video/out/vo_gpu_next.c +++ b/video/out/vo_gpu_next.c @@ -215,7 +215,7 @@ static void write_overlays(struct vo *vo, struct mp_osd_res res, double pts, struct priv *p = vo->priv; static const bool subfmt_all[SUBBITMAP_COUNT] = { [SUBBITMAP_LIBASS] = true, - [SUBBITMAP_RGBA] = true, + [SUBBITMAP_BGRA] = true, }; struct sub_bitmap_list *subs = osd_render(vo->osd, res, pts, flags, subfmt_all); @@ -283,7 +283,7 @@ static void write_overlays(struct vo *vo, struct mp_osd_res res, double pts, }; switch (item->format) { - case SUBBITMAP_RGBA: + case SUBBITMAP_BGRA: ol->mode = PL_OVERLAY_NORMAL; ol->repr.alpha = PL_ALPHA_PREMULTIPLIED; break; @@ -1153,7 +1153,7 @@ static int preinit(struct vo *vo) p->rr = pl_renderer_create(p->pllog, p->gpu); p->queue = pl_queue_create(p->gpu); p->osd_fmt[SUBBITMAP_LIBASS] = pl_find_named_fmt(p->gpu, "r8"); - p->osd_fmt[SUBBITMAP_RGBA] = pl_find_named_fmt(p->gpu, "rgba8"); + p->osd_fmt[SUBBITMAP_BGRA] = pl_find_named_fmt(p->gpu, "rgba8"); char *cache_file = get_cache_file(p); if (cache_file) { diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index b50fc6d94c..adfcfb43d8 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -62,7 +62,7 @@ const struct formatmap_entry formats[] = { {SDL_PIXELFORMAT_RGBX8888, IMGFMT_RGB0, 0}, // has no alpha -> bad for OSD {SDL_PIXELFORMAT_BGR888, IMGFMT_0BGR, 0}, // BGR888 means XBGR8888 {SDL_PIXELFORMAT_BGRX8888, IMGFMT_BGR0, 0}, // has no alpha -> bad for OSD - {SDL_PIXELFORMAT_ARGB8888, IMGFMT_ARGB, 1}, // matches SUBBITMAP_RGBA + {SDL_PIXELFORMAT_ARGB8888, IMGFMT_ARGB, 1}, // matches SUBBITMAP_BGRA {SDL_PIXELFORMAT_RGBA8888, IMGFMT_RGBA, 1}, {SDL_PIXELFORMAT_ABGR8888, IMGFMT_ABGR, 1}, {SDL_PIXELFORMAT_BGRA8888, IMGFMT_BGRA, 1}, @@ -71,7 +71,7 @@ const struct formatmap_entry formats[] = { {SDL_PIXELFORMAT_RGBX8888, IMGFMT_0BGR, 0}, // has no alpha -> bad for OSD {SDL_PIXELFORMAT_BGR888, IMGFMT_RGB0, 0}, // BGR888 means XBGR8888 {SDL_PIXELFORMAT_BGRX8888, IMGFMT_0RGB, 0}, // has no alpha -> bad for OSD - {SDL_PIXELFORMAT_ARGB8888, IMGFMT_BGRA, 1}, // matches SUBBITMAP_RGBA + {SDL_PIXELFORMAT_ARGB8888, IMGFMT_BGRA, 1}, // matches SUBBITMAP_BGRA {SDL_PIXELFORMAT_RGBA8888, IMGFMT_ABGR, 1}, {SDL_PIXELFORMAT_ABGR8888, IMGFMT_RGBA, 1}, {SDL_PIXELFORMAT_BGRA8888, IMGFMT_ARGB, 1}, @@ -800,7 +800,7 @@ static void draw_osd(struct vo *vo) struct priv *vc = vo->priv; static const bool osdformats[SUBBITMAP_COUNT] = { - [SUBBITMAP_RGBA] = true, + [SUBBITMAP_BGRA] = true, }; osd_draw(vo->osd, vc->osd_res, vc->osd_pts, 0, osdformats, draw_osd_cb, vo); diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index cae28cdd84..a9e115c8fa 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -596,7 +596,7 @@ static void generate_osd_part(struct vo *vo, struct sub_bitmaps *imgs) case SUBBITMAP_LIBASS: format = VDP_RGBA_FORMAT_A8; break; - case SUBBITMAP_RGBA: + case SUBBITMAP_BGRA: format = VDP_RGBA_FORMAT_B8G8R8A8; break; default: @@ -687,7 +687,7 @@ static void draw_osd(struct vo *vo) bool formats[SUBBITMAP_COUNT] = { [SUBBITMAP_LIBASS] = vc->supports_a8, - [SUBBITMAP_RGBA] = true, + [SUBBITMAP_BGRA] = true, }; double pts = vc->current_image ? vc->current_image->pts : 0; -- cgit v1.2.3