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

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

         .name = "mmal",
         .flags = AV_PIX_FMT_FLAG_HWACCEL,
     },
+    [AV_PIX_FMT_CUDA] = {
+        .name = "cuda",
+        .flags = AV_PIX_FMT_FLAG_HWACCEL,
+    },
     [AV_PIX_FMT_AYUV64LE] = {
         .name = "ayuv64le",
         .nb_components = 4,

     AV_PIX_FMT_D3D11VA_VLD,  ///< HW decoding through Direct3D11, Picture.data[3] contains a ID3D11VideoDecoderOutputView pointer
+    /**
+     * HW acceleration through CUDA. data[i] contain CUdeviceptr pointers
+     * exactly as for system memory frames.
+     */
+    AV_PIX_FMT_CUDA,
     AV_PIX_FMT_0RGB=0x123+4,///< packed RGB 8:8:8, 32bpp, XRGBXRGB...   X=unused/undefined
     AV_PIX_FMT_RGB0,        ///< packed RGB 8:8:8, 32bpp, RGBXRGBX...   X=unused/undefined
     AV_PIX_FMT_0BGR,        ///< packed BGR 8:8:8, 32bpp, XBGRXBGR...   X=unused/undefined

Keyboard shortcuts