diff options
Diffstat (limited to 'video/img_format.h')
| -rw-r--r-- | video/img_format.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/video/img_format.h b/video/img_format.h index ebdbd66e29..975f58ad39 100644 --- a/video/img_format.h +++ b/video/img_format.h @@ -20,16 +20,11 @@ #include <inttypes.h> +#include "config.h" #include "osdep/endian.h" #include "misc/bstr.h" #include "video/csputils.h" -#if BYTE_ORDER == BIG_ENDIAN -#define MP_SELECT_LE_BE(LE, BE) BE -#else -#define MP_SELECT_LE_BE(LE, BE) LE -#endif - #define MP_MAX_PLANES 4 #define MP_NUM_COMPONENTS 4 @@ -160,9 +155,9 @@ int mp_imgfmt_desc_get_num_comps(struct mp_imgfmt_desc *desc); // luma pixel. luma_offsets[0] == mp_imgfmt_desc.comps[0].offset. bool mp_imgfmt_get_packed_yuv_locations(int imgfmt, uint8_t *luma_offsets); -// MP_CSP_AUTO for YUV, MP_CSP_RGB or MP_CSP_XYZ otherwise. +// PL_COLOR_SYSTEM_UNKNOWN for YUV, PL_COLOR_SYSTEM_RGB or PL_COLOR_SYSTEM_XYZ otherwise. // (Because IMGFMT/AV_PIX_FMT conflate format and csp for RGB and XYZ.) -enum mp_csp mp_imgfmt_get_forced_csp(int imgfmt); +enum pl_color_system mp_imgfmt_get_forced_csp(int imgfmt); enum mp_component_type { MP_COMPONENT_TYPE_UNKNOWN = 0, @@ -189,7 +184,7 @@ struct mp_regular_imgfmt { // See mp_imgfmt_get_forced_csp(). Normally code should use // mp_image_params.colors. This field is only needed to map the format // unambiguously to FFmpeg formats. - enum mp_csp forced_csp; + enum pl_color_system forced_csp; // Size of each component in bytes. uint8_t component_size; @@ -276,7 +271,6 @@ enum mp_imgfmt { IMGFMT_DXVA2, // IDirect3DSurface9 (NV12/P010/P016) IMGFMT_MMAL, // MMAL_BUFFER_HEADER_T IMGFMT_MEDIACODEC, // AVMediaCodecBuffer - IMGFMT_DRMPRIME, // AVDRMFrameDescriptor IMGFMT_CUDA, // CUDA Buffer // Not an actual format; base for mpv-specific descriptor table. @@ -319,6 +313,8 @@ enum mp_imgfmt { IMGFMT_VDPAU_OUTPUT, // VdpOutputSurface IMGFMT_VAAPI, IMGFMT_VIDEOTOOLBOX, // CVPixelBufferRef + IMGFMT_VULKAN, // VKImage + IMGFMT_DRMPRIME, // AVDRMFrameDescriptor // Generic pass-through of AV_PIX_FMT_*. Used for formats which don't have // a corresponding IMGFMT_ value. |