Merge commit '7bc780cd4413f688d3b834037b0f9ddfd6948140'

* commit '7bc780cd4413f688d3b834037b0f9ddfd6948140': pixfmt: add a CUDA hwaccelled format

Derek Buitenhuis committed 10 years ago

Commit 63c3e352 parents 9f2c1c7 7bc780c3 files · +11 −0Browse files

Unified · Split

3 files

doc/APIchanges +1 −0
libavutil/pixdesc.c +4 −0
libavutil/pixfmt.h +6 −0

doc/APIchanges+1−0

@@ -27,6 +27,7 @@ API changes, most recent first: · 26 unmodified lines
27	27	for handling hwaccel frames.
28	28	xxxxxxx hwcontext_vdpau.h - Add a new installed header hwcontext_vdpau.h with
29	29	VDPAU-specific hwcontext definitions.
	30	+ xxxxxxx pixfmt.h - Add AV_PIX_FMT_CUDA.
30	31
31	32	-------- 8< --------- FFmpeg 3.0 was cut here -------- 8< ---------
32	33

libavutil/pixdesc.c+4−0

@@ -1978,6 +1978,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 1977 unmodified lines
1978	1978	.name = "mmal",
1979	1979	.flags = AV_PIX_FMT_FLAG_HWACCEL,
1980	1980	},
	1981	+ [AV_PIX_FMT_CUDA] = {
	1982	+ .name = "cuda",
	1983	+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
	1984	+ },
1981	1985	[AV_PIX_FMT_AYUV64LE] = {
1982	1986	.name = "ayuv64le",
1983	1987	.nb_components = 4,

libavutil/pixfmt.h+6−0

@@ -242,6 +242,12 @@ enum AVPixelFormat { · 241 unmodified lines
242	242
243	243	AV_PIX_FMT_D3D11VA_VLD, ///< HW decoding through Direct3D11, Picture.data[3] contains a ID3D11VideoDecoderOutputView pointer
244	244
	245	+ /**
	246	+ * HW acceleration through CUDA. data[i] contain CUdeviceptr pointers
	247	+ * exactly as for system memory frames.
	248	+ */
	249	+ AV_PIX_FMT_CUDA,
	250	+
245	251	AV_PIX_FMT_0RGB=0x123+4,///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined
246	252	AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGBXRGBX... X=unused/undefined
247	253	AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, XBGRXBGR... X=unused/undefined