[FFmpeg-devel] [PATCH v1 1/2] lavc/vvcdec: Add missed chroma sampling factor for crop offset

[Nuo Mi]

Thank you, Fei,

Do you happen to know why the following clips are still failing?

CROP_A_Panasonic_4.bit
CROP_B_Panasonic_4.bit
https://github.com/ffvvc/tests/tree/main/conformance/failed/v1/CROP

On Fri, Mar 8, 2024 at 8:54 AM <fei.w.wang-at-intel.com at ffmpeg.org> wrote:

> From: Fei Wang <fei.w.wang at intel.com>
>
> Signed-off-by: Fei Wang <fei.w.wang at intel.com>
> ---
>  libavcodec/vvc/vvc_refs.c | 8 ++++----
>  libavcodec/vvc/vvcdec.c   | 4 ++--
>  2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/libavcodec/vvc/vvc_refs.c b/libavcodec/vvc/vvc_refs.c
> index 99f2dcf3ec..afcfc09da7 100644
> --- a/libavcodec/vvc/vvc_refs.c
> +++ b/libavcodec/vvc/vvc_refs.c
> @@ -185,10 +185,10 @@ int ff_vvc_set_new_ref(VVCContext *s,
> VVCFrameContext *fc, AVFrame **frame)
>
>      ref->poc      = poc;
>      ref->sequence = s->seq_decode;
> -    ref->frame->crop_left   = fc->ps.pps->r->pps_conf_win_left_offset;
> -    ref->frame->crop_right  = fc->ps.pps->r->pps_conf_win_right_offset;
> -    ref->frame->crop_top    = fc->ps.pps->r->pps_conf_win_top_offset;
> -    ref->frame->crop_bottom = fc->ps.pps->r->pps_conf_win_bottom_offset;
> +    ref->frame->crop_left   = fc->ps.pps->r->pps_conf_win_left_offset <<
> fc->ps.sps->hshift[CHROMA];
> +    ref->frame->crop_right  = fc->ps.pps->r->pps_conf_win_right_offset <<
> fc->ps.sps->hshift[CHROMA];
> +    ref->frame->crop_top    = fc->ps.pps->r->pps_conf_win_top_offset <<
> fc->ps.sps->vshift[CHROMA];
> +    ref->frame->crop_bottom = fc->ps.pps->r->pps_conf_win_bottom_offset
> << fc->ps.sps->vshift[CHROMA];
>
>      return 0;
>  }
> diff --git a/libavcodec/vvc/vvcdec.c b/libavcodec/vvc/vvcdec.c
> index 570e2aa513..a979ebd41c 100644
> --- a/libavcodec/vvc/vvcdec.c
> +++ b/libavcodec/vvc/vvcdec.c
> @@ -727,8 +727,8 @@ static void export_frame_params(VVCContext *s, const
> VVCFrameContext *fc)
>      c->pix_fmt      = sps->pix_fmt;
>      c->coded_width  = pps->width;
>      c->coded_height = pps->height;
> -    c->width        = pps->width  - pps->r->pps_conf_win_left_offset -
> pps->r->pps_conf_win_right_offset;
> -    c->height       = pps->height - pps->r->pps_conf_win_top_offset -
> pps->r->pps_conf_win_bottom_offset;
> +    c->width        = pps->width  - ((pps->r->pps_conf_win_left_offset +
> pps->r->pps_conf_win_right_offset) << sps->hshift[CHROMA]);
> +    c->height       = pps->height - ((pps->r->pps_conf_win_top_offset +
> pps->r->pps_conf_win_bottom_offset) << sps->vshift[CHROMA]);
>  }
>
>  static int frame_setup(VVCFrameContext *fc, VVCContext *s)
> --
> 2.25.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
>