mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
lavc/qsvdec: add decode support for HEVC 4:2:2 8-bit and 10-bit
Enables HEVC Range Extension decoding support (Linux) for 4:2:2 8/10 bit on ICL+ (gen11 +) platform. Restricted to linux only for now. Signed-off-by: Linjie Fu <linjie.fu@intel.com>
This commit is contained in:
parent
3ab6a923d1
commit
9723d7d523
@ -195,6 +195,12 @@ enum AVPixelFormat ff_qsv_map_fourcc(uint32_t fourcc)
|
|||||||
case MFX_FOURCC_NV12: return AV_PIX_FMT_NV12;
|
case MFX_FOURCC_NV12: return AV_PIX_FMT_NV12;
|
||||||
case MFX_FOURCC_P010: return AV_PIX_FMT_P010;
|
case MFX_FOURCC_P010: return AV_PIX_FMT_P010;
|
||||||
case MFX_FOURCC_P8: return AV_PIX_FMT_PAL8;
|
case MFX_FOURCC_P8: return AV_PIX_FMT_PAL8;
|
||||||
|
#if CONFIG_VAAPI
|
||||||
|
case MFX_FOURCC_YUY2: return AV_PIX_FMT_YUYV422;
|
||||||
|
#if QSV_VERSION_ATLEAST(1, 27)
|
||||||
|
case MFX_FOURCC_Y210: return AV_PIX_FMT_Y210;
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
return AV_PIX_FMT_NONE;
|
return AV_PIX_FMT_NONE;
|
||||||
}
|
}
|
||||||
@ -211,6 +217,16 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc)
|
|||||||
case AV_PIX_FMT_P010:
|
case AV_PIX_FMT_P010:
|
||||||
*fourcc = MFX_FOURCC_P010;
|
*fourcc = MFX_FOURCC_P010;
|
||||||
return AV_PIX_FMT_P010;
|
return AV_PIX_FMT_P010;
|
||||||
|
#if CONFIG_VAAPI
|
||||||
|
case AV_PIX_FMT_YUV422P:
|
||||||
|
*fourcc = MFX_FOURCC_YUY2;
|
||||||
|
return AV_PIX_FMT_YUYV422;
|
||||||
|
#if QSV_VERSION_ATLEAST(1, 27)
|
||||||
|
case AV_PIX_FMT_YUV422P10:
|
||||||
|
*fourcc = MFX_FOURCC_Y210;
|
||||||
|
return AV_PIX_FMT_Y210;
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
return AVERROR(ENOSYS);
|
return AVERROR(ENOSYS);
|
||||||
}
|
}
|
||||||
|
@ -44,6 +44,10 @@
|
|||||||
#include "pixdesc.h"
|
#include "pixdesc.h"
|
||||||
#include "time.h"
|
#include "time.h"
|
||||||
|
|
||||||
|
#define QSV_VERSION_ATLEAST(MAJOR, MINOR) \
|
||||||
|
(MFX_VERSION_MAJOR > (MAJOR) || \
|
||||||
|
MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
|
||||||
|
|
||||||
typedef struct QSVDevicePriv {
|
typedef struct QSVDevicePriv {
|
||||||
AVBufferRef *child_device_ctx;
|
AVBufferRef *child_device_ctx;
|
||||||
} QSVDevicePriv;
|
} QSVDevicePriv;
|
||||||
@ -103,6 +107,14 @@ static const struct {
|
|||||||
{ AV_PIX_FMT_BGRA, MFX_FOURCC_RGB4 },
|
{ AV_PIX_FMT_BGRA, MFX_FOURCC_RGB4 },
|
||||||
{ AV_PIX_FMT_P010, MFX_FOURCC_P010 },
|
{ AV_PIX_FMT_P010, MFX_FOURCC_P010 },
|
||||||
{ AV_PIX_FMT_PAL8, MFX_FOURCC_P8 },
|
{ AV_PIX_FMT_PAL8, MFX_FOURCC_P8 },
|
||||||
|
#if CONFIG_VAAPI
|
||||||
|
{ AV_PIX_FMT_YUYV422,
|
||||||
|
MFX_FOURCC_YUY2 },
|
||||||
|
#if QSV_VERSION_ATLEAST(1, 27)
|
||||||
|
{ AV_PIX_FMT_Y210,
|
||||||
|
MFX_FOURCC_Y210 },
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
static uint32_t qsv_fourcc_from_pix_fmt(enum AVPixelFormat pix_fmt)
|
static uint32_t qsv_fourcc_from_pix_fmt(enum AVPixelFormat pix_fmt)
|
||||||
@ -773,7 +785,19 @@ static int map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface)
|
|||||||
surface->Data.R = frame->data[0] + 2;
|
surface->Data.R = frame->data[0] + 2;
|
||||||
surface->Data.A = frame->data[0] + 3;
|
surface->Data.A = frame->data[0] + 3;
|
||||||
break;
|
break;
|
||||||
|
#if CONFIG_VAAPI
|
||||||
|
case AV_PIX_FMT_YUYV422:
|
||||||
|
surface->Data.Y = frame->data[0];
|
||||||
|
surface->Data.U = frame->data[0] + 1;
|
||||||
|
surface->Data.V = frame->data[0] + 3;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case AV_PIX_FMT_Y210:
|
||||||
|
surface->Data.Y16 = (mfxU16 *)frame->data[0];
|
||||||
|
surface->Data.U16 = (mfxU16 *)frame->data[0] + 1;
|
||||||
|
surface->Data.V16 = (mfxU16 *)frame->data[0] + 3;
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
return MFX_ERR_UNSUPPORTED;
|
return MFX_ERR_UNSUPPORTED;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user