Skip to content

F
ffmpeg
Commit 08d46cb5 authored by Yaroslav Pogrebnyak's avatar Yaroslav Pogrebnyak Committed by Timo Rothenpieler
Browse files
Options

avutil/hwcontext_cuda: add YUVA420P pixel format 

Signed-off-by: 's avatarTimo Rothenpieler <timo@rothenpieler.org>
parent f5f6fbb6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
libavutil/hwcontext_cuda.c
View file @ 08d46cb5
...@@ -39,6 +39,7 @@ typedef struct CUDAFramesContext { ...@@ -39,6 +39,7 @@ typedef struct CUDAFramesContext {
static const enum AVPixelFormat supported_formats[] = { static const enum AVPixelFormat supported_formats[] = {
AV_PIX_FMT_NV12, AV_PIX_FMT_NV12,
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P,
AV_PIX_FMT_YUVA420P,
AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P,
AV_PIX_FMT_P010, AV_PIX_FMT_P010,
AV_PIX_FMT_P016, AV_PIX_FMT_P016,
...@@ -274,7 +275,7 @@ static int cuda_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, ...@@ -274,7 +275,7 @@ static int cuda_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,
.srcPitch = src->linesize[i], .srcPitch = src->linesize[i],
.dstPitch = dst->linesize[i], .dstPitch = dst->linesize[i],
.WidthInBytes = FFMIN(src->linesize[i], dst->linesize[i]), .WidthInBytes = FFMIN(src->linesize[i], dst->linesize[i]),
.Height = src->height >> (i ? priv->shift_height : 0), .Height = src->height >> ((i == 0 || i == 3) ? 0 : priv->shift_height),
}; };
ret = CHECK_CU(cu->cuMemcpy2DAsync(&cpy, hwctx->stream)); ret = CHECK_CU(cu->cuMemcpy2DAsync(&cpy, hwctx->stream));
......
libavutil/version.h
View file @ 08d46cb5
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
#define LIBAVUTIL_VERSION_MAJOR 56 #define LIBAVUTIL_VERSION_MAJOR 56
#define LIBAVUTIL_VERSION_MINOR 42 #define LIBAVUTIL_VERSION_MINOR 42
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 101
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \ LIBAVUTIL_VERSION_MINOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment