Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/vvcdec: Add missed chroma sampling factor for crop offset

Browse Source 
Signed-off-by: Fei Wang <fei.w.wang@intel.com>
release/7.0
Fei Wang 10 months ago committed by Nuo Mi
parent 9124d807dc
commit c252d2b84a
2 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      libavcodec/vvc/vvc_refs.c
  2. 4
      libavcodec/vvc/vvcdec.c

8
libavcodec/vvc/vvc_refs.c
Unescape View File

@ -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;
}

4
libavcodec/vvc/vvcdec.c
Unescape View File

@ -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)

Write Preview
Loading…
Cancel
Save