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=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 0AFFCC28CC0 for ; Wed, 29 May 2019 16:06:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4A9F23CE0 for ; Wed, 29 May 2019 16:06:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726240AbfE2QGl (ORCPT ); Wed, 29 May 2019 12:06:41 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:53886 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726118AbfE2QGl (ORCPT ); Wed, 29 May 2019 12:06:41 -0400 Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id CF1C5260732; Wed, 29 May 2019 17:06:38 +0100 (BST) Date: Wed, 29 May 2019 18:06:35 +0200 From: Boris Brezillon To: Hans Verkuil Cc: Ezequiel Garcia , Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Sakari Ailus , linux-media@vger.kernel.org, kernel@collabora.com Subject: Re: [PATCH] media: v4l2: Initialize mpeg slice controls Message-ID: <20190529180635.0fef93bd@collabora.com> In-Reply-To: <70396bcf-7fdc-f69b-7b8a-f0d6958093dc@xs4all.nl> References: <20190503114221.28469-1-boris.brezillon@collabora.com> <100592967e3c3546b4dcbbb8a0369297b27fa8e8.camel@collabora.com> <70396bcf-7fdc-f69b-7b8a-f0d6958093dc@xs4all.nl> Organization: Collabora X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Wed, 29 May 2019 17:42:58 +0200 Hans Verkuil wrote: > On 5/29/19 5:36 PM, Ezequiel Garcia wrote: > > On Wed, 2019-05-29 at 16:41 +0200, Hans Verkuil wrote: > >> On 5/3/19 1:42 PM, Boris Brezillon wrote: > >>> Make sure the default value at least passes the std_validate() tests. > >>> > >>> Signed-off-by: Boris Brezillon > >>> --- > >>> drivers/media/v4l2-core/v4l2-ctrls.c | 20 +++++++++++++++++++- > >>> 1 file changed, 19 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c > >>> index b1ae2e555c68..19d40cc6e565 100644 > >>> --- a/drivers/media/v4l2-core/v4l2-ctrls.c > >>> +++ b/drivers/media/v4l2-core/v4l2-ctrls.c > >>> @@ -1461,7 +1461,14 @@ static bool std_equal(const struct v4l2_ctrl *ctrl, u32 idx, > >>> static void std_init(const struct v4l2_ctrl *ctrl, u32 idx, > >>> union v4l2_ctrl_ptr ptr) > >>> { > >>> - switch (ctrl->type) { > >>> + struct v4l2_ctrl_mpeg2_slice_params *p_mpeg2_slice_params; > >>> + > >>> + /* > >>> + * The cast is needed to get rid of a gcc warning complaining that > >>> + * V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS is not part of the > >>> + * v4l2_ctrl_type enum. > >>> + */ > >>> + switch ((u32)ctrl->type) { > >>> case V4L2_CTRL_TYPE_STRING: > >>> idx *= ctrl->elem_size; > >>> memset(ptr.p_char + idx, ' ', ctrl->minimum); > >>> @@ -1486,6 +1493,17 @@ static void std_init(const struct v4l2_ctrl *ctrl, u32 idx, > >>> case V4L2_CTRL_TYPE_U32: > >>> ptr.p_u32[idx] = ctrl->default_value; > >>> break; > >>> + case V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS: > >>> + p_mpeg2_slice_params = ptr.p; > >>> + /* 4:2:0 */ > >>> + p_mpeg2_slice_params->sequence.chroma_format = 1; > >>> + /* 8 bits */ > >>> + p_mpeg2_slice_params->picture.intra_dc_precision = 0; > >>> + /* interlaced top field */ > >>> + p_mpeg2_slice_params->picture.picture_structure = 1; > >>> + p_mpeg2_slice_params->picture.picture_coding_type = > >>> + V4L2_MPEG2_PICTURE_CODING_TYPE_I; > >> > >> Oops, this isn't complete. It should still zero the p_mpeg2_slice_params > >> struct first. Right now any fields not explicitly set just have whatever > >> was in memory. Oops. > >> > >> Can you post a patch fixing this? > >> > >> > > > > > > I was wondering if we want to zero all the cases, and not just > > the struct types ones. > > The others either overwrite the data with the default_value, or memset > the whole control (default case). It's only for these compound controls > that something special needs to be done. > > The code can be restructured, though: instead of break do return in all > the simple type cases. > > Then call memset followed by a new switch for the compound types where you > need to set some fields to non-zero. memset(0) will fix the undefined val issue, the question is, is it the default we want? I haven't worked on MPEG2 (just posted patches Ezequiel worked on) so I can't tell.