highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwcontext_cuda : Support YUV444P16 format

Browse Source 
Signed-off-by: Philip Langdale <philipl@overt.org>
This commit is contained in:
Yogender Gupta
2017-07-18 16:35:53 +05:30
committed by Philip Langdale
parent 2e8679373a
commit 3407d8118c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/hwcontext_cuda.c
View File

@@ -37,6 +37,7 @@ static const enum AVPixelFormat supported_formats[] = {
AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P,
AV_PIX_FMT_P010, AV_PIX_FMT_P010,
AV_PIX_FMT_P016, AV_PIX_FMT_P016,
AV_PIX_FMT_YUV444P16,
}; };
static int cuda_frames_get_constraints(AVHWDeviceContext *ctx, static int cuda_frames_get_constraints(AVHWDeviceContext *ctx,
@@ -142,6 +143,9 @@ static int cuda_frames_init(AVHWFramesContext *ctx)
case AV_PIX_FMT_P016: case AV_PIX_FMT_P016:
size = aligned_width * ctx->height * 3; size = aligned_width * ctx->height * 3;
break; break;
case AV_PIX_FMT_YUV444P16:
size = aligned_width * ctx->height * 6;
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;
@@ -161,7 +165,8 @@ static int cuda_get_buffer(AVHWFramesContext *ctx, AVFrame *frame)
int width_in_bytes = ctx->width; int width_in_bytes = ctx->width;
if (ctx->sw_format == AV_PIX_FMT_P010 || if (ctx->sw_format == AV_PIX_FMT_P010 ||
ctx->sw_format == AV_PIX_FMT_P016) { ctx->sw_format == AV_PIX_FMT_P016 ||
ctx->sw_format == AV_PIX_FMT_YUV444P16) {
width_in_bytes *= 2; width_in_bytes *= 2;
} }
aligned_width = FFALIGN(width_in_bytes, CUDA_FRAME_ALIGNMENT); aligned_width = FFALIGN(width_in_bytes, CUDA_FRAME_ALIGNMENT);
@@ -188,6 +193,7 @@ static int cuda_get_buffer(AVHWFramesContext *ctx, AVFrame *frame)
frame->linesize[2] = aligned_width / 2; frame->linesize[2] = aligned_width / 2;
break; break;
case AV_PIX_FMT_YUV444P: case AV_PIX_FMT_YUV444P:
case AV_PIX_FMT_YUV444P16:
frame->data[0] = frame->buf[0]->data; frame->data[0] = frame->buf[0]->data;
frame->data[1] = frame->data[0] + aligned_width * ctx->height; frame->data[1] = frame->data[0] + aligned_width * ctx->height;
frame->data[2] = frame->data[1] + aligned_width * ctx->height; frame->data[2] = frame->data[1] + aligned_width * ctx->height;

2
libavutil/version.h
View File

@@ -81,7 +81,7 @@
#define LIBAVUTIL_VERSION_MAJOR 55 #define LIBAVUTIL_VERSION_MAJOR 55
#define LIBAVUTIL_VERSION_MINOR 69 #define LIBAVUTIL_VERSION_MINOR 69
#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, \