From patchwork Thu Jan 14 08:33:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu-Cheng Li X-Patchwork-Id: 8030571 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6CD1F9F6FA for ; Thu, 14 Jan 2016 08:37:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9665C2049C for ; Thu, 14 Jan 2016 08:37:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0D8620444 for ; Thu, 14 Jan 2016 08:37:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752192AbcANIhK (ORCPT ); Thu, 14 Jan 2016 03:37:10 -0500 Received: from mail-pf0-f180.google.com ([209.85.192.180]:34448 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751892AbcANIhI (ORCPT ); Thu, 14 Jan 2016 03:37:08 -0500 Received: by mail-pf0-f180.google.com with SMTP id q63so99105886pfb.1 for ; Thu, 14 Jan 2016 00:37:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yw4dJJL5zvakdxV4CTRpkmB3iLJFQEQ8iIS37vJWG9E=; b=EWXoUVk/kOa2houGqE8+kyPgTGj4w7kVS33SNZxk4JITk7zqvU6dNRVd3f23AxLc1o 5ia3nThq3mI/CMohW3Dws8SPJV3ZnzVU2JDi9wXcE6ZNoqGInr7aD7DBzNw68cTyN7qm rDFoNPQLSc61O1xWctcn7BYyDE1LC7L3Kgsvc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yw4dJJL5zvakdxV4CTRpkmB3iLJFQEQ8iIS37vJWG9E=; b=dEvsFyGeX8fv6IJfL2etHuDbzz0FMw1VairvfVuTxoJMTYTXB4QuuScvOsbQKGTXf+ YaM4j7d2M7K1WuByJaHs81N858SbBgcfmjxCywI5nLhsJc15zUX6iuGuBTM3D/sEO8O8 AbxEA0DeeQWQed34CB//hxauPP45fKMJztNHjINgwN3okZMxNuKQSd6qEqbbtIxGQUuf 2xUlqTHKhA+bBdWnWQvBUYOcSTdXFUHOVcW7nlwaiZTOPqM0CUuQC3G1Blj/GEA8PqK7 u+wUd97hNnDPD8HkKAt63c+ckhkRQWT26dZzP8yTe4BYeACNWaoyp5wHAwflT4fKtc/T mmag== X-Gm-Message-State: ALoCoQkOzEsxREy0WzEVpIyZ56LzX+aJECzc3+dymbtO8j/KXvEtKeRFo4dMusN9x2ImKKaRIuoPizKPIJ6GmStH660i0uFL0Q== X-Received: by 10.98.80.135 with SMTP id g7mr4149238pfj.132.1452760627550; Thu, 14 Jan 2016 00:37:07 -0800 (PST) Received: from wuchengli-z840.tpe.corp.google.com ([172.30.210.26]) by smtp.gmail.com with ESMTPSA id 17sm7512449pfq.51.2016.01.14.00.37.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jan 2016 00:37:07 -0800 (PST) From: Wu-Cheng Li To: pawel@osciak.com, mchehab@osg.samsung.com, hverkuil@xs4all.nl, k.debski@samsung.com, crope@iki.fi, standby24x7@gmail.com, wuchengli@chromium.org, nicolas.dufresne@collabora.com, ricardo.ribalda@gmail.com, ao2@ao2.it, bparrot@ti.com, kyungmin.park@samsung.com, jtp.park@samsung.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, linux-arm-kernel@lists.infradead.org, tiffany.lin@mediatek.com, djkurtz@chromium.org Subject: [PATCH v2 2/2] s5p-mfc: add the support of V4L2_CID_MPEG_VIDEO_FORCE_I_FRAME. Date: Thu, 14 Jan 2016 16:33:59 +0800 Message-Id: <1452760439-35564-3-git-send-email-wuchengli@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1452760439-35564-1-git-send-email-wuchengli@chromium.org> References: <1452760439-35564-1-git-send-email-wuchengli@chromium.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=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 Signed-off-by: Wu-Cheng Li --- drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c index 0434f02..de1d68d 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c @@ -212,6 +212,15 @@ static struct mfc_control controls[] = { .menu_skip_mask = 0, }, { + .id = V4L2_CID_MPEG_VIDEO_FORCE_I_FRAME, + .type = V4L2_CTRL_TYPE_BUTTON, + .name = "Force an I frame", + .minimum = 0, + .maximum = 0, + .step = 0, + .default_value = 0, + }, + { .id = V4L2_CID_MPEG_VIDEO_VBV_SIZE, .type = V4L2_CTRL_TYPE_INTEGER, .minimum = 0, @@ -1423,6 +1432,10 @@ static int s5p_mfc_enc_s_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE: ctx->force_frame_type = ctrl->val; break; + case V4L2_CID_MPEG_VIDEO_FORCE_I_FRAME: + ctx->force_frame_type + = V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_I_FRAME; + break; case V4L2_CID_MPEG_VIDEO_VBV_SIZE: p->vbv_size = ctrl->val; break;