aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManojGuptaBonda <mbonda@nvidia.com>2019-04-26 09:43:36 +0530
committerPhilip Langdale <philipl@overt.org>2019-05-05 11:35:35 -0700
commitd7d82cfcd4394fde5f9b53ab0251ce1b55b674a7 (patch)
treed710fcfaa2ea0e1c5064ed3c92aba88bd648cac8
parentfc8fb88f10efe7e15c08c12c8895d36cfc92316d (diff)
downloadffmpeg-d7d82cfcd4394fde5f9b53ab0251ce1b55b674a7.tar.gz
avcodec/hevcdec: Declare that VDPAU can handle HEVC 4:4:4 content
The latest generation video decoder on the Turing chips supports decoding HEVC 4:4:4. This change adds AV_PIX_FMT_VDPAU as a valid format for HEVC 4:4:4 8 bit.
-rw-r--r--Changelog1
-rw-r--r--libavcodec/hevcdec.c9
-rw-r--r--libavcodec/version.h2
3 files changed, 10 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index a3fa0c14a2..a1236bde34 100644
--- a/Changelog
+++ b/Changelog
@@ -26,6 +26,7 @@ version <next>:
- lscr decoder
- lagfun filter
- asoftclip filter
+- Support decoding of HEVC 4:4:4 content in vdpau
version 4.1:
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index 857c10dd12..515b346535 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -408,8 +408,15 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps)
*fmt++ = AV_PIX_FMT_CUDA;
#endif
break;
- case AV_PIX_FMT_YUV420P12:
case AV_PIX_FMT_YUV444P:
+#if CONFIG_HEVC_VDPAU_HWACCEL
+ *fmt++ = AV_PIX_FMT_VDPAU;
+#endif
+#if CONFIG_HEVC_NVDEC_HWACCEL
+ *fmt++ = AV_PIX_FMT_CUDA;
+#endif
+ break;
+ case AV_PIX_FMT_YUV420P12:
case AV_PIX_FMT_YUV444P10:
case AV_PIX_FMT_YUV444P12:
#if CONFIG_HEVC_NVDEC_HWACCEL
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 195e21bfbe..d11beb7885 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 52
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \