diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index d423d2611b..292015d18a 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -333,6 +333,7 @@ static int CUDAAPI cuvid_handle_video_sequence(void *opaque, CUVIDEOFORMAT* form cuinfo.OutputFormat = cudaVideoSurfaceFormat_NV12; break; case AV_PIX_FMT_P010: + case AV_PIX_FMT_P012: case AV_PIX_FMT_P016: cuinfo.OutputFormat = cudaVideoSurfaceFormat_P016; break; @@ -340,6 +341,8 @@ static int CUDAAPI cuvid_handle_video_sequence(void *opaque, CUVIDEOFORMAT* form case AV_PIX_FMT_NV16: cuinfo.OutputFormat = cudaVideoSurfaceFormat_NV16; break; + case AV_PIX_FMT_P210: + case AV_PIX_FMT_P212: case AV_PIX_FMT_P216: cuinfo.OutputFormat = cudaVideoSurfaceFormat_P216; break; @@ -347,6 +350,8 @@ static int CUDAAPI cuvid_handle_video_sequence(void *opaque, CUVIDEOFORMAT* form case AV_PIX_FMT_YUV444P: cuinfo.OutputFormat = cudaVideoSurfaceFormat_YUV444; break; + case AV_PIX_FMT_YUV444P10MSB: + case AV_PIX_FMT_YUV444P12MSB: case AV_PIX_FMT_YUV444P16: cuinfo.OutputFormat = cudaVideoSurfaceFormat_YUV444_16Bit; break; @@ -632,12 +637,17 @@ static int cuvid_output_frame(AVCodecContext *avctx, AVFrame *frame) } } else if (avctx->pix_fmt == AV_PIX_FMT_NV12 || avctx->pix_fmt == AV_PIX_FMT_P010 || + avctx->pix_fmt == AV_PIX_FMT_P012 || avctx->pix_fmt == AV_PIX_FMT_P016 || #ifdef NVDEC_HAVE_422_SUPPORT avctx->pix_fmt == AV_PIX_FMT_NV16 || + avctx->pix_fmt == AV_PIX_FMT_P210 || + avctx->pix_fmt == AV_PIX_FMT_P212 || avctx->pix_fmt == AV_PIX_FMT_P216 || #endif avctx->pix_fmt == AV_PIX_FMT_YUV444P || + avctx->pix_fmt == AV_PIX_FMT_YUV444P10MSB || + avctx->pix_fmt == AV_PIX_FMT_YUV444P12MSB || avctx->pix_fmt == AV_PIX_FMT_YUV444P16) { unsigned int offset = 0; AVFrame *tmp_frame = av_frame_alloc();