diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-02-07 12:14:45 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-02-19 15:07:21 +0100 |
| commit | 5b1d9ceec715846a58fe029bc3889ed6fa62436a (patch) | |
| tree | 56d75771ad67337574694f94b3b0b176ced5ffec | |
| parent | 0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5 (diff) | |
| download | ffmpeg-5b1d9ceec715846a58fe029bc3889ed6fa62436a.tar.gz | |
pixfmt: add a pixel format for QSV hwaccel
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavutil/pixdesc.c | 4 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 5 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 0c6e275534..18e8d5e46c 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2014-08-09 API changes, most recent first: +2015-xx-xx - xxxxxxx - lavu 54.9.0 + Add AV_PIX_FMT_QSV for QSV hardware acceleration. + 2015-01-27 - 728685f - lavc 56.12.0, lavu 54.8.0 - avcodec.h, frame.h Add AV_PKT_DATA_AUDIO_SERVICE_TYPE and AV_FRAME_DATA_AUDIO_SERVICE_TYPE for storing the audio service type as side data. diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index a9ccfbe8e6..bd72c048f3 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1560,6 +1560,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .name = "vda", .flags = AV_PIX_FMT_FLAG_HWACCEL, }, + [AV_PIX_FMT_QSV] = { + .name = "qsv", + .flags = AV_PIX_FMT_FLAG_HWACCEL, + }, }; static const char *color_range_names[AVCOL_RANGE_NB] = { diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index e507425150..4763583868 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -209,6 +209,11 @@ enum AVPixelFormat { AV_PIX_FMT_GBRAP, ///< planar GBRA 4:4:4:4 32bpp AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian AV_PIX_FMT_GBRAP16LE, ///< planar GBRA 4:4:4:4 64bpp, little-endian + /** + * HW acceleration through QSV, data[3] contains a pointer to the + * mfxFrameSurface1 structure. + */ + AV_PIX_FMT_QSV, 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 diff --git a/libavutil/version.h b/libavutil/version.h index 7a7d054077..77595a8e54 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -54,7 +54,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 8 +#define LIBAVUTIL_VERSION_MINOR 9 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |