From patchwork Fri Jun 13 16:08:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 4350701 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 686FFBEEAA for ; Fri, 13 Jun 2014 16:10:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 708E220265 for ; Fri, 13 Jun 2014 16:10:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 75DBD2022A for ; Fri, 13 Jun 2014 16:10:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751522AbaFMQKN (ORCPT ); Fri, 13 Jun 2014 12:10:13 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:44478 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753411AbaFMQJK (ORCPT ); Fri, 13 Jun 2014 12:09:10 -0400 Received: from client-120-static.hi.pengutronix.de ([10.1.0.120] helo=paszta.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WvU2H-0006dC-KS; Fri, 13 Jun 2014 18:09:01 +0200 From: Philipp Zabel To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab , Kamil Debski , Fabio Estevam , kernel@pengutronix.de, Philipp Zabel Subject: [PATCH 18/30] [media] coda: let userspace force IDR frames by enabling the keyframe flag in the source buffer Date: Fri, 13 Jun 2014 18:08:44 +0200 Message-Id: <1402675736-15379-19-git-send-email-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: <1402675736-15379-1-git-send-email-p.zabel@pengutronix.de> References: <1402675736-15379-1-git-send-email-p.zabel@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.120 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This disables forcing IDR frames at GOP size intervals on CODA7541 and CODA960, which is only needed to work around a firmware bug on CodaDx6. Instead, the V4L2_BUF_FLAG_KEYFRAME v4l2 buffer flag is cleared before marking the source buffer done for dequeueing. Userspace can set it before queueing a frame to force an IDR frame, to implement VFU (Video Fast Update). Signed-off-by: Philipp Zabel --- drivers/media/platform/coda.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index 11e059d..cf75112 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -1264,22 +1264,22 @@ static void coda_prepare_encode(struct coda_ctx *ctx) * frame as IDR. This is a problem for some decoders that can't * recover when a frame is lost. */ - if (src_buf->v4l2_buf.sequence % ctx->params.gop_size) { - src_buf->v4l2_buf.flags |= V4L2_BUF_FLAG_PFRAME; - src_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_KEYFRAME; - } else { + if ((src_buf->v4l2_buf.sequence % ctx->params.gop_size) == 0) src_buf->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME; + if (src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) src_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_PFRAME; - } + else + src_buf->v4l2_buf.flags |= V4L2_BUF_FLAG_PFRAME; if (dev->devtype->product == CODA_960) coda_set_gdi_regs(ctx); /* - * Copy headers at the beginning of the first frame for H.264 only. - * In MPEG4 they are already copied by the coda. + * Copy headers in front of the first frame and forced I frames for + * H.264 only. In MPEG4 they are already copied by the CODA. */ - if (src_buf->v4l2_buf.sequence == 0) { + if (src_buf->v4l2_buf.sequence == 0 || + src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) { pic_stream_buffer_addr = vb2_dma_contig_plane_dma_addr(dst_buf, 0) + ctx->vpu_header_size[0] + @@ -3245,6 +3245,8 @@ static void coda_finish_encode(struct coda_ctx *ctx) src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK; dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode; + /* Clear keyframe flag so userspace can misuse it to force an IDR frame */ + src_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_KEYFRAME; v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE); dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);