diff mbox series

[FFmpeg-devel,v1] lavc/vaapi_hevc: fill rext luma/chroma offset in the right way

Message ID 20220601145822.2588517-1-fei.w.wang@intel.com
State New
Headers show
Series [FFmpeg-devel,v1] lavc/vaapi_hevc: fill rext luma/chroma offset in the right way | expand

Checks

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

Commit Message

Wang, Fei W June 1, 2022, 2:58 p.m. UTC 
From: Xu Guangxin <guangxin.xu@intel.com>

For range extension, the luma/chroma offset is larger than 8 bits, we
need fill the 16 bits version.

Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
Signed-off-by: Linjie Fu <linjie.justin.fu@gmail.com>
Signed-off-by: Fei Wang <fei.w.wang@intel.com>
---
 libavcodec/vaapi_hevc.c | 53 ++++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 16 deletions(-)

Comments

Xiang, Haihao June 10, 2022, 3:48 a.m. UTC | #1 
On Wed, 2022-06-01 at 22:58 +0800, Fei Wang wrote:
> From: Xu Guangxin <guangxin.xu@intel.com>
> 
> For range extension, the luma/chroma offset is larger than 8 bits, we
> need fill the 16 bits version.
> 
> Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
> Signed-off-by: Linjie Fu <linjie.justin.fu@gmail.com>
> Signed-off-by: Fei Wang <fei.w.wang@intel.com>
> ---
>  libavcodec/vaapi_hevc.c | 53 ++++++++++++++++++++++++++++-------------
>  1 file changed, 37 insertions(+), 16 deletions(-)
> 
> diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c
> index 9083331c45..59beb86650 100644
> --- a/libavcodec/vaapi_hevc.c
> +++ b/libavcodec/vaapi_hevc.c
> @@ -322,10 +322,17 @@ fail:
>      return ret;
>  }
>  
> -static void fill_pred_weight_table(const HEVCContext *h,
> +static void fill_pred_weight_table(const AVCodecContext *avctx,
> +                                   const HEVCContext *h,
>                                     const SliceHeader *sh,
>                                     VASliceParameterBufferHEVC *slice_param)
>  {
> +#if VA_CHECK_VERSION(1, 2, 0)
> +    int is_rext = avctx->profile >= FF_PROFILE_HEVC_REXT;
> +#else
> +    int is_rext = 0;

It will uses the wrong luma/offset for REXT stream when vaapi < 1.2 , right ? I
think it would be better to add some warning text to remind user. 

Thanks
Haihao


> +#endif
> +
>      int i;
>  
>      memset(slice_param->delta_luma_weight_l0,   0, sizeof(slice_param-
> >delta_luma_weight_l0));
> @@ -353,21 +360,25 @@ static void fill_pred_weight_table(const HEVCContext *h,
>  
>      for (i = 0; i < 15 && i < sh->nb_refs[L0]; i++) {
>          slice_param->delta_luma_weight_l0[i] = sh->luma_weight_l0[i] - (1 <<
> sh->luma_log2_weight_denom);
> -        slice_param->luma_offset_l0[i] = sh->luma_offset_l0[i];
>          slice_param->delta_chroma_weight_l0[i][0] = sh-
> >chroma_weight_l0[i][0] - (1 << sh->chroma_log2_weight_denom);
>          slice_param->delta_chroma_weight_l0[i][1] = sh-
> >chroma_weight_l0[i][1] - (1 << sh->chroma_log2_weight_denom);
> -        slice_param->ChromaOffsetL0[i][0] = sh->chroma_offset_l0[i][0];
> -        slice_param->ChromaOffsetL0[i][1] = sh->chroma_offset_l0[i][1];
> +        if (!is_rext) {
> +            slice_param->luma_offset_l0[i] = sh->luma_offset_l0[i];
> +            slice_param->ChromaOffsetL0[i][0] = sh->chroma_offset_l0[i][0];
> +            slice_param->ChromaOffsetL0[i][1] = sh->chroma_offset_l0[i][1];
> +        }
>      }
>  
>      if (sh->slice_type == HEVC_SLICE_B) {
>          for (i = 0; i < 15 && i < sh->nb_refs[L1]; i++) {
>              slice_param->delta_luma_weight_l1[i] = sh->luma_weight_l1[i] - (1
> << sh->luma_log2_weight_denom);
> -            slice_param->luma_offset_l1[i] = sh->luma_offset_l1[i];
>              slice_param->delta_chroma_weight_l1[i][0] = sh-
> >chroma_weight_l1[i][0] - (1 << sh->chroma_log2_weight_denom);
>              slice_param->delta_chroma_weight_l1[i][1] = sh-
> >chroma_weight_l1[i][1] - (1 << sh->chroma_log2_weight_denom);
> -            slice_param->ChromaOffsetL1[i][0] = sh->chroma_offset_l1[i][0];
> -            slice_param->ChromaOffsetL1[i][1] = sh->chroma_offset_l1[i][1];
> +            if (!is_rext) {
> +                slice_param->luma_offset_l1[i] = sh->luma_offset_l1[i];
> +                slice_param->ChromaOffsetL1[i][0] = sh-
> >chroma_offset_l1[i][0];
> +                slice_param->ChromaOffsetL1[i][1] = sh-
> >chroma_offset_l1[i][1];
> +            }
>          }
>      }
>  }
> @@ -462,7 +473,7 @@ static int vaapi_hevc_decode_slice(AVCodecContext *avctx,
>              last_slice_param->RefPicList[list_idx][i] = get_ref_pic_index(h,
> rpl->ref[i]);
>      }
>  
> -    fill_pred_weight_table(h, sh, last_slice_param);
> +    fill_pred_weight_table(avctx, h, sh, last_slice_param);
>  
>  #if VA_CHECK_VERSION(1, 2, 0)
>      if (avctx->profile == FF_PROFILE_HEVC_REXT) {
> @@ -471,15 +482,25 @@ static int vaapi_hevc_decode_slice(AVCodecContext
> *avctx,
>                  .cu_chroma_qp_offset_enabled_flag = sh-
> >cu_chroma_qp_offset_enabled_flag,
>              },
>          };
> +        for (i = 0; i < 15 && i < sh->nb_refs[L0]; i++) {
> +            pic->last_slice_param.rext.luma_offset_l0[i] = sh-
> >luma_offset_l0[i];
> +            pic->last_slice_param.rext.ChromaOffsetL0[i][0] = sh-
> >chroma_offset_l0[i][0];
> +            pic->last_slice_param.rext.ChromaOffsetL0[i][1] = sh-
> >chroma_offset_l0[i][1];
> +        }
> +
> +        for (i = 0; i < 15 && i < sh->nb_refs[L0]; i++) {
> +            pic->last_slice_param.rext.luma_offset_l0[i] = sh-
> >luma_offset_l0[i];
> +            pic->last_slice_param.rext.ChromaOffsetL0[i][0] = sh-
> >chroma_offset_l0[i][0];
> +            pic->last_slice_param.rext.ChromaOffsetL0[i][1] = sh-
> >chroma_offset_l0[i][1];
> +        }
>  
> -        memcpy(pic->last_slice_param.rext.luma_offset_l0, pic-
> >last_slice_param.base.luma_offset_l0,
> -                                                    sizeof(pic-
> >last_slice_param.base.luma_offset_l0));
> -        memcpy(pic->last_slice_param.rext.luma_offset_l1, pic-
> >last_slice_param.base.luma_offset_l1,
> -                                                    sizeof(pic-
> >last_slice_param.base.luma_offset_l1));
> -        memcpy(pic->last_slice_param.rext.ChromaOffsetL0, pic-
> >last_slice_param.base.ChromaOffsetL0,
> -                                                    sizeof(pic-
> >last_slice_param.base.ChromaOffsetL0));
> -        memcpy(pic->last_slice_param.rext.ChromaOffsetL1, pic-
> >last_slice_param.base.ChromaOffsetL1,
> -                                                    sizeof(pic-
> >last_slice_param.base.ChromaOffsetL1));
> +        if (sh->slice_type == HEVC_SLICE_B) {
> +            for (i = 0; i < 15 && i < sh->nb_refs[L1]; i++) {
> +                pic->last_slice_param.rext.luma_offset_l1[i] = sh-
> >luma_offset_l1[i];
> +                pic->last_slice_param.rext.ChromaOffsetL1[i][0] = sh-
> >chroma_offset_l1[i][0];
> +                pic->last_slice_param.rext.ChromaOffsetL1[i][1] = sh-
> >chroma_offset_l1[i][1];
> +            }
> +        }
>      }
>  #endif
>
Wang, Fei W June 10, 2022, 12:57 p.m. UTC | #2 
> -----Original Message-----
> From: Xiang, Haihao <haihao.xiang@intel.com>
> Sent: Friday, June 10, 2022 11:49 AM
> To: ffmpeg-devel@ffmpeg.org
> Cc: Wang, Fei W <fei.w.wang@intel.com>; Xu, Guangxin
> <guangxin.xu@intel.com>; linjie.justin.fu@gmail.com
> Subject: Re: [FFmpeg-devel] [PATCH v1] lavc/vaapi_hevc: fill rext luma/chroma
> offset in the right way
> 
> On Wed, 2022-06-01 at 22:58 +0800, Fei Wang wrote:
> > From: Xu Guangxin <guangxin.xu@intel.com>
> >
> > For range extension, the luma/chroma offset is larger than 8 bits, we
> > need fill the 16 bits version.
> >
> > Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
> > Signed-off-by: Linjie Fu <linjie.justin.fu@gmail.com>
> > Signed-off-by: Fei Wang <fei.w.wang@intel.com>
> > ---
> >  libavcodec/vaapi_hevc.c | 53
> > ++++++++++++++++++++++++++++-------------
> >  1 file changed, 37 insertions(+), 16 deletions(-)
> >
> > diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c index
> > 9083331c45..59beb86650 100644
> > --- a/libavcodec/vaapi_hevc.c
> > +++ b/libavcodec/vaapi_hevc.c
> > @@ -322,10 +322,17 @@ fail:
> >      return ret;
> >  }
> >
> > -static void fill_pred_weight_table(const HEVCContext *h,
> > +static void fill_pred_weight_table(const AVCodecContext *avctx,
> > +                                   const HEVCContext *h,
> >                                     const SliceHeader *sh,
> >                                     VASliceParameterBufferHEVC
> > *slice_param)  {
> > +#if VA_CHECK_VERSION(1, 2, 0)
> > +    int is_rext = avctx->profile >= FF_PROFILE_HEVC_REXT; #else
> > +    int is_rext = 0;
> 
> It will uses the wrong luma/offset for REXT stream when vaapi < 1.2 , right ? I
> think it would be better to add some warning text to remind user.

Thanks, fixed in v2.

Fei

> 
> Thanks
> Haihao
> 
> 
> > +#endif
> > +
> >      int i;
> >
> >      memset(slice_param->delta_luma_weight_l0,   0, sizeof(slice_param-
> > >delta_luma_weight_l0));
> > @@ -353,21 +360,25 @@ static void fill_pred_weight_table(const
> > HEVCContext *h,
> >
> >      for (i = 0; i < 15 && i < sh->nb_refs[L0]; i++) {
> >          slice_param->delta_luma_weight_l0[i] = sh->luma_weight_l0[i]
> > - (1 <<
> > sh->luma_log2_weight_denom);
> > -        slice_param->luma_offset_l0[i] = sh->luma_offset_l0[i];
> >          slice_param->delta_chroma_weight_l0[i][0] = sh-
> > >chroma_weight_l0[i][0] - (1 << sh->chroma_log2_weight_denom);
> >          slice_param->delta_chroma_weight_l0[i][1] = sh-
> > >chroma_weight_l0[i][1] - (1 << sh->chroma_log2_weight_denom);
> > -        slice_param->ChromaOffsetL0[i][0] = sh->chroma_offset_l0[i][0];
> > -        slice_param->ChromaOffsetL0[i][1] = sh->chroma_offset_l0[i][1];
> > +        if (!is_rext) {
> > +            slice_param->luma_offset_l0[i] = sh->luma_offset_l0[i];
> > +            slice_param->ChromaOffsetL0[i][0] = sh->chroma_offset_l0[i][0];
> > +            slice_param->ChromaOffsetL0[i][1] = sh->chroma_offset_l0[i][1];
> > +        }
> >      }
> >
> >      if (sh->slice_type == HEVC_SLICE_B) {
> >          for (i = 0; i < 15 && i < sh->nb_refs[L1]; i++) {
> >              slice_param->delta_luma_weight_l1[i] =
> > sh->luma_weight_l1[i] - (1 << sh->luma_log2_weight_denom);
> > -            slice_param->luma_offset_l1[i] = sh->luma_offset_l1[i];
> >              slice_param->delta_chroma_weight_l1[i][0] = sh-
> > >chroma_weight_l1[i][0] - (1 << sh->chroma_log2_weight_denom);
> >              slice_param->delta_chroma_weight_l1[i][1] = sh-
> > >chroma_weight_l1[i][1] - (1 << sh->chroma_log2_weight_denom);
> > -            slice_param->ChromaOffsetL1[i][0] = sh->chroma_offset_l1[i][0];
> > -            slice_param->ChromaOffsetL1[i][1] = sh->chroma_offset_l1[i][1];
> > +            if (!is_rext) {
> > +                slice_param->luma_offset_l1[i] = sh->luma_offset_l1[i];
> > +                slice_param->ChromaOffsetL1[i][0] = sh-
> > >chroma_offset_l1[i][0];
> > +                slice_param->ChromaOffsetL1[i][1] = sh-
> > >chroma_offset_l1[i][1];
> > +            }
> >          }
> >      }
> >  }
> > @@ -462,7 +473,7 @@ static int vaapi_hevc_decode_slice(AVCodecContext
> *avctx,
> >              last_slice_param->RefPicList[list_idx][i] =
> > get_ref_pic_index(h,
> > rpl->ref[i]);
> >      }
> >
> > -    fill_pred_weight_table(h, sh, last_slice_param);
> > +    fill_pred_weight_table(avctx, h, sh, last_slice_param);
> >
> >  #if VA_CHECK_VERSION(1, 2, 0)
> >      if (avctx->profile == FF_PROFILE_HEVC_REXT) { @@ -471,15 +482,25
> > @@ static int vaapi_hevc_decode_slice(AVCodecContext
> > *avctx,
> >                  .cu_chroma_qp_offset_enabled_flag = sh-
> > >cu_chroma_qp_offset_enabled_flag,
> >              },
> >          };
> > +        for (i = 0; i < 15 && i < sh->nb_refs[L0]; i++) {
> > +            pic->last_slice_param.rext.luma_offset_l0[i] = sh-
> > >luma_offset_l0[i];
> > +            pic->last_slice_param.rext.ChromaOffsetL0[i][0] = sh-
> > >chroma_offset_l0[i][0];
> > +            pic->last_slice_param.rext.ChromaOffsetL0[i][1] = sh-
> > >chroma_offset_l0[i][1];
> > +        }
> > +
> > +        for (i = 0; i < 15 && i < sh->nb_refs[L0]; i++) {
> > +            pic->last_slice_param.rext.luma_offset_l0[i] = sh-
> > >luma_offset_l0[i];
> > +            pic->last_slice_param.rext.ChromaOffsetL0[i][0] = sh-
> > >chroma_offset_l0[i][0];
> > +            pic->last_slice_param.rext.ChromaOffsetL0[i][1] = sh-
> > >chroma_offset_l0[i][1];
> > +        }
> >
> > -        memcpy(pic->last_slice_param.rext.luma_offset_l0, pic-
> > >last_slice_param.base.luma_offset_l0,
> > -                                                    sizeof(pic-
> > >last_slice_param.base.luma_offset_l0));
> > -        memcpy(pic->last_slice_param.rext.luma_offset_l1, pic-
> > >last_slice_param.base.luma_offset_l1,
> > -                                                    sizeof(pic-
> > >last_slice_param.base.luma_offset_l1));
> > -        memcpy(pic->last_slice_param.rext.ChromaOffsetL0, pic-
> > >last_slice_param.base.ChromaOffsetL0,
> > -                                                    sizeof(pic-
> > >last_slice_param.base.ChromaOffsetL0));
> > -        memcpy(pic->last_slice_param.rext.ChromaOffsetL1, pic-
> > >last_slice_param.base.ChromaOffsetL1,
> > -                                                    sizeof(pic-
> > >last_slice_param.base.ChromaOffsetL1));
> > +        if (sh->slice_type == HEVC_SLICE_B) {
> > +            for (i = 0; i < 15 && i < sh->nb_refs[L1]; i++) {
> > +                pic->last_slice_param.rext.luma_offset_l1[i] = sh-
> > >luma_offset_l1[i];
> > +                pic->last_slice_param.rext.ChromaOffsetL1[i][0] = sh-
> > >chroma_offset_l1[i][0];
> > +                pic->last_slice_param.rext.ChromaOffsetL1[i][1] = sh-
> > >chroma_offset_l1[i][1];
> > +            }
> > +        }
> >      }
> >  #endif
> >
diff mbox series

Patch

diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c
index 9083331c45..59beb86650 100644
--- a/libavcodec/vaapi_hevc.c
+++ b/libavcodec/vaapi_hevc.c
@@ -322,10 +322,17 @@  fail:
     return ret;
 }
 
