Commit 63c3e353 authored by Derek Buitenhuis's avatar Derek Buitenhuis

Merge commit '7bc780cd'

* commit '7bc780cd':
  pixfmt: add a CUDA hwaccelled format
Merged-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parents 9f2c1c77 7bc780cd
...@@ -27,6 +27,7 @@ API changes, most recent first: ...@@ -27,6 +27,7 @@ API changes, most recent first:
for handling hwaccel frames. for handling hwaccel frames.
xxxxxxx hwcontext_vdpau.h - Add a new installed header hwcontext_vdpau.h with xxxxxxx hwcontext_vdpau.h - Add a new installed header hwcontext_vdpau.h with
VDPAU-specific hwcontext definitions. VDPAU-specific hwcontext definitions.
xxxxxxx pixfmt.h - Add AV_PIX_FMT_CUDA.
-------- 8< --------- FFmpeg 3.0 was cut here -------- 8< --------- -------- 8< --------- FFmpeg 3.0 was cut here -------- 8< ---------
......
...@@ -1978,6 +1978,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { ...@@ -1978,6 +1978,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.name = "mmal", .name = "mmal",
.flags = AV_PIX_FMT_FLAG_HWACCEL, .flags = AV_PIX_FMT_FLAG_HWACCEL,
}, },
[AV_PIX_FMT_CUDA] = {
.name = "cuda",
.flags = AV_PIX_FMT_FLAG_HWACCEL,
},
[AV_PIX_FMT_AYUV64LE] = { [AV_PIX_FMT_AYUV64LE] = {
.name = "ayuv64le", .name = "ayuv64le",
.nb_components = 4, .nb_components = 4,
......
...@@ -242,6 +242,12 @@ enum AVPixelFormat { ...@@ -242,6 +242,12 @@ enum AVPixelFormat {
AV_PIX_FMT_D3D11VA_VLD, ///< HW decoding through Direct3D11, Picture.data[3] contains a ID3D11VideoDecoderOutputView pointer 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_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_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 AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, XBGRXBGR... X=unused/undefined
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment