summaryrefslogtreecommitdiffstats
path: root/video/out
diff options
context:
space:
mode:
Diffstat (limited to 'video/out')
-rw-r--r--video/out/gpu/video.c2
-rw-r--r--video/out/placebo/utils.c11
-rw-r--r--video/out/placebo/utils.h1
-rw-r--r--video/out/vo_gpu_next.c2
4 files changed, 2 insertions, 14 deletions
diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c
index d685b978d2..6714ef04b1 100644
--- a/video/out/gpu/video.c
+++ b/video/out/gpu/video.c
@@ -2397,7 +2397,7 @@ static void pass_convert_yuv(struct gl_video *p)
p->components = 3;
if (!p->has_alpha || p->opts.alpha_mode == ALPHA_NO) {
GLSL(color.a = 1.0;)
- } else if (p->image_params.alpha == MP_ALPHA_PREMUL) {
+ } else if (p->image_params.repr.alpha == PL_ALPHA_PREMULTIPLIED) {
p->components = 4;
} else {
p->components = 4;
diff --git a/video/out/placebo/utils.c b/video/out/placebo/utils.c
index b60e4ff5bc..ffba30401f 100644
--- a/video/out/placebo/utils.c
+++ b/video/out/placebo/utils.c
@@ -72,17 +72,6 @@ void mppl_log_set_probing(pl_log log, bool probing)
pl_log_update(log, &params);
}
-enum pl_alpha_mode mp_alpha_to_pl(enum mp_alpha_type alpha)
-{
- switch (alpha) {
- case MP_ALPHA_AUTO: return PL_ALPHA_UNKNOWN;
- case MP_ALPHA_STRAIGHT: return PL_ALPHA_INDEPENDENT;
- case MP_ALPHA_PREMUL: return PL_ALPHA_PREMULTIPLIED;
- }
-
- MP_ASSERT_UNREACHABLE();
-}
-
enum pl_chroma_location mp_chroma_to_pl(enum mp_chroma_location chroma)
{
switch (chroma) {
diff --git a/video/out/placebo/utils.h b/video/out/placebo/utils.h
index 103fa4ce24..84b2e0468e 100644
--- a/video/out/placebo/utils.h
+++ b/video/out/placebo/utils.h
@@ -27,7 +27,6 @@ static inline struct pl_rect2d mp_rect2d_to_pl(struct mp_rect rc)
};
}
-enum pl_alpha_mode mp_alpha_to_pl(enum mp_alpha_type alpha);
enum pl_chroma_location mp_chroma_to_pl(enum mp_chroma_location chroma);
void mp_map_dovi_metadata_to_pl(struct mp_image *mpi,
diff --git a/video/out/vo_gpu_next.c b/video/out/vo_gpu_next.c
index dee8bc2301..fc9ccbe38d 100644
--- a/video/out/vo_gpu_next.c
+++ b/video/out/vo_gpu_next.c
@@ -575,7 +575,7 @@ static bool map_frame(pl_gpu gpu, pl_tex *tex, const struct pl_source_frame *src
.repr = {
.sys = par->repr.sys,
.levels = par->repr.levels,
- .alpha = mp_alpha_to_pl(par->alpha),
+ .alpha = par->repr.alpha,
},
.profile = {
.data = mpi->icc_profile ? mpi->icc_profile->data : NULL,