| Message ID | OSZP286MB2173184FF7720103ED131591CAA92@OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,1/3] avcodec/vvc_parser: move avctx->has_b_frames initialization to dec | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Wed, Jul 24, 2024 at 2:56 AM <toqsxw@outlook.com> wrote: > From: Wu Jianhua <toqsxw@outlook.com> > > From Jun Zhao <mypopydev@gmail.com>: > > Should we relocate this to the decoder? Other codecs typically set this > > parameter in the decoder. > Thank you, Jianhua. will apply next week. > > Signed-off-by: Wu Jianhua <toqsxw@outlook.com> > --- > libavcodec/vvc/dec.c | 1 + > libavcodec/vvc_parser.c | 3 --- > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c > index d04f68e4cf..6e225d278a 100644 > --- a/libavcodec/vvc/dec.c > +++ b/libavcodec/vvc/dec.c > @@ -748,6 +748,7 @@ static void export_frame_params(VVCContext *s, const > VVCFrameContext *fc) > c->coded_height = pps->height; > 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]); > + c->has_b_frames = > sps->r->sps_dpb_params.dpb_max_num_reorder_pics[sps->r->sps_max_sublayers_minus1]; > } > > static int frame_setup(VVCFrameContext *fc, VVCContext *s) > diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c > index 5373875aae..8d32d66573 100644 > --- a/libavcodec/vvc_parser.c > +++ b/libavcodec/vvc_parser.c > @@ -185,9 +185,6 @@ static void set_parser_ctx(AVCodecParserContext *s, > AVCodecContext *avctx, > avctx->color_range = > sps->vui.vui_full_range_flag ? AVCOL_RANGE_JPEG : > AVCOL_RANGE_MPEG; > > - avctx->has_b_frames = > - > sps->sps_dpb_params.dpb_max_num_reorder_pics[sps->sps_max_sublayers_minus1]; > - > if (sps->sps_ptl_dpb_hrd_params_present_flag && > sps->sps_timing_hrd_params_present_flag) { > uint32_t num = > sps->sps_general_timing_hrd_parameters.num_units_in_tick; > -- > 2.44.0.windows.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index d04f68e4cf..6e225d278a 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -748,6 +748,7 @@ static void export_frame_params(VVCContext *s, const VVCFrameContext *fc) c->coded_height = pps->height; 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]); + c->has_b_frames = sps->r->sps_dpb_params.dpb_max_num_reorder_pics[sps->r->sps_max_sublayers_minus1]; } static int frame_setup(VVCFrameContext *fc, VVCContext *s) diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c index 5373875aae..8d32d66573 100644 --- a/libavcodec/vvc_parser.c +++ b/libavcodec/vvc_parser.c @@ -185,9 +185,6 @@ static void set_parser_ctx(AVCodecParserContext *s, AVCodecContext *avctx, avctx->color_range = sps->vui.vui_full_range_flag ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; - avctx->has_b_frames = - sps->sps_dpb_params.dpb_max_num_reorder_pics[sps->sps_max_sublayers_minus1]; - if (sps->sps_ptl_dpb_hrd_params_present_flag && sps->sps_timing_hrd_params_present_flag) { uint32_t num = sps->sps_general_timing_hrd_parameters.num_units_in_tick;