avcodec/cuviddec: add av1 support

Roman Arzumanyan committed 6 years ago

Commit b23e6ae1 parent b7f51424 files · +16 −1Browse files

Unified · Split

4 files

@@ -3052,6 +3052,7 @@ nvenc_encoder_deps="nvenc" · 3051 unmodified lines
3052	3052
3053	3053	aac_mf_encoder_deps="mediafoundation"
3054	3054	ac3_mf_encoder_deps="mediafoundation"
	3055	+av1_cuvid_decoder_deps="cuvid"
3055	3056	h263_v4l2m2m_decoder_deps="v4l2_m2m h263_v4l2_m2m"
3056	3057	h263_v4l2m2m_encoder_deps="v4l2_m2m h263_v4l2_m2m"
3057	3058	h264_amf_encoder_deps="amf"

@@ -769,6 +769,7 @@ extern AVCodec ff_idf_decoder; · 768 unmodified lines
769	769	* above is available */
770	770	extern AVCodec ff_aac_mf_encoder;
771	771	extern AVCodec ff_ac3_mf_encoder;
	772	+extern AVCodec ff_av1_cuvid_decoder;
772	773	extern AVCodec ff_h263_v4l2m2m_encoder;
773	774	extern AVCodec ff_libaom_av1_decoder;
774	775	/* hwaccel hooks only, so prefer external decoders */

@@ -42,6 +42,10 @@ · 41 unmodified lines
42	42	#define cudaVideoSurfaceFormat_YUV444_16Bit 3
43	43	#endif
44	44
	45	+#if NVDECAPI_CHECK_VERSION(11, 0)
	46	+#define CUVID_HAS_AV1_SUPPORT
	47	+#endif
	48	+
45	49	typedef struct CuvidContext
46	50	{
47	51	AVClass *avclass;
@@ -939,6 +943,11 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) · 891 unmodified lines
939	943	case AV_CODEC_ID_VC1:
940	944	ctx->cuparseinfo.CodecType = cudaVideoCodec_VC1;
941	945	break;
	946	+#endif
	947	+#if CONFIG_AV1_CUVID_DECODER && defined(CUVID_HAS_AV1_SUPPORT)
	948	+ case AV_CODEC_ID_AV1:
	949	+ ctx->cuparseinfo.CodecType = cudaVideoCodec_AV1;
	950	+ break;
942	951	#endif
943	952	default:
944	953	av_log(avctx, AV_LOG_ERROR, "Invalid CUVID codec!\n");
@@ -1134,6 +1143,10 @@ static const AVCodecHWConfigInternal *cuvid_hw_configs[] = { · 189 unmodified lines
1134	1143	.wrapper_name = "cuvid", \
1135	1144	};
1136	1145
	1146	+#if CONFIG_AV1_CUVID_DECODER && defined(CUVID_HAS_AV1_SUPPORT)
	1147	+DEFINE_CUVID_CODEC(av1, AV1, NULL)
	1148	+#endif
	1149	+
1137	1150	#if CONFIG_HEVC_CUVID_DECODER
1138	1151	DEFINE_CUVID_CODEC(hevc, HEVC, "hevc_mp4toannexb")
1139	1152	#endif

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	29
30	30	#define LIBAVCODEC_VERSION_MAJOR 58
31	31	#define LIBAVCODEC_VERSION_MINOR 111
32		−#define LIBAVCODEC_VERSION_MICRO 100
	32	+#define LIBAVCODEC_VERSION_MICRO 101
33	33
34	34	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
35	35	LIBAVCODEC_VERSION_MINOR, \

Keyboard shortcuts