Module: libav Branch: master Commit: 7bc780cd4413f688d3b834037b0f9ddfd6948140
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Wed Jan 13 14:17:54 2016 +0100 pixfmt: add a CUDA hwaccelled format --- doc/APIchanges | 1 + libavutil/pixdesc.c | 4 ++++ libavutil/pixfmt.h | 6 ++++++ 3 files changed, 11 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index e17f02c..d815d9f 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -19,6 +19,7 @@ API changes, most recent first: for handling hwaccel frames. xxxxxxx hwcontext_vdpau.h - Add a new installed header hwcontext_vdpau.h with VDPAU-specific hwcontext definitions. + xxxxxxx pixfmt.h - Add AV_PIX_FMT_CUDA. 2016-xx-xx - xxxxxxx - lavf 57.3.0 - avformat.h Add AVFormatContext.opaque, io_open and io_close, allowing custom IO diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 059bd62..9b948ed 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1577,6 +1577,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, + }, }; #if FF_API_PLUS1_MINUS1 FF_ENABLE_DEPRECATION_WARNINGS diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 4e0c0d3..f2c6c8d 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -217,6 +217,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_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
