From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BCEFC10F13 for ; Tue, 16 Apr 2019 09:09:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 45F992086A for ; Tue, 16 Apr 2019 09:09:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="oWNZMJBo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45F992086A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yfARrcGvZhkkfTdTwpJnruTiZgSS1p109i5d+4kkjY8=; b=oWNZMJBocJLYv7 vzAZyOjOlPGy0RwLkNigEtVPphKyDZ5uFjAU48SRh13akNKtfe3zfs8tOjsM91dXB2zNDqsd/VcRb brINv3Xv+NSarQPR0J119I6e/298SRS77koPghq5RaeDK9QnmrBXblkrFIORea3rfaJ7gPR8Qyl4O LcK/h+TcIfZQM1O15iuxVQCAdayLqaZn2WF9sQ/XJp7f48/E+NuWAmtpwRlG0kI6ClMIQPGD9Fw8j cGZcRkx503hxZ4o1khwGBz7WSvTS2oLJxF6FQFCIBvscQNQjmZyMYGJ9DED6i9qSF25L0WjcEMv8T LwD0uLCJCXR8KIjgpbCA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGK5s-0000we-FO; Tue, 16 Apr 2019 09:09:32 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGK5o-0000tw-4c; Tue, 16 Apr 2019 09:09:29 +0000 X-UUID: c8db8cd784584b3aa8272eb56a0f191b-20190416 X-UUID: c8db8cd784584b3aa8272eb56a0f191b-20190416 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 745648583; Tue, 16 Apr 2019 00:54:00 -0800 Received: from MTKMBS31DR.mediatek.inc (172.27.6.102) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 16 Apr 2019 01:53:58 -0700 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 16 Apr 2019 16:53:54 +0800 Received: from [10.17.3.153] (172.27.4.253) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 16 Apr 2019 16:53:54 +0800 Message-ID: <1555404834.22504.9.camel@mhfsdcap03> Subject: Re: [PATCH,v1] media: mtk-vcodec: fix vp9 content playback error with show exist frame From: gtk_ruiwang To: Hans Verkuil , Tiffany Lin , Date: Tue, 16 Apr 2019 16:53:54 +0800 In-Reply-To: <1554106718-23107-1-git-send-email-maoguang.meng@mediatek.com> References: <1554106718-23107-1-git-send-email-maoguang.meng@mediatek.com> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190416_020928_181783_54BD4060 X-CRM114-Status: UNSURE ( 7.05 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, gtk_ruiwang@mediatek.com, Yunfei Dong , Longfei Wang , linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Matthias Brugger , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 > > 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 > --- > .../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, _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel