vlc | branch: master | Francois Cartegnie <[email protected]> | Thu Dec 3 15:22:11 2020 +0100| [41509f6452a3258e49e532d16b905c227321f2d4] | committer: Francois Cartegnie
codec: videotoolbox: fix reorder counting unit > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=41509f6452a3258e49e532d16b905c227321f2d4 --- modules/codec/videotoolbox.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/codec/videotoolbox.c b/modules/codec/videotoolbox.c index aae548504b..9224989cb7 100644 --- a/modules/codec/videotoolbox.c +++ b/modules/codec/videotoolbox.c @@ -793,7 +793,7 @@ static void InsertIntoDPB(decoder_sys_t *p_sys, frame_info_t *p_info) { p_info->p_next = *pp_lead_in; *pp_lead_in = p_info; - p_sys->i_pic_reorder += (p_info->b_field) ? 1 : 2; + p_sys->i_pic_reorder++; break; } } @@ -835,7 +835,7 @@ static picture_t * RemoveOneFrameFromDPB(decoder_sys_t *p_sys) *pp_ret_last = p_field; pp_ret_last = &p_field->p_next; - p_sys->i_pic_reorder -= (p_info->b_field) ? 1 : 2; + p_sys->i_pic_reorder--; p_sys->p_pic_reorder = p_info->p_next; free(p_info); @@ -917,7 +917,7 @@ static void OnDecodedFrame(decoder_t *p_dec, frame_info_t *p_info) { decoder_sys_t *p_sys = p_dec->p_sys; assert(p_info->p_picture); - while(p_info->b_flush || p_sys->i_pic_reorder >= (p_sys->i_pic_reorder_max * 2)) + while(p_info->b_flush || p_sys->i_pic_reorder >= p_sys->i_pic_reorder_max) { /* First check if DPB sizing was correct before removing one frame */ if (p_sys->p_pic_reorder && !p_info->b_flush && _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
