From 1b2471039b23f4edd3b37899b3edd1ae40c01315 Mon Sep 17 00:00:00 2001
From: Marton Balint <cus@passwd.hu>
Date: Mon, 14 May 2018 23:24:43 +0200
Subject: [PATCH] avutil/hwcontext_cuda: fix YUV420P cuda_get_buffer
Regression since ece068a771ac3f725e854c681ecbef08e792addc.
Signed-off-by: Marton Balint <cus@passwd.hu>
---
libavutil/hwcontext_cuda.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c
index cb5d15c9d9c..3b1d53e7995 100644
--- a/libavutil/hwcontext_cuda.c
+++ b/libavutil/hwcontext_cuda.c
@@ -159,10 +159,11 @@ static int cuda_get_buffer(AVHWFramesContext *ctx, AVFrame *frame)
return res;
// YUV420P is a special case.
- // Nvenc expects the U/V planes in swapped order from how ffmpeg expects them.
+ // Nvenc expects the U/V planes in swapped order from how ffmpeg expects them, also chroma is half-aligned
if (ctx->sw_format == AV_PIX_FMT_YUV420P) {
- FFSWAP(uint8_t*, frame->data[1], frame->data[2]);
- FFSWAP(int, frame->linesize[1], frame->linesize[2]);
+ frame->linesize[1] = frame->linesize[2] = frame->linesize[0] / 2;
+ frame->data[2] = frame->data[1];
+ frame->data[1] = frame->data[2] + frame->linesize[2] * ctx->height / 2;
}
frame->format = AV_PIX_FMT_CUDA;
--
GitLab