diff mbox series

[FFmpeg-devel,v2] libavcodec/qsvenc: Do not pass RGB solorspace to VPL/MSDK

Message ID 20230213084926.543371-1-wenbin.chen@intel.com
State Accepted
Commit e530d38bbf5f58e3e22f87dff635a50e267abb77
Headers show
Series [FFmpeg-devel,v2] libavcodec/qsvenc: Do not pass RGB solorspace to VPL/MSDK | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Chen, Wenbin Feb. 13, 2023, 8:49 a.m. UTC 
From: Wenbin Chen <wenbin.chen@intel.com>

When encode RGB frame, Intel driver convert RGB to YUV, so we cannot
set RGB colorspace to VPL/MSDK.

Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
---
 libavcodec/qsvenc.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Xiang, Haihao Feb. 16, 2023, 1:23 a.m. UTC | #1 
On Ma, 2023-02-13 at 16:49 +0800, wenbin.chen-at-intel.com@ffmpeg.org wrote:
> From: Wenbin Chen <wenbin.chen@intel.com>
> 
> When encode RGB frame, Intel driver convert RGB to YUV, so we cannot
> set RGB colorspace to VPL/MSDK.
> 
> Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
> ---
>  libavcodec/qsvenc.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
> index 2f0e94a914..d3f7532fc0 100644
> --- a/libavcodec/qsvenc.c
> +++ b/libavcodec/qsvenc.c
> @@ -1185,7 +1185,12 @@ static int init_video_param(AVCodecContext *avctx,
> QSVEncContext *q)
>          q->extvsi.ColourDescriptionPresent = 1;
>          q->extvsi.ColourPrimaries = avctx->color_primaries;
>          q->extvsi.TransferCharacteristics = avctx->color_trc;
> -        q->extvsi.MatrixCoefficients = avctx->colorspace;
> +        if (avctx->colorspace == AVCOL_SPC_RGB)
> +            // RGB will be converted to YUV, so RGB colorspace is not
> supported
> +            q->extvsi.MatrixCoefficients = AVCOL_SPC_UNSPECIFIED;
> +        else
> +            q->extvsi.MatrixCoefficients = avctx->colorspace;
> +
>      }
>  
>      if ((avctx->codec_id != AV_CODEC_ID_VP9) && (q->extvsi.VideoFullRange ||
> q->extvsi.ColourDescriptionPresent)) {

LGTM, will apply

Thanks
Haihao
diff mbox series

Patch

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 2f0e94a914..d3f7532fc0 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -1185,7 +1185,12 @@  static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
         q->extvsi.ColourDescriptionPresent = 1;
         q->extvsi.ColourPrimaries = avctx->color_primaries;
         q->extvsi.TransferCharacteristics = avctx->color_trc;
-        q->extvsi.MatrixCoefficients = avctx->colorspace;
+        if (avctx->colorspace == AVCOL_SPC_RGB)
+            // RGB will be converted to YUV, so RGB colorspace is not supported
+            q->extvsi.MatrixCoefficients = AVCOL_SPC_UNSPECIFIED;
+        else
+            q->extvsi.MatrixCoefficients = avctx->colorspace;
+
     }
 
     if ((avctx->codec_id != AV_CODEC_ID_VP9) && (q->extvsi.VideoFullRange || q->extvsi.ColourDescriptionPresent)) {