* [PATCH,v1] media: mtk-vcodec: fix vp9 content playback error with show exist frame
@ 2019-04-01 8:18 maoguang.meng
2019-04-16 8:53 ` gtk_ruiwang
2019-04-22 6:44 ` Tomasz Figa
0 siblings, 2 replies; 3+ messages in thread
From: maoguang.meng @ 2019-04-01 8:18 UTC (permalink / raw)
To: Hans Verkuil, Tiffany Lin
Cc: Longfei Wang, Yunfei Dong, gtk_ruiwang, Mauro Carvalho Chehab,
Matthias Brugger, linux-media, devicetree, linux-kernel,
linux-arm-kernel, linux-mediatek, Maoguang Meng
From: Maoguang Meng <maoguang.meng@mediatek.com>
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>
---
.../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
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 bc8349b..d950837 100644
--- 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
@@ -895,7 +895,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;
}
}
@@ -924,14 +924,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,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH,v1] media: mtk-vcodec: fix vp9 content playback error with show exist frame
2019-04-01 8:18 [PATCH,v1] media: mtk-vcodec: fix vp9 content playback error with show exist frame maoguang.meng
@ 2019-04-16 8:53 ` gtk_ruiwang
2019-04-22 6:44 ` Tomasz Figa
1 sibling, 0 replies; 3+ messages in thread
From: gtk_ruiwang @ 2019-04-16 8:53 UTC (permalink / raw)
To: Hans Verkuil, Tiffany Lin, maoguang.meng
Cc: Longfei Wang, Yunfei Dong, Mauro Carvalho Chehab,
Matthias Brugger, linux-media, devicetree, linux-kernel,
linux-arm-kernel, linux-mediatek, gtk_ruiwang
Dear Hans, all,
Could you please help to review this patch?
This is a fix about vp9 show_existing_frames.
Sincerely thanks,
BR
On Mon, 2019-04-01 at 16:18 +0800, maoguang.meng@mediatek.com wrote:
> From: Maoguang Meng <maoguang.meng@mediatek.com>
>
> 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>
> ---
> .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> 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 bc8349b..d950837 100644
> --- 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
> @@ -895,7 +895,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;
> }
> }
> @@ -924,14 +924,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,
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH,v1] media: mtk-vcodec: fix vp9 content playback error with show exist frame
2019-04-01 8:18 [PATCH,v1] media: mtk-vcodec: fix vp9 content playback error with show exist frame maoguang.meng
2019-04-16 8:53 ` gtk_ruiwang
@ 2019-04-22 6:44 ` Tomasz Figa
1 sibling, 0 replies; 3+ messages in thread
From: Tomasz Figa @ 2019-04-22 6:44 UTC (permalink / raw)
To: maoguang.meng
Cc: Hans Verkuil, Tiffany Lin, Longfei Wang, Yunfei Dong,
gtk_ruiwang, Mauro Carvalho Chehab, Matthias Brugger,
Linux Media Mailing List, devicetree, Linux Kernel Mailing List,
list@263.net:IOMMU DRIVERS
<iommu@lists.linux-foundation.org>,
Joerg Roedel <joro@8bytes.org>,,
linux-mediatek
On Mon, Apr 1, 2019 at 5:19 PM <maoguang.meng@mediatek.com> wrote:
>
> From: Maoguang Meng <maoguang.meng@mediatek.com>
>
> 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>
> ---
> .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> 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 bc8349b..d950837 100644
> --- 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
> @@ -895,7 +895,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;
> }
> }
> @@ -924,14 +924,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,
> --
> 1.7.9.5
>
Thanks for the patch!
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-22 6:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-01 8:18 [PATCH,v1] media: mtk-vcodec: fix vp9 content playback error with show exist frame maoguang.meng
2019-04-16 8:53 ` gtk_ruiwang
2019-04-22 6:44 ` Tomasz Figa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).