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

filters/f_hwtransfer: remove VAAPI <-> Vulkan mapping for now 

This mapping isn't actually relevant until we have the Vulkan interop
merged, and it requires a newer version of libavutil than our minimum
requirement. So I'm going to remove it from master and put it in the
interop PR.

Fixes #10813
This commit is contained in:
Philip Langdale 2022-10-29 18:47:37 -07:00
parent f594482451
commit 48bb17549c
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
filters/f_hwtransfer.c
View File

@ -50,10 +50,6 @@ struct hwmap_pairs {
// We cannot discover which pairs of hardware formats need to use hwmap to // We cannot discover which pairs of hardware formats need to use hwmap to
// convert between the formats, so we need a lookup table. // convert between the formats, so we need a lookup table.
static const struct hwmap_pairs hwmap_pairs[] = { static const struct hwmap_pairs hwmap_pairs[] = {
{
.first_fmt = IMGFMT_VAAPI,
.second_fmt = IMGFMT_VULKAN,
},
{ {
.first_fmt = IMGFMT_DRMPRIME, .first_fmt = IMGFMT_DRMPRIME,
.second_fmt = IMGFMT_VAAPI, .second_fmt = IMGFMT_VAAPI,

1
video/fmt-conversion.c
View File

@ -67,7 +67,6 @@ static const struct {
{IMGFMT_CUDA, AV_PIX_FMT_CUDA}, {IMGFMT_CUDA, AV_PIX_FMT_CUDA},
{IMGFMT_P010, AV_PIX_FMT_P010}, {IMGFMT_P010, AV_PIX_FMT_P010},
{IMGFMT_DRMPRIME, AV_PIX_FMT_DRM_PRIME}, {IMGFMT_DRMPRIME, AV_PIX_FMT_DRM_PRIME},
{IMGFMT_VULKAN, AV_PIX_FMT_VULKAN},
{0, AV_PIX_FMT_NONE} {0, AV_PIX_FMT_NONE}
}; };

1
video/img_format.h
View File

@ -318,7 +318,6 @@ enum mp_imgfmt {
IMGFMT_VDPAU_OUTPUT, // VdpOutputSurface IMGFMT_VDPAU_OUTPUT, // VdpOutputSurface
IMGFMT_VAAPI, IMGFMT_VAAPI,
IMGFMT_VIDEOTOOLBOX, // CVPixelBufferRef IMGFMT_VIDEOTOOLBOX, // CVPixelBufferRef
IMGFMT_VULKAN, // VKImage
IMGFMT_DRMPRIME, // AVDRMFrameDescriptor IMGFMT_DRMPRIME, // AVDRMFrameDescriptor
// Generic pass-through of AV_PIX_FMT_*. Used for formats which don't have // Generic pass-through of AV_PIX_FMT_*. Used for formats which don't have