diff options
author | wm4 <wm4@nowhere> | 2015-12-09 00:22:12 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-12-09 00:23:36 +0100 |
commit | 45ae0716be3319bac4585b8fedac529a0809a44c (patch) | |
tree | 3d0c79a7d5e5bb8778118e9551295cedf9ed3667 /sub | |
parent | c5c7b239b6386940a8063c6954db2a4705ce3251 (diff) | |
download | mpv-45ae0716be3319bac4585b8fedac529a0809a44c.tar.bz2 mpv-45ae0716be3319bac4585b8fedac529a0809a44c.tar.xz |
csputils: rename "yuv2rgb" functions
They're not necessarily restricted to YUV aka YCbCr.
vo_direct3d.c and demux_disc.c (DVD specific code) changes untested.
Diffstat (limited to 'sub')
-rw-r--r-- | sub/draw_bmp.c | 4 | ||||
-rw-r--r-- | sub/sd_ass.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sub/draw_bmp.c b/sub/draw_bmp.c index 0c12c7078a..da4760e105 100644 --- a/sub/draw_bmp.c +++ b/sub/draw_bmp.c @@ -296,8 +296,8 @@ static void draw_ass(struct mp_draw_sub_cache *cache, struct mp_rect bb, struct mp_cmat yuv2rgb, rgb2yuv; bool need_conv = temp->fmt.flags & MP_IMGFLAG_YUV; if (need_conv) { - mp_get_yuv2rgb_coeffs(&cspar, &yuv2rgb); - mp_invert_yuv2rgb(&rgb2yuv, &yuv2rgb); + mp_get_csp_matrix(&cspar, &yuv2rgb); + mp_invert_cmat(&rgb2yuv, &yuv2rgb); } for (int i = 0; i < sbs->num_parts; ++i) { diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 092b260677..2948475e7a 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -668,15 +668,15 @@ static void mangle_colors(struct sd *sd, struct sub_bitmaps *parts) vs_params.colorspace = csp; vs_params.levels_in = levels; struct mp_cmat vs_yuv2rgb, vs_rgb2yuv; - mp_get_yuv2rgb_coeffs(&vs_params, &vs_yuv2rgb); - mp_invert_yuv2rgb(&vs_rgb2yuv, &vs_yuv2rgb); + mp_get_csp_matrix(&vs_params, &vs_yuv2rgb); + mp_invert_cmat(&vs_rgb2yuv, &vs_yuv2rgb); // Proper conversion to RGB struct mp_csp_params rgb_params = MP_CSP_PARAMS_DEFAULTS; rgb_params.colorspace = params.colorspace; rgb_params.levels_in = params.colorlevels; struct mp_cmat vs2rgb; - mp_get_yuv2rgb_coeffs(&rgb_params, &vs2rgb); + mp_get_csp_matrix(&rgb_params, &vs2rgb); for (int n = 0; n < parts->num_parts; n++) { struct sub_bitmap *sb = &parts->parts[n]; |