avcodec/mfenc: add support for AV1 MF encoders

Min Chen committed 2 years ago

Commit 37842f21 parent 66682686 files · +7 −1Browse files

Unified · Split

6 files

configure +1 −0
libavcodec/allcodecs.c +1 −0
libavcodec/mf_utils.c +2 −0
libavcodec/mf_utils.h +1 −0
libavcodec/mfenc.c +1 −0
libavcodec/version.h +1 −1

configure+1−0

@@ -3347,6 +3347,7 @@ av1_cuvid_decoder_deps="cuvid CUVIDAV1PICPARAMS" · 3346 unmodified lines
3347	3347	av1_mediacodec_decoder_deps="mediacodec"
3348	3348	av1_mediacodec_encoder_deps="mediacodec"
3349	3349	av1_mediacodec_encoder_select="extract_extradata_bsf"
	3350	+av1_mf_encoder_deps="mediafoundation"
3350	3351	av1_nvenc_encoder_deps="nvenc NV_ENC_PIC_PARAMS_AV1"
3351	3352	av1_nvenc_encoder_select="atsc_a53"
3352	3353	av1_qsv_decoder_select="qsvdec"

libavcodec/allcodecs.c+1−0

@@ -838,6 +838,7 @@ extern const FFCodec ff_av1_nvenc_encoder; · 837 unmodified lines
838	838	extern const FFCodec ff_av1_qsv_decoder;
839	839	extern const FFCodec ff_av1_qsv_encoder;
840	840	extern const FFCodec ff_av1_amf_encoder;
	841	+extern const FFCodec ff_av1_mf_encoder;
841	842	extern const FFCodec ff_av1_vaapi_encoder;
842	843	extern const FFCodec ff_libopenh264_encoder;
843	844	extern const FFCodec ff_libopenh264_decoder;

libavcodec/mf_utils.c+2−0

@@ -240,6 +240,7 @@ static struct GUID_Entry guid_names[] = { · 239 unmodified lines
240	240	GUID_ENTRY(MFMediaType_Video),
241	241	GUID_ENTRY(MFAudioFormat_PCM),
242	242	GUID_ENTRY(MFAudioFormat_Float),
	243	+ GUID_ENTRY(ff_MFVideoFormat_AV1),
243	244	GUID_ENTRY(MFVideoFormat_H264),
244	245	GUID_ENTRY(MFVideoFormat_H264_ES),
245	246	GUID_ENTRY(ff_MFVideoFormat_HEVC),
@@ -507,6 +508,7 @@ void ff_media_type_dump(void log, IMFMediaType type) · 261 unmodified lines
507	508	const CLSID *ff_codec_to_mf_subtype(enum AVCodecID codec)
508	509	{
509	510	switch (codec) {
	511	+ case AV_CODEC_ID_AV1: return &ff_MFVideoFormat_AV1;
510	512	case AV_CODEC_ID_H264: return &MFVideoFormat_H264;
511	513	case AV_CODEC_ID_HEVC: return &ff_MFVideoFormat_HEVC;
512	514	case AV_CODEC_ID_AC3: return &MFAudioFormat_Dolby_AC3;

libavcodec/mf_utils.h+1−0

@@ -113,6 +113,7 @@ DEFINE_GUID(ff_MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT_PROGRESSIVE, 0xf5523a5, 0x1cb2, · 112 unmodified lines
113	113
114	114	DEFINE_MEDIATYPE_GUID(ff_MFVideoFormat_HEVC, 0x43564548); // FCC('HEVC')
115	115	DEFINE_MEDIATYPE_GUID(ff_MFVideoFormat_HEVC_ES, 0x53564548); // FCC('HEVS')
	116	+DEFINE_MEDIATYPE_GUID(ff_MFVideoFormat_AV1, 0x31305641); // FCC('AV01')
116	117
117	118
118	119	// This enum is missing from mingw-w64's codecapi.h by v7.0.0.

libavcodec/mfenc.c+1−0

@@ -1315,3 +1315,4 @@ static const FFCodecDefault defaults[] = { · 1314 unmodified lines
1315	1315
1316	1316	MF_ENCODER(VIDEO, h264, H264, venc_opts, VFMTS, VCAPS, defaults);
1317	1317	MF_ENCODER(VIDEO, hevc, HEVC, venc_opts, VFMTS, VCAPS, defaults);
	1318	+MF_ENCODER(VIDEO, av1, AV1, venc_opts, VFMTS, VCAPS, defaults);

libavcodec/version.h+1−1

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	29
30	30	#include "version_major.h"
31	31
32		−#define LIBAVCODEC_VERSION_MINOR 21
	32	+#define LIBAVCODEC_VERSION_MINOR 22
33	33	#define LIBAVCODEC_VERSION_MICRO 100
34	34
35	35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \