virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avutil/hwcontext_cuda: add support for nvenc rgb formats

Browse Source
This commit is contained in:
Timo Rothenpieler 2018-05-09 18:59:05 +02:00
parent 93d1756af2
commit 41a18982d0
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavutil/hwcontext_cuda.c
View File

@ -38,6 +38,8 @@ static const enum AVPixelFormat supported_formats[] = {
AV_PIX_FMT_P010, AV_PIX_FMT_P010,
AV_PIX_FMT_P016, AV_PIX_FMT_P016,
AV_PIX_FMT_YUV444P16, AV_PIX_FMT_YUV444P16,
AV_PIX_FMT_0RGB32,
AV_PIX_FMT_0BGR32,
}; };
static int cuda_frames_get_constraints(AVHWDeviceContext *ctx, static int cuda_frames_get_constraints(AVHWDeviceContext *ctx,
@ -146,6 +148,10 @@ static int cuda_frames_init(AVHWFramesContext *ctx)
case AV_PIX_FMT_YUV444P16: case AV_PIX_FMT_YUV444P16:
size = aligned_width * ctx->height * 6; size = aligned_width * ctx->height * 6;
break; break;
case AV_PIX_FMT_0RGB32:
case AV_PIX_FMT_0BGR32:
size = aligned_width * ctx->height * 4;
break;
default: default:
av_log(ctx, AV_LOG_ERROR, "BUG: Pixel format missing from size calculation."); av_log(ctx, AV_LOG_ERROR, "BUG: Pixel format missing from size calculation.");
return AVERROR_BUG; return AVERROR_BUG;
@ -201,6 +207,11 @@ static int cuda_get_buffer(AVHWFramesContext *ctx, AVFrame *frame)
frame->linesize[1] = aligned_width; frame->linesize[1] = aligned_width;
frame->linesize[2] = aligned_width; frame->linesize[2] = aligned_width;
break; break;
case AV_PIX_FMT_0BGR32:
case AV_PIX_FMT_0RGB32:
frame->data[0] = frame->buf[0]->data;
frame->linesize[0] = aligned_width * 4;
break;
default: default:
av_frame_unref(frame); av_frame_unref(frame);
return AVERROR_BUG; return AVERROR_BUG;

2
libavutil/version.h
View File

@ -80,7 +80,7 @@
#define LIBAVUTIL_VERSION_MAJOR 56 #define LIBAVUTIL_VERSION_MAJOR 56
#define LIBAVUTIL_VERSION_MINOR 18 #define LIBAVUTIL_VERSION_MINOR 18
#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_MICRO 102
#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, \