media: mtk-vcodec: fix vp9 content playback error with show exist frame

Update referenced frame buffer's reference count when playing vp9
content which has show_existing_frame flag, and copy enough buffer
data to current shown frame.

Signed-off-by: Maoguang Meng <maoguang.meng@mediatek.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
index 6fe83207bbc42c20a6d6d744903212506b2a3ea3..939ea14bf6c53638f24af05eac6554f97814cfc9 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
+++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
@@ -481,15 +481,15 @@ static void vp9_swap_frm_bufs(struct vdec_vp9_inst *inst)
                 */
                if ((frm_to_show->fb != NULL) &&
                        (inst->cur_fb->base_y.size >=
-                       frm_to_show->fb->base_y.size)) {
+                       frm_to_show->fb->base_y.size) &&
+                       (inst->cur_fb->base_c.size >=
+                       frm_to_show->fb->base_c.size)) {
                        memcpy((void *)inst->cur_fb->base_y.va,
                                (void *)frm_to_show->fb->base_y.va,
-                               vsi->buf_w *
-                               vsi->buf_h);
+                               frm_to_show->fb->base_y.size);
                        memcpy((void *)inst->cur_fb->base_c.va,
                                (void *)frm_to_show->fb->base_c.va,
-                               vsi->buf_w *
-                               vsi->buf_h / 2);
+                               frm_to_show->fb->base_c.size);
                } else {
                        /* After resolution change case, current CAPTURE buffer
                         * may have less buffer size than frm_to_show buffer
@@ -894,7 +894,7 @@ static int vdec_vp9_decode(unsigned long h_vdec, struct mtk_vcodec_mem *bs,
 
                if (vsi->resolution_changed) {
                        if (!vp9_alloc_work_buf(inst)) {
-                               ret = -EINVAL;
+                               ret = -EIO;
                                goto DECODE_ERROR;
                        }
                }
@@ -923,14 +923,12 @@ static int vdec_vp9_decode(unsigned long h_vdec, struct mtk_vcodec_mem *bs,
 
                if (vsi->show_existing_frame && (vsi->frm_to_show_idx <
                                        VP9_MAX_FRM_BUF_NUM)) {
-                       mtk_vcodec_err(inst,
+                       mtk_vcodec_debug(inst,
                                "Skip Decode drv->new_fb_idx=%d, drv->frm_to_show_idx=%d",
                                vsi->new_fb_idx, vsi->frm_to_show_idx);
 
                        vp9_ref_cnt_fb(inst, &vsi->new_fb_idx,
                                        vsi->frm_to_show_idx);
-                       ret = -EINVAL;
-                       goto DECODE_ERROR;
                }
 
                /* VPU assign the buffer pointer in its address space,