diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2017-11-11 21:19:07 +0100 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2017-11-13 20:33:10 +0100 |
| commit | f3f73f0893e2bddd80897148d21cdf3e8e4d8492 (patch) | |
| tree | b6f082abccff0f63dccc0cb61675017a188156ac /libavcodec/vp9.c | |
| parent | 52bf0febb3a8a47b16ac6c3bfd707c347299f174 (diff) | |
| download | ffmpeg-f3f73f0893e2bddd80897148d21cdf3e8e4d8492.tar.gz | |
avcodec: implement vp9 nvdec hwaccel
Diffstat (limited to 'libavcodec/vp9.c')
| -rw-r--r-- | libavcodec/vp9.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 6b5de19266..6ce9be61bb 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -169,7 +169,10 @@ fail: static int update_size(AVCodecContext *avctx, int w, int h) { -#define HWACCEL_MAX (CONFIG_VP9_DXVA2_HWACCEL + CONFIG_VP9_D3D11VA_HWACCEL * 2 + CONFIG_VP9_VAAPI_HWACCEL) +#define HWACCEL_MAX (CONFIG_VP9_DXVA2_HWACCEL + \ + CONFIG_VP9_D3D11VA_HWACCEL * 2 + \ + CONFIG_VP9_NVDEC_HWACCEL + \ + CONFIG_VP9_VAAPI_HWACCEL) enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmtp = pix_fmts; VP9Context *s = avctx->priv_data; uint8_t *p; @@ -191,12 +194,18 @@ static int update_size(AVCodecContext *avctx, int w, int h) *fmtp++ = AV_PIX_FMT_D3D11VA_VLD; *fmtp++ = AV_PIX_FMT_D3D11; #endif +#if CONFIG_VP9_NVDEC_HWACCEL + *fmtp++ = AV_PIX_FMT_CUDA; +#endif #if CONFIG_VP9_VAAPI_HWACCEL *fmtp++ = AV_PIX_FMT_VAAPI; #endif break; case AV_PIX_FMT_YUV420P10: case AV_PIX_FMT_YUV420P12: +#if CONFIG_VP9_NVDEC_HWACCEL + *fmtp++ = AV_PIX_FMT_CUDA; +#endif #if CONFIG_VP9_VAAPI_HWACCEL *fmtp++ = AV_PIX_FMT_VAAPI; #endif |