virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avutil/hwcontext_cuda: add YUVA420P pixel format

Browse Source 
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
This commit is contained in:
Yaroslav Pogrebnyak 2020-03-19 13:08:20 +01:00 committed by Timo Rothenpieler
parent f5f6fbb6b2
commit 08d46cb586
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/hwcontext_cuda.c
View File

@ -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,
.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));

2
libavutil/version.h
View File

@ -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, \