From 03f94da031f956f79885314e21e14508efcd8cf8 Mon Sep 17 00:00:00 2001 From: Johnson Ding Date: Fri, 30 Apr 2021 17:52:08 +0800 Subject: [PATCH] [h264d]: Revert 0250dab00c58fcb790d79de4bef647520e The changes done by 0250dab00c58fcb790d79de4bef647520e54b2a9 will cause dbp combination error. So revert it. Change-Id: Ia1fd3157eafebe52332e3beacd979c1497008a75 Signed-off-by: Johnson Ding --- mpp/codec/dec/h264/h264d_dpb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpp/codec/dec/h264/h264d_dpb.c b/mpp/codec/dec/h264/h264d_dpb.c index 49400163..a4d9dddf 100644 --- a/mpp/codec/dec/h264/h264d_dpb.c +++ b/mpp/codec/dec/h264/h264d_dpb.c @@ -1683,7 +1683,7 @@ RK_U32 get_field_dpb_combine_flag(H264_FrameStore_t *p_last, H264_StorePic_t *p) if ((p->structure == TOP_FIELD) || (p->structure == BOTTOM_FIELD)) { // check for frame store with same pic_number - if (p_last && (p_last->structure == TOP_FIELD || p_last->structure == BOTTOM_FIELD)) { + if (p_last) { if ((RK_S32)p_last->frame_num == p->pic_num) { if (((p->structure == TOP_FIELD) && (p_last->is_used == 2)) || ((p->structure == BOTTOM_FIELD) && (p_last->is_used == 1))) {