RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_gpu_next: simplify after recent changes

This commit is contained in:
Kacper Michajłow 2023-11-04 07:10:31 +01:00 committed by Dudemanguy
parent 475f76dc6d
commit 431759c70c
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
video/out/vo_gpu_next.c
View File

@ -238,8 +238,6 @@ static struct mp_image *get_image(struct vo *vo, int imgfmt, int w, int h,
return mpi; return mpi;
} }
static struct pl_color_space get_mpi_csp(struct vo *vo, struct mp_image *mpi);
static void update_overlays(struct vo *vo, struct mp_osd_res res, static void update_overlays(struct vo *vo, struct mp_osd_res res,
int flags, enum pl_overlay_coords coords, int flags, enum pl_overlay_coords coords,
struct osd_state *state, struct pl_frame *frame, struct osd_state *state, struct pl_frame *frame,
@ -322,7 +320,7 @@ static void update_overlays(struct vo *vo, struct mp_osd_res res,
ol->repr.alpha = PL_ALPHA_PREMULTIPLIED; ol->repr.alpha = PL_ALPHA_PREMULTIPLIED;
// Infer bitmap colorspace from source // Infer bitmap colorspace from source
if (src) { if (src) {
ol->color = get_mpi_csp(vo, src); ol->color = src->params.color;
// Seems like HDR subtitles are targeting SDR white // Seems like HDR subtitles are targeting SDR white
if (pl_color_transfer_is_hdr(ol->color.transfer)) { if (pl_color_transfer_is_hdr(ol->color.transfer)) {
ol->color.hdr = (struct pl_hdr_metadata) { ol->color.hdr = (struct pl_hdr_metadata) {
@ -441,16 +439,6 @@ static int plane_data_from_imgfmt(struct pl_plane_data out_data[4],
return desc.num_planes; return desc.num_planes;
} }
static struct pl_color_space get_mpi_csp(struct vo *vo, struct mp_image *mpi)
{
struct pl_color_space csp = {
.primaries = mpi->params.color.primaries,
.transfer = mpi->params.color.transfer,
.hdr = mpi->params.color.hdr,
};
return csp;
}
static bool hwdec_reconfig(struct priv *p, struct ra_hwdec *hwdec, static bool hwdec_reconfig(struct priv *p, struct ra_hwdec *hwdec,
const struct mp_image_params *par) const struct mp_image_params *par)
{ {
@ -571,12 +559,8 @@ static bool map_frame(pl_gpu gpu, pl_tex *tex, const struct pl_source_frame *src
} }
*frame = (struct pl_frame) { *frame = (struct pl_frame) {
.color = get_mpi_csp(vo, mpi), .color = par->color,
.repr = { .repr = par->repr,
.sys = par->repr.sys,
.levels = par->repr.levels,
.alpha = par->repr.alpha,
},
.profile = { .profile = {
.data = mpi->icc_profile ? mpi->icc_profile->data : NULL, .data = mpi->icc_profile ? mpi->icc_profile->data : NULL,
.len = mpi->icc_profile ? mpi->icc_profile->size : 0, .len = mpi->icc_profile ? mpi->icc_profile->size : 0,
@ -940,7 +924,7 @@ static void draw_frame(struct vo *vo, struct vo_frame *frame)
} }
if (p->target_hint && frame->current) { if (p->target_hint && frame->current) {
struct pl_color_space hint = get_mpi_csp(vo, frame->current); struct pl_color_space hint = frame->current->params.color;
if (opts->target_prim) if (opts->target_prim)
hint.primaries = opts->target_prim; hint.primaries = opts->target_prim;
if (opts->target_trc) if (opts->target_trc)