diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 15:11:06 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 15:11:06 +0000 |
| commit | 63c3e35332838fca19b7ffdae13233b0f3759402 (patch) | |
| tree | 020d2f04eb2de6bf54a52770a954bc5873462f2f /libavutil | |
| parent | 9f2c1c77d2098168761421febbbdb0abf0fd6cce (diff) | |
| parent | 7bc780cd4413f688d3b834037b0f9ddfd6948140 (diff) | |
| download | ffmpeg-63c3e35332838fca19b7ffdae13233b0f3759402.tar.gz | |
Merge commit '7bc780cd4413f688d3b834037b0f9ddfd6948140'
* commit '7bc780cd4413f688d3b834037b0f9ddfd6948140':
pixfmt: add a CUDA hwaccelled format
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/pixdesc.c | 4 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index b14c963325..981fa0e16a 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1978,6 +1978,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 7d2eac0ebe..3587d9671b 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -242,6 +242,12 @@ enum AVPixelFormat { 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 |