Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp3716895ioa; Tue, 26 Apr 2022 08:52:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEOwQDze9UEHR4RiQG0k3H7zMl9GahuRW4t8icpjCdczsRZgCi3HFOemo1rtmp6R/FnMEx X-Received: by 2002:a17:903:246:b0:153:857c:a1f6 with SMTP id j6-20020a170903024600b00153857ca1f6mr23725658plh.153.1650988324700; Tue, 26 Apr 2022 08:52:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650988324; cv=none; d=google.com; s=arc-20160816; b=SpZuWoKE27BTrIw7ja5BdQu0j+cMBVeymdy0KQxAui1FmgPj2yW7jjhBGxbmLaDVrZ KKQgBgVXM9sXS5eOrbiRYvwCrz1gc+QU9A83vxWpaW3bjA2TSkrl0l88vOSDSAij9j+7 9SLGS3xrXL9PV9n3z5U7ZD5pki6WZVPZwg/ghdMKShxvpylFVInST5NKtcY8lv1i4wVo eMusnwKaWlEULIW1gEzg5jOwdfJEpdh0kE26QAin9su/J75FhrTjHMmAXruu0NgA+1I0 uaBSzbhlrOJoDHysV0VLQMyLUyibWYFecC6riGpiqJKdTsmt2bZjTGS07oHK1bARN2pg nXTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OhdrNt0gJ51cTv+KKDNiQD+24iRmYmHAZoV4d1gsHE4=; b=YD7P1Y6F9hzoPVUbQ3TRP5WPE3n1+Q+j7ANaqEpSFL17MBwqmviZyM2hQizMrCkjHu H7LvXWri/R5FJbcduQMxx0IWHRAbCOMiM972qdKFDI62nx9PWaZxjXZllTaU8Y6Vsaxh tve72JO6cE8AZf8XXzGacqUaeucyDwtD7Vlz/kxhNHuubcqZrCUCk2WLi/Sf/QYAJWuY g2ZBuhLL8ennyIceOq4MKcnX5jldfaJ2/QWZnVpfDMh5D6Ce2BOBYOAqkVr1uTJruX/m X1buoLCcQ4kPHhr+TwxFKd7eLsuyTFSugo0b4NvZqgSExAYiJdSQdOIQ/R/FMKy0IAN8 qp4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="R4DhZD/Z"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lw4-20020a17090b180400b001cba43173ebsi3148450pjb.94.2022.04.26.08.51.46; Tue, 26 Apr 2022 08:52:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="R4DhZD/Z"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345021AbiDZNCK (ORCPT + 99 others); Tue, 26 Apr 2022 09:02:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350244AbiDZNBj (ORCPT ); Tue, 26 Apr 2022 09:01:39 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D184220C3; Tue, 26 Apr 2022 05:58:32 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: nicolas) with ESMTPSA id F359F1F43999 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1650977911; bh=mlmVguJcq18q2C5FsZYpROZPrzKGkqiR80YOa10U0rQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R4DhZD/ZO/ZdN80EgBWl3CS/bbfNmq0mGNkaXtVKCew0b+SnrGkmV0GdkFy2zQZzj /J1QimWglAQnyxDyECg5tgducpujBvM7Jgn9I+pVNQ17xK0KLQKLq1NyZ2LjHJZizs 0IxLhE91L+gsPFTfB4BrsOoanpy/oB9V+TZ76QqbIX2qZ2FeSc3Hikz3TUBtukHukW gGactiPcwUwSMCxq6Fg2Ryr+iijk6a/spxFCBeAF9sv0CLB+igDPaGCO+51/9V0shg NIOuXwDbLBdLSIN6xt60BecfrAGk4xZHH0HggzrLiGP4//WTfbNVeNSYTmRwhrpE0b GDecRSL1kCfpQ== From: Nicolas Dufresne To: Ezequiel Garcia , Mauro Carvalho Chehab , Greg Kroah-Hartman Cc: nicolas@ndufresne.ca, Jonas Karlman , linux-media@vger.kernel.org, Sebastian Fricke , linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v4 18/24] media: rkvdec: Ensure decoded resolution fit coded resolution Date: Tue, 26 Apr 2022 08:57:44 -0400 Message-Id: <20220426125751.108293-19-nicolas.dufresne@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220426125751.108293-1-nicolas.dufresne@collabora.com> References: <20220426125751.108293-1-nicolas.dufresne@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jonas Karlman Ensure decoded CAPTURE buffer resolution is larger or equal to the coded OUTPUT buffer resolution. Signed-off-by: Jonas Karlman Signed-off-by: Nicolas Dufresne Reviewed-by: Sebastian Fricke --- drivers/staging/media/rkvdec/rkvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index e3d44d5b35f3..2bc4b1a40989 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -257,6 +257,8 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, pix_mp->pixelformat = coded_desc->decoded_fmts[0]; /* Always apply the frmsize constraint of the coded end. */ + pix_mp->width = max(pix_mp->width, ctx->coded_fmt.fmt.pix_mp.width); + pix_mp->height = max(pix_mp->height, ctx->coded_fmt.fmt.pix_mp.height); v4l2_apply_frmsize_constraints(&pix_mp->width, &pix_mp->height, &coded_desc->frmsize); -- 2.34.1