-static void fill_pred_weight_table(const HEVCContext *h,
+static void fill_pred_weight_table(const AVCodecContext *avctx,
+                                   const HEVCContext *h,
                                    const SliceHeader *sh,
                                    VASliceParameterBufferHEVC *slice_param)
 {
+#if VA_CHECK_VERSION(1, 2, 0)
+    int is_rext = avctx->profile >= FF_PROFILE_HEVC_REXT;
+#else
+    int is_rext = 0;
+#endif
+
     int i;
 
     memset(slice_param->delta_luma_weight_l0,   0, sizeof(slice_param->delta_luma_weight_l0));
@@ -353,21 +360,25 @@  static void fill_pred_weight_table(const HEVCContext *h,
 
     for (i = 0; i < 15 && i < sh->nb_refs[L0]; i++) {
         slice_param->delta_luma_weight_l0[i] = sh->luma_weight_l0[i] - (1 << sh->luma_log2_weight_denom);
-        slice_param->luma_offset_l0[i] = sh->luma_offset_l0[i];
         slice_param->delta_chroma_weight_l0[i][0] = sh->chroma_weight_l0[i][0] - (1 << sh->chroma_log2_weight_denom);
         slice_param->delta_chroma_weight_l0[i][1] = sh->chroma_weight_l0[i][1] - (1 << sh->chroma_log2_weight_denom);
-        slice_param->ChromaOffsetL0[i][0] = sh->chroma_offset_l0[i][0];
-        slice_param->ChromaOffsetL0[i][1] = sh->chroma_offset_l0[i][1];
+        if (!is_rext) {
+            slice_param->luma_offset_l0[i] = sh->luma_offset_l0[i];
+            slice_param->ChromaOffsetL0[i][0] = sh->chroma_offset_l0[i][0];
+            slice_param->ChromaOffsetL0[i][1] = sh->chroma_offset_l0[i][1];
+        }
     }
 
     if (sh->slice_type == HEVC_SLICE_B) {
         for (i = 0; i < 15 && i < sh->nb_refs[L1]; i++) {
             slice_param->delta_luma_weight_l1[i] = sh->luma_weight_l1[i] - (1 << sh->luma_log2_weight_denom);
-            slice_param->luma_offset_l1[i] = sh->luma_offset_l1[i];
             slice_param->delta_chroma_weight_l1[i][0] = sh->chroma_weight_l1[i][0] - (1 << sh->chroma_log2_weight_denom);
             slice_param->delta_chroma_weight_l1[i][1] = sh->chroma_weight_l1[i][1] - (1 << sh->chroma_log2_weight_denom);
-            slice_param->ChromaOffsetL1[i][0] = sh->chroma_offset_l1[i][0];
-            slice_param->ChromaOffsetL1[i][1] = sh->chroma_offset_l1[i][1];
+            if (!is_rext) {
+                slice_param->luma_offset_l1[i] = sh->luma_offset_l1[i];
+                slice_param->ChromaOffsetL1[i][0] = sh->chroma_offset_l1[i][0];
+                slice_param->ChromaOffsetL1[i][1] = sh->chroma_offset_l1[i][1];
+            }
         }
     }
 }
@@ -462,7 +473,7 @@  static int vaapi_hevc_decode_slice(AVCodecContext *avctx,
             last_slice_param->RefPicList[list_idx][i] = get_ref_pic_index(h, rpl->ref[i]);
     }
 
-    fill_pred_weight_table(h, sh, last_slice_param);
+    fill_pred_weight_table(avctx, h, sh, last_slice_param);
 
 #if VA_CHECK_VERSION(1, 2, 0)
     if (avctx->profile == FF_PROFILE_HEVC_REXT) {
@@ -471,15 +482,25 @@  static int vaapi_hevc_decode_slice(AVCodecContext *avctx,
                 .cu_chroma_qp_offset_enabled_flag = sh->cu_chroma_qp_offset_enabled_flag,
             },
         };
+        for (i = 0; i < 15 && i < sh->nb_refs[L0]; i++) {
+            pic->last_slice_param.rext.luma_offset_l0[i] = sh->luma_offset_l0[i];
+            pic->last_slice_param.rext.ChromaOffsetL0[i][0] = sh->chroma_offset_l0[i][0];
+            pic->last_slice_param.rext.ChromaOffsetL0[i][1] = sh->chroma_offset_l0[i][1];
+        }
+
+        for (i = 0; i < 15 && i < sh->nb_refs[L0]; i++) {
+            pic->last_slice_param.rext.luma_offset_l0[i] = sh->luma_offset_l0[i];
+            pic->last_slice_param.rext.ChromaOffsetL0[i][0] = sh->chroma_offset_l0[i][0];
+            pic->last_slice_param.rext.ChromaOffsetL0[i][1] = sh->chroma_offset_l0[i][1];
+        }
 
-        memcpy(pic->last_slice_param.rext.luma_offset_l0, pic->last_slice_param.base.luma_offset_l0,
-                                                    sizeof(pic->last_slice_param.base.luma_offset_l0));
-        memcpy(pic->last_slice_param.rext.luma_offset_l1, pic->last_slice_param.base.luma_offset_l1,
-                                                    sizeof(pic->last_slice_param.base.luma_offset_l1));
-        memcpy(pic->last_slice_param.rext.ChromaOffsetL0, pic->last_slice_param.base.ChromaOffsetL0,
-                                                    sizeof(pic->last_slice_param.base.ChromaOffsetL0));
-        memcpy(pic->last_slice_param.rext.ChromaOffsetL1, pic->last_slice_param.base.ChromaOffsetL1,
-                                                    sizeof(pic->last_slice_param.base.ChromaOffsetL1));
+        if (sh->slice_type == HEVC_SLICE_B) {
+            for (i = 0; i < 15 && i < sh->nb_refs[L1]; i++) {
+                pic->last_slice_param.rext.luma_offset_l1[i] = sh->luma_offset_l1[i];
+                pic->last_slice_param.rext.ChromaOffsetL1[i][0] = sh->chroma_offset_l1[i][0];
+                pic->last_slice_param.rext.ChromaOffsetL1[i][1] = sh->chroma_offset_l1[i][1];
+            }
+        }
     }
 #endif