From patchwork Wed Mar 12 19:17:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 873303 Received: from fhigh-b6-smtp.messagingengine.com (fhigh-b6-smtp.messagingengine.com [202.12.124.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 341241D79A0 for ; Wed, 12 Mar 2025 19:17:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741807079; cv=none; b=SnECZCzqHgeIlf/Lve0cre/QvIF/l/9hROM7el8dKvnTryAF02zV86r/RYXrGMJNwC7yC62g2l4Phzz1xXOVJPHSCOIA0ZWBvTTCFcD/D5vXsWZtwHcoIMGXRJAP8eFl6yAIjN5KFytrizgsTlE9aP7BQERkqQ2nUQPldDk0EXE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741807079; c=relaxed/simple; bh=HaOFT3lhApPLTfKPgJ6XrlzbIh0UaDJvvhL8ppoe3iY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nV0uYEpEMAYIDmIscSP+Mb+GKIwQcqx9eUeYEFAHA2Ez1hThxb1Kaxd/hquRSPahmbPMeFXotlG3hmfBrohYTTdTbrJKhl7enYW4LIoa/Tg9hu+o2En2wQkXJZ6gBPjY7ab1Sf12piXcVBITuT19unQhQB9NCZe8OXPDZHYIrps= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ragnatech.se; spf=pass smtp.mailfrom=ragnatech.se; dkim=pass (2048-bit key) header.d=ragnatech.se header.i=@ragnatech.se header.b=TQs37bjG; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=m7NpPFn0; arc=none smtp.client-ip=202.12.124.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ragnatech.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ragnatech.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ragnatech.se header.i=@ragnatech.se header.b="TQs37bjG"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="m7NpPFn0" Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfhigh.stl.internal (Postfix) with ESMTP id 38D39254026B; Wed, 12 Mar 2025 15:17:55 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Wed, 12 Mar 2025 15:17:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech.se; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1741807075; x=1741893475; bh=cPk2zmLov+kkqfB3IW9AUhosTKimt/ZAwgVyB1qE4QE=; b= TQs37bjGQ65sPLA5QI3bE9Gbq6hnBhc7g6HXCjE21AUGiGdDkQJL7nyssjLYKOrQ +/EPLT2+gpIDkvGYVys/vwBpeR0G2BqqlisAwmDQi8SM2U3TWizBhPVrbxmQpZU8 d6BSqhJoEpryuuc5IjKKCYMLLf1K4wQzGsrLC1Tekn45so14ImR50SoLeLoNNZUn L6FOk0iFGrto99w0adJUjIBmShdgHAYm0LkQzeE4AZrPRknf4XSay0r6C9KHeT5/ 0vvOP2VM0HplLMAQ1GHWXvygqMLg+816iWVvHtIpDnojDIlFYuoY+J/ADKFTxvMU g2IB9QhoyCJ0fsAu2LOVZw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1741807075; x= 1741893475; bh=cPk2zmLov+kkqfB3IW9AUhosTKimt/ZAwgVyB1qE4QE=; b=m 7NpPFn0HfT3GJaqGD7rkiond/TAeKJk8tVPzTFcyxhlPXhXlJh9vJXQIL3JNzAep E1mJ02ft/4BE98Dc9bU9IpHsbjc0i/JDyt3bOEQp//Wxt0rBVsIcohhfMhnFLIg4 +2RxQbQDIcJ9WBzRYKKSSkIg3RBB83Bfu8N+wVYXxxjYQa4PqwIy9Abpah+mFBW1 id0mfkBVtJuqwjyWAgTqqG1QMQJQa7wpOpZ/OD9Uxm5YvecjmkbgWlBucBBjEluK bypt103ibvrHCEhKQKzYA0Rw83rQby2dg7PH5C+vj9xsX8rWFNvGMQsq3VYM0KxO 5slh5GNaWqihUw5rWqKgA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduvdehkeelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpefpihhklhgrshcuufpnuggvrhhluhhnugcuoehnihhklhgrshdrsh houggvrhhluhhnugesrhgrghhnrghtvggthhdrshgvqeenucggtffrrghtthgvrhhnpedt jeegkeeiudffhefhgedugeefueekkeffgeeltdeifeekheejveeifeffheevueenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehnihhklhgrshdr shhouggvrhhluhhnugesrhgrghhnrghtvggthhdrshgvpdhnsggprhgtphhtthhopeegpd hmohguvgepshhmthhpohhuthdprhgtphhtthhopehsrghkrghrihdrrghilhhusheslhhi nhhugidrihhnthgvlhdrtghomhdprhgtphhtthhopehlrghurhgvnhhtrdhpihhntghhrg hrthesihguvggrshhonhgsohgrrhgurdgtohhmpdhrtghpthhtoheplhhinhhugidqmhgv ughirgesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehnihhklhgrshdrsh houggvrhhluhhnugesrhgrghhnrghtvggthhdrshgv X-ME-Proxy: Feedback-ID: i80c9496c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 12 Mar 2025 15:17:54 -0400 (EDT) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: Sakari Ailus , Laurent Pinchart Cc: linux-media@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [raw2rgbpnm 1/3] Remove support for reading multiple frames from single file Date: Wed, 12 Mar 2025 20:17:08 +0100 Message-ID: <20250312191710.1823147-2-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250312191710.1823147-1-niklas.soderlund@ragnatech.se> References: <20250312191710.1823147-1-niklas.soderlund@ragnatech.se> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The argument to enable parsing multiple frames from a single file (-n) was accidentally removed in 2012 in commit [1], and only fixed in 2025 by commit [2]. This feature makes it harder to fix other issues found in raw2rgbpnm and since it have been dead for ~13 years without anybody noticing likely have no users, remove it instead of trying to rework it. 1. Commit 5b6e56e54a93 ("Sort option names alphabetically and rename -r to -f") 2. Commit b0a28987d2e3 ("Add missing option to getopt()") Signed-off-by: Niklas Söderlund --- Hello, For what it's worth when I found and fixed this issue in [2] I was working on something else and the missing n to optarg poped out. I have no use-case for this feature so please don't count me fixing this in Jan as somebody is using this feature. --- raw2rgbpnm.c | 55 ++++++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 38 deletions(-) diff --git a/raw2rgbpnm.c b/raw2rgbpnm.c index 4cdef563e3c0..e5ed0af99070 100644 --- a/raw2rgbpnm.c +++ b/raw2rgbpnm.c @@ -146,17 +146,14 @@ static const int resolutions[][2] = { /* Read and return raw image data at given bits per pixel (bpp) depth. * size should be set correctly before calling this function. * If set to {-1,-1}, try to guess image file resolution. - * If framenum is set to nonnegative value, assume that input file contains - * multiple frames and return the given frame. In that case frame size must be given. */ -static unsigned char *read_raw_data(char *filename, int framenum, int size[2], int bpp) +static unsigned char *read_raw_data(char *filename, int size[2], int bpp) { /* Get file size */ unsigned int line_length; unsigned int padding = 0; unsigned char *b = NULL; unsigned int i; - int offset; FILE *f = fopen(filename, "rb"); if (!f) error("fopen failed"); int r = fseek(f, 0, SEEK_END); @@ -168,7 +165,6 @@ static unsigned char *read_raw_data(char *filename, int framenum, int size[2], i /* Check image resolution */ if (size[0]<=0 || size[1]<=0) { - if (framenum>=0) error("can not automatically detect frame size with multiple frames"); for (i=0; i= SIZE(resolutions)) error("can't guess raw image file resolution"); @@ -176,9 +172,9 @@ static unsigned char *read_raw_data(char *filename, int framenum, int size[2], i size[1] = resolutions[i][1]; } - if (framenum<0 && (file_size*8 < size[0]*size[1]*bpp)) error("out of input data"); - if (framenum<0 && (file_size*8 > size[0]*size[1]*bpp)) printf("warning: too large image file\n"); - if (framenum < 0 && (file_size % size[1] == 0)) { + if (file_size*8 < size[0]*size[1]*bpp) error("out of input data"); + if (file_size*8 > size[0]*size[1]*bpp) printf("warning: too large image file\n"); + if (file_size % size[1] == 0) { line_length = size[0] * bpp / 8; padding = file_size / size[1] - line_length; printf("%u padding bytes detected at end of line\n", padding); @@ -186,14 +182,6 @@ static unsigned char *read_raw_data(char *filename, int framenum, int size[2], i printf("warning: input size not multiple of frame size\n"); } - /* Go to the correct position in the file */ - if (framenum>=0) printf("Reading frame %i...\n", framenum); - if (framenum<0) framenum = 0; - offset = framenum*size[0]*size[1]*bpp/8; - r = fseek(f, offset, SEEK_SET); - if (r!=0) error("fseek"); - if ((file_size-offset)*8 < size[0]*size[1]*bpp) goto out; - /* Read data */ b = xalloc((size[0]*size[1]*bpp+7)/8); if (padding == 0) { @@ -210,7 +198,7 @@ static unsigned char *read_raw_data(char *filename, int framenum, int size[2], i error("fseek"); } } -out: fclose(f); + fclose(f); return b; } @@ -693,15 +681,13 @@ int main(int argc, char *argv[]) int size[2] = {-1,-1}; unsigned char *src, *dst; char *file_in = NULL, *file_out = NULL; - char multi_file_out[NAME_MAX]; int format = V4L2_PIX_FMT_UYVY; const struct format_info *info; int r; char *algorithm_name = NULL; - int n = 0, multiple = 0; for (;;) { - int c = getopt(argc, argv, "a:b:f:ghns:w"); + int c = getopt(argc, argv, "a:b:f:ghs:w"); if (c==-1) break; switch (c) { case 'a': @@ -747,13 +733,9 @@ int main(int argc, char *argv[]) "-f Specify input file format format (-f ? for list, default UYVY)\n" "-g Use high bits for Bayer RAW 10 data\n" "-h Show this help\n" - "-n Assume multiple input frames, extract several PNM files\n" "-s Specify image size\n" "-w Swap R and B channels\n", progname, argv[0]); exit(0); - case 'n': - multiple = 1; - break; case 's': if (parse_format(optarg, &size[0], &size[1]) < 0) { error("bad size"); @@ -780,23 +762,20 @@ int main(int argc, char *argv[]) } /* Read, convert, and save image */ - src = read_raw_data(file_in, multiple ? 0 : -1, size, info->bpp); + src = read_raw_data(file_in, size, info->bpp); printf("Image size: %ix%i, bytes per pixel: %i, format: %s\n", size[0], size[1], info->bpp, info->name); dst = xalloc(size[0]*size[1]*3); - do { - raw_to_rgb(info, src, size, dst); - sprintf(multi_file_out, "%s-%03i.pnm", file_out, n); - printf("Writing to file `%s'...\n", multiple ? multi_file_out : file_out); - f = fopen(multiple ? multi_file_out : file_out, "wb"); - if (!f) error("file open failed"); - fprintf(f, "P6\n%i %i\n255\n", size[0], size[1]); - r = fwrite(dst, size[0]*size[1]*3, 1, f); - if (r!=1) error("write failed"); - fclose(f); - if (!multiple) break; - src = read_raw_data(file_in, ++n, size, info->bpp); - } while (src != NULL); + + raw_to_rgb(info, src, size, dst); + printf("Writing to file `%s'...\n", file_out); + f = fopen(file_out, "wb"); + if (!f) error("file open failed"); + fprintf(f, "P6\n%i %i\n255\n", size[0], size[1]); + r = fwrite(dst, size[0]*size[1]*3, 1, f); + if (r!=1) error("write failed"); + fclose(f); + free(src); free(dst); return 0; From patchwork Wed Mar 12 19:17:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 873302 Received: from fout-b6-smtp.messagingengine.com (fout-b6-smtp.messagingengine.com [202.12.124.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29ED1257ACA for ; Wed, 12 Mar 2025 19:17:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.149 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741807085; cv=none; b=Z7sHThkFVuIFoJ5MyZV9jeAtwW3XQ1oiGXSBiMRc1F27DuwLWSlkLp6CiAYBT363LJln1doUA9MAgmILrehwEASdtSkjYlWt+tcGWGHCdGbqdZ1jJXEaeM1S7nw75wGl1BeyC3azHQyX4Xbd+6BBV4JKS0i2UNZbv1imVrQbmxM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741807085; c=relaxed/simple; bh=Wkx4gCvAe9LbJO+NqlntUcKS8anfIeqb7oQ5/ASYNiY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=r0t6eaSZVinAYMZTMTgSkq6DznVM4j/Qy+ZUstze56E18CN3wTROwHNoOG6dRgtjpnZL+s6Rr1QbzyOIdDLj33UOrnNBOcgKq6jZNPx5qAO+52DXwomTI260uL0ow0axkNI4sFTkR35PhbE+J5ickHdZ1be3vcHNc7/St1aFLuY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ragnatech.se; spf=pass smtp.mailfrom=ragnatech.se; dkim=pass (2048-bit key) header.d=ragnatech.se header.i=@ragnatech.se header.b=pUAI1vkc; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=ybY64IzJ; arc=none smtp.client-ip=202.12.124.149 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ragnatech.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ragnatech.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ragnatech.se header.i=@ragnatech.se header.b="pUAI1vkc"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="ybY64IzJ" Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfout.stl.internal (Postfix) with ESMTP id 305CC11400C0; Wed, 12 Mar 2025 15:17:58 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Wed, 12 Mar 2025 15:17:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech.se; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1741807078; x=1741893478; bh=9VW6HsZ7MZ+NznOFxRK5BLZzz1F7JyRChSdOW4AHUx4=; b= pUAI1vkcNViTy1hWC2iYeqMsqEyKP7x/HSnda1YTqlvn0N35+B2oLkpTQFbbdWvV t5ouUYXDdqnM26FxQdcDA+3MHVa4kil0CTV7goZB9AOc0Y+HJQTVVNcBmuMwnWDv 2ZtPzmsRwUOOMJm7BGaFHyyyki5YLCbEhQxGS+DRm+hUSgd0c3dDikq+YLSIaTa/ yPVE5LCDjfOwwV0p/Q75qYVAb1DXRvXROT7GzKIbiF5m4sK9TdA4uQmzjWuY7TNj p3ZciKeDCBhMV2mBQrm8ctNb0vC6KTx8aO4yYk13EySxW/Kp0JL3VMvGMOANfiLM hrm/5K26SbIC0Hepd3rjLA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1741807078; x= 1741893478; bh=9VW6HsZ7MZ+NznOFxRK5BLZzz1F7JyRChSdOW4AHUx4=; b=y bY64IzJ2lcM3nyvdwsv3c9QdVXT7IQLtMjzuA48yDcRECK45cQcf7xYKQF7OvOI1 ATss6t5PnZxu5F7ym50FGqKaE49xst4/hWIpmNSHbUSY/Pt9OQE/PyyeKJpLYHPd t7xe9t8me0DsYd1woCZcjD3DkUBfHtse/nlRbd665ugOHaInaRyA0HRpgfi6WqTZ 5Vhh+QtG53AWFesQGujO848tJNbMnrCOIoSQm8dlIp7jaQLh1pt2/6FFYbxYAPhi 72LVwkEI1tgzU6Bld/kyKtIzojZ0zxTKZVs1tAl0H8AIYDu7Ahyi9LGxLk7ZpIlj HoF0CEX5n/ItuCG6BfZJA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduvdehkeekucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpefpihhklhgrshcuufpnuggvrhhluhhnugcuoehnihhklhgrshdrsh houggvrhhluhhnugesrhgrghhnrghtvggthhdrshgvqeenucggtffrrghtthgvrhhnpedt jeegkeeiudffhefhgedugeefueekkeffgeeltdeifeekheejveeifeffheevueenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehnihhklhgrshdr shhouggvrhhluhhnugesrhgrghhnrghtvggthhdrshgvpdhnsggprhgtphhtthhopeegpd hmohguvgepshhmthhpohhuthdprhgtphhtthhopehsrghkrghrihdrrghilhhusheslhhi nhhugidrihhnthgvlhdrtghomhdprhgtphhtthhopehlrghurhgvnhhtrdhpihhntghhrg hrthesihguvggrshhonhgsohgrrhgurdgtohhmpdhrtghpthhtoheplhhinhhugidqmhgv ughirgesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehnihhklhgrshdrsh houggvrhhluhhnugesrhgrghhnrghtvggthhdrshgv X-ME-Proxy: Feedback-ID: i80c9496c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 12 Mar 2025 15:17:56 -0400 (EDT) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: Sakari Ailus , Laurent Pinchart Cc: linux-media@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [raw2rgbpnm 2/3] Remove guessing of source image size Date: Wed, 12 Mar 2025 20:17:09 +0100 Message-ID: <20250312191710.1823147-3-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250312191710.1823147-1-niklas.soderlund@ragnatech.se> References: <20250312191710.1823147-1-niklas.soderlund@ragnatech.se> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove the feature to guess a frame size from file size. This is an odd feature and the list of resolutions to guess from contains entries for '5 MP + a bit extra', which don't feel like a good standard resolution. This feature however block trying to make the function calls stricter by making it explicit which functions can, and can not, modify the frame size. Remove the guessing and tighten up the all function calls using the source image size. Signed-off-by: Niklas Söderlund --- Hello, This patch could possibly be reworked to keep the guessing, while still allowing for a stricter interface. But I'm in a cleaning mode and this guessing feels wrong. But if somebody is actually using it I would be happy to do the work. --- raw2rgbpnm.c | 195 +++++++++++++++++++++++---------------------------- 1 file changed, 87 insertions(+), 108 deletions(-) diff --git a/raw2rgbpnm.c b/raw2rgbpnm.c index e5ed0af99070..d8d4bb198498 100644 --- a/raw2rgbpnm.c +++ b/raw2rgbpnm.c @@ -130,24 +130,8 @@ static const struct format_info *get_format_info(__u32 f) return NULL; } -static const int resolutions[][2] = { - { 176, 144 }, /* QCIF */ - { 320, 240 }, /* QVGA */ - { 352, 288 }, /* CIF */ - { 640, 480 }, /* VGA */ - { 720, 576 }, /* PAL D1 */ - { 768, 576 }, /* 1:1 aspect PAL D1 */ - { 1920, 1440 }, /* 3VGA */ - { 2560, 1920 }, /* 4VGA */ - { 2592, 1944 }, /* 5 MP */ - { 2592, 1968 }, /* 5 MP + a bit extra */ -}; - -/* Read and return raw image data at given bits per pixel (bpp) depth. - * size should be set correctly before calling this function. - * If set to {-1,-1}, try to guess image file resolution. - */ -static unsigned char *read_raw_data(char *filename, int size[2], int bpp) +/* Read and return raw image data at given bits per pixel (bpp) depth. */ +static unsigned char *read_raw_data(char *filename, int width, int height, int bpp) { /* Get file size */ unsigned int line_length; @@ -163,33 +147,24 @@ static unsigned char *read_raw_data(char *filename, int size[2], int bpp) r = fseek(f, 0, SEEK_SET); if (r!=0) error("fseek"); - /* Check image resolution */ - if (size[0]<=0 || size[1]<=0) { - for (i=0; i= SIZE(resolutions)) error("can't guess raw image file resolution"); - size[0] = resolutions[i][0]; - size[1] = resolutions[i][1]; - } - - if (file_size*8 < size[0]*size[1]*bpp) error("out of input data"); - if (file_size*8 > size[0]*size[1]*bpp) printf("warning: too large image file\n"); - if (file_size % size[1] == 0) { - line_length = size[0] * bpp / 8; - padding = file_size / size[1] - line_length; + if (file_size*8 < width*height*bpp) error("out of input data"); + if (file_size*8 > width*height*bpp) printf("warning: too large image file\n"); + if (file_size % height == 0) { + line_length = width * bpp / 8; + padding = file_size / height - line_length; printf("%u padding bytes detected at end of line\n", padding); - } else if ((file_size * 8) % (size[0] * size[1] * bpp) != 0) { + } else if ((file_size * 8) % (width * height * bpp) != 0) { printf("warning: input size not multiple of frame size\n"); } /* Read data */ - b = xalloc((size[0]*size[1]*bpp+7)/8); + b = xalloc((width*height*bpp+7)/8); if (padding == 0) { - r = fread(b, (size[0]*size[1]*bpp+7)/8, 1, f); + r = fread(b, (width*height*bpp+7)/8, 1, f); if (r != 1) error("fread"); } else { - for (i = 0; i < (unsigned int)size[1]; ++i) { + for (i = 0; i < (unsigned int)height; ++i) { r = fread(b + i * line_length, line_length, 1, f); if (r != 1) error("fread"); @@ -203,10 +178,10 @@ static unsigned char *read_raw_data(char *filename, int size[2], int bpp) } static void raw_to_rgb(const struct format_info *info, - unsigned char *src, int src_size[2], unsigned char *rgb) + unsigned char *src, int src_width, int src_height, unsigned char *rgb) { - unsigned int src_stride = src_size[0] * info->bpp / 8; - unsigned int rgb_stride = src_size[0] * 3; + unsigned int src_stride = src_width * info->bpp / 8; + unsigned int rgb_stride = src_width * 3; unsigned char *src_luma, *src_chroma; unsigned char *src_cb, *src_cr; unsigned char *buf; @@ -229,8 +204,8 @@ static void raw_to_rgb(const struct format_info *info, cb_pos = info->cb_pos; cr_pos = info->cr_pos; - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { - for (src_x = 0, dst_x = 0; dst_x < src_size[0]; ) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { + for (src_x = 0, dst_x = 0; dst_x < src_width; ) { cb = src[src_y*src_stride + src_x*4 + cb_pos]; cr = src[src_y*src_stride + src_x*4 + cr_pos]; @@ -264,8 +239,8 @@ static void raw_to_rgb(const struct format_info *info, cb_pos = info->cb_pos; cr_pos = info->cr_pos; - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { - for (src_x = 0, dst_x = 0; dst_x < src_size[0]; ) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { + for (src_x = 0, dst_x = 0; dst_x < src_width; ) { a = src[src_y*src_stride + src_x*4 + y_pos]; cb = src[src_y*src_stride + src_x*4 + cb_pos]; cr = src[src_y*src_stride + src_x*4 + cr_pos]; @@ -287,13 +262,13 @@ static void raw_to_rgb(const struct format_info *info, /* fallthrough */ case V4L2_PIX_FMT_NV12: src_luma = src; - src_chroma = &src[src_size[0] * src_size[1]]; + src_chroma = &src[src_width * src_height]; src_stride = src_stride * 8 / 12; - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { cr = 0; - for (dst_x = 0, src_x = 0; dst_x < src_size[0]; ) { + for (dst_x = 0, src_x = 0; dst_x < src_width; ) { a = src_luma[dst_y*src_stride + dst_x]; cb = src_chroma[(dst_y/2)*src_stride + dst_x + 1 - color_pos]; yuv_to_rgb(a,cb,cr, &r, &g, &b); @@ -318,14 +293,14 @@ static void raw_to_rgb(const struct format_info *info, case V4L2_PIX_FMT_NV16: case V4L2_PIX_FMT_NV61: src_luma = src; - src_chroma = &src[src_size[0] * src_size[1]]; + src_chroma = &src[src_width * src_height]; src_stride = src_stride * 8 / 16; cb_pos = info->cb_pos; cr_pos = info->cr_pos; - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { - for (dst_x = 0, src_x = 0; dst_x < src_size[0]; ) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { + for (dst_x = 0, src_x = 0; dst_x < src_width; ) { cb = src_chroma[dst_y*src_stride + dst_x + cb_pos]; cr = src_chroma[dst_y*src_stride + dst_x + cr_pos]; @@ -350,12 +325,12 @@ static void raw_to_rgb(const struct format_info *info, case V4L2_PIX_FMT_YUV411P: src_luma = src; - src_cb = &src[src_size[0] * src_size[1]]; - src_cr = &src[src_size[0] * src_size[1] / 4 * 5]; + src_cb = &src[src_width * src_height]; + src_cr = &src[src_width * src_height / 4 * 5]; src_stride = src_stride * 8 / 12; - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { - for (dst_x = 0, src_x = 0; dst_x < src_size[0]; ) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { + for (dst_x = 0, src_x = 0; dst_x < src_width; ) { a = src_luma[dst_y*src_stride + dst_x]; cb = src_cb[dst_y*src_stride/4 + dst_x/4]; cr = src_cr[dst_y*src_stride/4 + dst_x/4]; @@ -374,16 +349,16 @@ static void raw_to_rgb(const struct format_info *info, case V4L2_PIX_FMT_YVU420: src_luma = src; if (info->cb_pos == 0) { - src_cb = &src[src_size[0] * src_size[1]]; - src_cr = &src[src_size[0] * src_size[1] / 4 * 5]; + src_cb = &src[src_width * src_height]; + src_cr = &src[src_width * src_height / 4 * 5]; } else { - src_cr = &src[src_size[0] * src_size[1]]; - src_cb = &src[src_size[0] * src_size[1] / 4 * 5]; + src_cr = &src[src_width * src_height]; + src_cb = &src[src_width * src_height / 4 * 5]; } src_stride = src_stride * 8 / 12; - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { - for (dst_x = 0, src_x = 0; dst_x < src_size[0]; ) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { + for (dst_x = 0, src_x = 0; dst_x < src_width; ) { a = src_luma[dst_y*src_stride + dst_x]; cb = src_cb[(dst_y/2)*src_stride/2 + dst_x/2]; cr = src_cr[(dst_y/2)*src_stride/2 + dst_x/2]; @@ -402,16 +377,16 @@ static void raw_to_rgb(const struct format_info *info, case V4L2_PIX_FMT_YVU422M: src_luma = src; if (info->cb_pos == 0) { - src_cb = &src[src_size[0] * src_size[1]]; - src_cr = &src[src_size[0] * src_size[1] / 2 * 3]; + src_cb = &src[src_width * src_height]; + src_cr = &src[src_width * src_height / 2 * 3]; } else { - src_cr = &src[src_size[0] * src_size[1]]; - src_cb = &src[src_size[0] * src_size[1] / 2 * 3]; + src_cr = &src[src_width * src_height]; + src_cb = &src[src_width * src_height / 2 * 3]; } src_stride = src_stride * 8 / 16; - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { - for (dst_x = 0, src_x = 0; dst_x < src_size[0]; ) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { + for (dst_x = 0, src_x = 0; dst_x < src_width; ) { a = src_luma[dst_y*src_stride + dst_x]; cb = src_cb[dst_y*src_stride/2 + dst_x/2]; cr = src_cr[dst_y*src_stride/2 + dst_x/2]; @@ -430,16 +405,16 @@ static void raw_to_rgb(const struct format_info *info, case V4L2_PIX_FMT_YVU444M: src_luma = src; if (info->cb_pos == 0) { - src_cb = &src[src_size[0] * src_size[1]]; - src_cr = &src[src_size[0] * src_size[1] * 2]; + src_cb = &src[src_width * src_height]; + src_cr = &src[src_width * src_height * 2]; } else { - src_cr = &src[src_size[0] * src_size[1]]; - src_cb = &src[src_size[0] * src_size[1] * 2]; + src_cr = &src[src_width * src_height]; + src_cb = &src[src_width * src_height * 2]; } src_stride = src_stride * 8 / 24; - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { - for (dst_x = 0, src_x = 0; dst_x < src_size[0]; ) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { + for (dst_x = 0, src_x = 0; dst_x < src_width; ) { a = src_luma[dst_y*src_stride + dst_x]; cb = src_cb[dst_y*src_stride + dst_x]; cr = src_cr[dst_y*src_stride + dst_x]; @@ -458,8 +433,8 @@ static void raw_to_rgb(const struct format_info *info, case V4L2_PIX_FMT_Y12: case V4L2_PIX_FMT_Y10: shift = info->bpc - 8; - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { - for (src_x = 0, dst_x = 0; dst_x < src_size[0]; ) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { + for (src_x = 0, dst_x = 0; dst_x < src_width; ) { a = (src[src_y*src_stride + src_x*2+0] | (src[src_y*src_stride + src_x*2+1] << 8)) >> shift; rgb[dst_y*rgb_stride+3*dst_x+0] = a; @@ -472,8 +447,8 @@ static void raw_to_rgb(const struct format_info *info, break; case V4L2_PIX_FMT_GREY: - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { - for (src_x = 0, dst_x = 0; dst_x < src_size[0]; ) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { + for (src_x = 0, dst_x = 0; dst_x < src_width; ) { a = src[src_y*src_stride + src_x]; rgb[dst_y*rgb_stride+3*dst_x+0] = a; rgb[dst_y*rgb_stride+3*dst_x+1] = a; @@ -504,8 +479,8 @@ static void raw_to_rgb(const struct format_info *info, case V4L2_PIX_FMT_SGRBG10: shift = info->bpc - 10; - for (dst_y=0; dst_y> 7) & 0xf8; @@ -591,8 +566,8 @@ static void raw_to_rgb(const struct format_info *info, break; case V4L2_PIX_FMT_RGB565: - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { - for (src_x = 0, dst_x = 0; dst_x < src_size[0]; ) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { + for (src_x = 0, dst_x = 0; dst_x < src_width; ) { pixel = (src[dst_y*src_stride + dst_x*2 + 1] << 8) | src[dst_y*src_stride + dst_x*2 + 0]; r = (pixel >> 8) & 0xf8; @@ -611,8 +586,8 @@ static void raw_to_rgb(const struct format_info *info, swaprb = !swaprb; /* fallthrough */ case V4L2_PIX_FMT_RGB24: - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { - for (src_x = 0, dst_x = 0; dst_x < src_size[0]; ) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { + for (src_x = 0, dst_x = 0; dst_x < src_width; ) { r = src[dst_y*src_stride + dst_x*3 + 0]; g = src[dst_y*src_stride + dst_x*3 + 1]; b = src[dst_y*src_stride + dst_x*3 + 2]; @@ -626,8 +601,8 @@ static void raw_to_rgb(const struct format_info *info, break; case V4L2_PIX_FMT_BGR32: - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { - for (src_x = 0, dst_x = 0; dst_x < src_size[0]; ) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { + for (src_x = 0, dst_x = 0; dst_x < src_width; ) { r = src[dst_y*src_stride + dst_x*4 + 2]; g = src[dst_y*src_stride + dst_x*4 + 1]; b = src[dst_y*src_stride + dst_x*4 + 0]; @@ -641,8 +616,8 @@ static void raw_to_rgb(const struct format_info *info, break; case V4L2_PIX_FMT_RGB32: - for (src_y = 0, dst_y = 0; dst_y < src_size[1]; src_y++, dst_y++) { - for (src_x = 0, dst_x = 0; dst_x < src_size[0]; ) { + for (src_y = 0, dst_y = 0; dst_y < src_height; src_y++, dst_y++) { + for (src_x = 0, dst_x = 0; dst_x < src_width; ) { r = src[dst_y*src_stride + dst_x*4 + 1]; g = src[dst_y*src_stride + dst_x*4 + 2]; b = src[dst_y*src_stride + dst_x*4 + 3]; @@ -678,13 +653,14 @@ static int parse_format(const char *p, int *w, int *h) int main(int argc, char *argv[]) { FILE *f; - int size[2] = {-1,-1}; unsigned char *src, *dst; char *file_in = NULL, *file_out = NULL; int format = V4L2_PIX_FMT_UYVY; const struct format_info *info; int r; char *algorithm_name = NULL; + int height = -1; + int width = -1; for (;;) { int c = getopt(argc, argv, "a:b:f:ghs:w"); @@ -737,7 +713,7 @@ int main(int argc, char *argv[]) "-w Swap R and B channels\n", progname, argv[0]); exit(0); case 's': - if (parse_format(optarg, &size[0], &size[1]) < 0) { + if (parse_format(optarg, &width, &height) < 0) { error("bad size"); exit(0); } @@ -750,6 +726,9 @@ int main(int argc, char *argv[]) } } + if (width < 0 || height < 0) + error("specify image size"); + if (algorithm_name != NULL) qc_set_algorithm(algorithm_name); if (argc-optind != 2) error("give input and output files"); file_in = argv[optind++]; @@ -762,17 +741,17 @@ int main(int argc, char *argv[]) } /* Read, convert, and save image */ - src = read_raw_data(file_in, size, info->bpp); - printf("Image size: %ix%i, bytes per pixel: %i, format: %s\n", size[0], size[1], - info->bpp, info->name); - dst = xalloc(size[0]*size[1]*3); + src = read_raw_data(file_in, width, height, info->bpp); + printf("Image size: %ix%i, bytes per pixel: %i, format: %s\n", + width, height, info->bpp, info->name); + dst = xalloc(width*height*3); - raw_to_rgb(info, src, size, dst); + raw_to_rgb(info, src, width, height, dst); printf("Writing to file `%s'...\n", file_out); f = fopen(file_out, "wb"); if (!f) error("file open failed"); - fprintf(f, "P6\n%i %i\n255\n", size[0], size[1]); - r = fwrite(dst, size[0]*size[1]*3, 1, f); + fprintf(f, "P6\n%i %i\n255\n", width, height); + r = fwrite(dst, width*height*3, 1, f); if (r!=1) error("write failed"); fclose(f); From patchwork Wed Mar 12 19:17:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 872982 Received: from fout-b6-smtp.messagingengine.com (fout-b6-smtp.messagingengine.com [202.12.124.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E6611D79A0 for ; Wed, 12 Mar 2025 19:18:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.149 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741807083; cv=none; b=aPIEUXFX2QC4Puxo3XeCubXnRasbslbv1MIhfqEsKiD3BJNhxJ6kVK8RPR4pHasWHJ1BYqn6oxmTrqR3fzVicvZhbVY6SfxLTvFJDuV9eRGNKl6xm889JOK4k37mstLD+Zy8hNA/Y/GVVlECaulNiZRX82Xbwhx47PrHznmCkf0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741807083; c=relaxed/simple; bh=1shuGN1fmfMh/ncO2CqgDZ375XDzzKrVtaalnYg891c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IqTpdI8jASr2dECrJ+gF5PemtSlIhULQg5LMWRtRp4S6kItTTjAM40srXG051CMljygaYAaBI/YmnN19ICmXBvKaFlGpjDK9DbLWj/FluVSRSFlpCHntj4CG5wmESJBmlY3796x3cHN7eSzk6r7nyx/KfwThfJhJDEuL/G7s2OQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ragnatech.se; spf=pass smtp.mailfrom=ragnatech.se; dkim=pass (2048-bit key) header.d=ragnatech.se header.i=@ragnatech.se header.b=jVZQYja1; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=V3CeWC67; arc=none smtp.client-ip=202.12.124.149 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ragnatech.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ragnatech.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ragnatech.se header.i=@ragnatech.se header.b="jVZQYja1"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="V3CeWC67" Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfout.stl.internal (Postfix) with ESMTP id 6ECC61140166; Wed, 12 Mar 2025 15:18:00 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-10.internal (MEProxy); Wed, 12 Mar 2025 15:18:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech.se; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1741807080; x=1741893480; bh=Z6NSzSxPnKynhriOxdCiZBxvLt4HWN908taU8hGlNCk=; b= jVZQYja1xm6wghYmo9E0WixY7cNTZm84cvbZgbvBqjGVcRDIOCJP6zE5GATZ+K4V ERNdQ7G1TzvFokP3f+7oyihOBr6pNRBTH9rMjKiC5N+8hDOj73flTwQ75bra9rC0 CeR71y9DxsmIVr4yYqJ5fQaBoWYKGkOosvKWKzFR58JL2VNT6H5LB42nXw6rYldR i4tnTmCDo9Zd1iA+UnyMMMGPckZzwi6eIo6YBOTYYKqvmxVPuJE7So9duTFBGWt+ BPVcUbL5y+GEJ7fO3/bw4sf6Y0FvVVKg10YR7yRSckpDAzM8+BE6JcA/Pru84eiA uhNlMnburY0lwkBHnnNfOg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1741807080; x= 1741893480; bh=Z6NSzSxPnKynhriOxdCiZBxvLt4HWN908taU8hGlNCk=; b=V 3CeWC67w9sMwndB0JQbOugdCV7a63gx4ELur/7rYiTR6UjPGPefc83goAe9nEl2F MGR3HeYTAYfpWApEvGAMhRb4aK0IMHauJRAeJNsKH9oJDzath536u50U2ioiBtWm eH3N67q73QGoS2aMIl8dpqlGpIO3FNJGcrm//t/vDDr7KUZyKqmIM77VTvHnJ90F ZzVP66mB9k3pw74db+1gYeYc5AQE2mjdnzx8y+ctaWK44NzVzKsgq3dHT5Hvz1Nl ZFHuY76aV2CIjx5PmJCSKYCuiPm4cR1otm7CX8QAxR9aJipSOa7MpxYhG+wfCklb RWi2hOe9i8gBpUVMSZsEA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduvdehkeelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpefpihhklhgrshcuufpnuggvrhhluhhnugcuoehnihhklhgrshdrsh houggvrhhluhhnugesrhgrghhnrghtvggthhdrshgvqeenucggtffrrghtthgvrhhnpedt jeegkeeiudffhefhgedugeefueekkeffgeeltdeifeekheejveeifeffheevueenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehnihhklhgrshdr shhouggvrhhluhhnugesrhgrghhnrghtvggthhdrshgvpdhnsggprhgtphhtthhopeegpd hmohguvgepshhmthhpohhuthdprhgtphhtthhopehsrghkrghrihdrrghilhhusheslhhi nhhugidrihhnthgvlhdrtghomhdprhgtphhtthhopehlrghurhgvnhhtrdhpihhntghhrg hrthesihguvggrshhonhgsohgrrhgurdgtohhmpdhrtghpthhtoheplhhinhhugidqmhgv ughirgesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehnihhklhgrshdrsh houggvrhhluhhnugesrhgrghhnrghtvggthhdrshgv X-ME-Proxy: Feedback-ID: i80c9496c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 12 Mar 2025 15:17:59 -0400 (EDT) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: Sakari Ailus , Laurent Pinchart Cc: linux-media@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [raw2rgbpnm 3/3] Add support for multi plane formats with stride Date: Wed, 12 Mar 2025 20:17:10 +0100 Message-ID: <20250312191710.1823147-4-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250312191710.1823147-1-niklas.soderlund@ragnatech.se> References: <20250312191710.1823147-1-niklas.soderlund@ragnatech.se> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Parsing NV16 that have a stride that is larger then the image width results in incorrect frames, and no warning message being printed. Fix this by extending the format information structure with how many (concatenated) planes an image is constructed of. And by extending the raw reader to take this information into account. With this change it is possible to parse NV12, NV21, NV16, and NV61 frames from disk with a stride larger then the image width and have correct frames produced. Signed-off-by: Niklas Söderlund --- raw2rgbpnm.c | 121 +++++++++++++++++++++++++++------------------------ 1 file changed, 65 insertions(+), 56 deletions(-) diff --git a/raw2rgbpnm.c b/raw2rgbpnm.c index d8d4bb198498..5838bc7347e9 100644 --- a/raw2rgbpnm.c +++ b/raw2rgbpnm.c @@ -55,60 +55,61 @@ static const struct format_info { unsigned int y_pos; unsigned int cb_pos; unsigned int cr_pos; + unsigned int planes; } v4l2_pix_fmt_str[] = { - { V4L2_PIX_FMT_RGB332, 8, 0, "RGB332 (8 RGB-3-3-2)", 0, 0, 0 }, - { V4L2_PIX_FMT_RGB555, 16, 5, "RGB555 (16 RGB-5-5-5)", 0, 0, 0 }, - { V4L2_PIX_FMT_RGB565, 16, 0, "RGB565 (16 RGB-5-6-5)", 0, 0, 0 }, - { V4L2_PIX_FMT_BGR24, 24, 8, "BGR24 (24 BGR-8-8-8)", 0, 0, 0 }, - { V4L2_PIX_FMT_RGB24, 24, 8, "RGB24 (24 RGB-8-8-8)", 0, 0, 0 }, - { V4L2_PIX_FMT_BGR32, 32, 8, "BGR32 (32 BGR-8-8-8-8)", 0, 0, 0 }, - { V4L2_PIX_FMT_RGB32, 32, 8, "RGB32 (32 RGB-8-8-8-8)", 0, 0, 0 }, - { V4L2_PIX_FMT_GREY, 8, 8, "GREY (8 Greyscale)", 0, 0, 0 }, - { V4L2_PIX_FMT_Y10, 16, 10, "Y10 (10 Greyscale)", 0, 0, 0 }, - { V4L2_PIX_FMT_Y12, 16, 12, "Y12 (12 Greyscale)", 0, 0, 0 }, - { V4L2_PIX_FMT_Y16, 16, 16, "Y16 (16 Greyscale)", 0, 0, 0 }, - { V4L2_PIX_FMT_UYVY, 16, 8, "UYVY (16 YUV 4:2:2)", 1, 0, 2 }, - { V4L2_PIX_FMT_VYUY, 16, 8, "VYUY (16 YUV 4:2:2)", 1, 2, 0 }, - { V4L2_PIX_FMT_YUYV, 16, 8, "YUYV (16 YUV 4:2:2)", 0, 1, 3 }, - { V4L2_PIX_FMT_YVYU, 16, 8, "YVYU (16 YUV 4:2:2)", 0, 3, 1 }, - { V4L2_PIX_FMT_YUV32, 32, 8, "YUV32 (32-bit A/XYUV 8-8-8-8)", 1, 2, 3 }, - { V4L2_PIX_FMT_AYUV32, 32, 8, "AYUV32 (32-bit AYUV 8-8-8-8)", 1, 2, 3 }, - { V4L2_PIX_FMT_XYUV32, 32, 8, "XYUV32 (32-bit XYUV 8-8-8-8)", 1, 2, 3 }, - { V4L2_PIX_FMT_VUYA32, 32, 8, "VUYA32 (32-bit VUYA 8-8-8-8)", 2, 1, 0 }, - { V4L2_PIX_FMT_VUYX32, 32, 8, "VUYX32 (32-bit VUYX 8-8-8-8)", 2, 1, 0 }, - { V4L2_PIX_FMT_YUVA32, 32, 8, "YUVA32 (32-bit YUVA 8-8-8-8)", 0, 1, 2 }, - { V4L2_PIX_FMT_YUVX32, 32, 8, "YUVX32 (32-bit YUVX 8-8-8-8)", 0, 1, 2 }, - { V4L2_PIX_FMT_YUV411P, 12, 8, "YUV411P (12 YUV 4:1:1 planar)", 0, 0, 1 }, - { V4L2_PIX_FMT_YUV420, 12, 8, "YUV420P (12 YUV 4:2:0 planar)", 0, 0, 1 }, - { V4L2_PIX_FMT_YVU420, 12, 8, "YVU420P (12 YVU 4:2:2 planar)", 0, 1, 0 }, - { V4L2_PIX_FMT_YUV422P, 16, 8, "YUV422P (16 YUV 4:2:2 planar)", 0, 0, 1 }, - { V4L2_PIX_FMT_YVU422M, 16, 8, "YVU422P (16 YVU 4:2:2 planar)", 0, 1, 0 }, - { V4L2_PIX_FMT_YUV444M, 24, 8, "YUV444P (24 YUV 4:4:4 planar)", 0, 0, 1 }, - { V4L2_PIX_FMT_YVU444M, 24, 8, "YVU444P (24 YVU 4:4:4 planar)", 0, 1, 0 }, - { V4L2_PIX_FMT_NV12, 12, 8, "NV12 (12 Y/CbCr 4:2:0)", 0, 0, 1 }, - { V4L2_PIX_FMT_NV21, 12, 8, "NV21 (12 Y/CrCb 4:2:0)", 0, 1, 0 }, - { V4L2_PIX_FMT_NV16, 16, 8, "NV16 (16 Y/CbCr 4:2:2)", 0, 0, 1 }, - { V4L2_PIX_FMT_NV61, 16, 8, "NV61 (16 Y/CrCb 4:2:2)", 0, 1, 0 }, - { V4L2_PIX_FMT_SBGGR8, 8, 8, "SBGGR8 (8 BGBG.. GRGR..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SGBRG8, 8, 8, "SGBRG8 (8 GBGB.. RGRG..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SGRBG8, 8, 8, "SGRBG8 (8 GRGR.. BGBG..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SRGGB8, 8, 8, "SRGGB8 (8 RGRG.. GBGB..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SBGGR10, 16, 10, "SBGGR10 (10 BGBG.. GRGR..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SGBRG10, 16, 10, "SGBRG10 (10 GBGB.. RGRG..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SGRBG10, 16, 10, "SGRBG10 (10 GRGR.. BGBG..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SRGGB10, 16, 10, "SRGGB10 (10 RGRG.. GBGB..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SBGGR12, 16, 12, "SBGGR12 (12 BGBG.. GRGR..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SGBRG12, 16, 12, "SGBRG12 (12 GBGB.. RGRG..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SGRBG12, 16, 12, "SGRBG12 (12 GRGR.. BGBG..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SRGGB12, 16, 12, "SRGGB12 (12 RGRG.. GBGB..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SBGGR14, 16, 14, "SBGGR14 (14 BGBG.. GRGR..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SGBRG14, 16, 14, "SGBRG14 (14 GBGB.. RGRG..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SGRBG14, 16, 14, "SGRBG14 (14 GRGR.. BGBG..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SRGGB14, 16, 14, "SRGGB14 (14 RGRG.. GBGB..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SBGGR16, 16, 16, "SBGGR16 (16 BGBG.. GRGR..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SGBRG16, 16, 16, "SGBRG16 (16 GBGB.. RGRG..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SGRBG16, 16, 16, "SGRBG16 (16 GRGR.. BGBG..)", 0, 0, 0 }, - { V4L2_PIX_FMT_SRGGB16, 16, 16, "SRGGB16 (16 RGRG.. GBGB..)", 0, 0, 0 }, + { V4L2_PIX_FMT_RGB332, 8, 0, "RGB332 (8 RGB-3-3-2)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_RGB555, 16, 5, "RGB555 (16 RGB-5-5-5)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_RGB565, 16, 0, "RGB565 (16 RGB-5-6-5)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_BGR24, 24, 8, "BGR24 (24 BGR-8-8-8)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_RGB24, 24, 8, "RGB24 (24 RGB-8-8-8)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_BGR32, 32, 8, "BGR32 (32 BGR-8-8-8-8)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_RGB32, 32, 8, "RGB32 (32 RGB-8-8-8-8)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_GREY, 8, 8, "GREY (8 Greyscale)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_Y10, 16, 10, "Y10 (10 Greyscale)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_Y12, 16, 12, "Y12 (12 Greyscale)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_Y16, 16, 16, "Y16 (16 Greyscale)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_UYVY, 16, 8, "UYVY (16 YUV 4:2:2)", 1, 0, 2, 1 }, + { V4L2_PIX_FMT_VYUY, 16, 8, "VYUY (16 YUV 4:2:2)", 1, 2, 0, 1 }, + { V4L2_PIX_FMT_YUYV, 16, 8, "YUYV (16 YUV 4:2:2)", 0, 1, 3, 1 }, + { V4L2_PIX_FMT_YVYU, 16, 8, "YVYU (16 YUV 4:2:2)", 0, 3, 1, 1 }, + { V4L2_PIX_FMT_YUV32, 32, 8, "YUV32 (32-bit A/XYUV 8-8-8-8)", 1, 2, 3, 1 }, + { V4L2_PIX_FMT_AYUV32, 32, 8, "AYUV32 (32-bit AYUV 8-8-8-8)", 1, 2, 3, 1 }, + { V4L2_PIX_FMT_XYUV32, 32, 8, "XYUV32 (32-bit XYUV 8-8-8-8)", 1, 2, 3, 1 }, + { V4L2_PIX_FMT_VUYA32, 32, 8, "VUYA32 (32-bit VUYA 8-8-8-8)", 2, 1, 0, 1 }, + { V4L2_PIX_FMT_VUYX32, 32, 8, "VUYX32 (32-bit VUYX 8-8-8-8)", 2, 1, 0, 1 }, + { V4L2_PIX_FMT_YUVA32, 32, 8, "YUVA32 (32-bit YUVA 8-8-8-8)", 0, 1, 2, 1 }, + { V4L2_PIX_FMT_YUVX32, 32, 8, "YUVX32 (32-bit YUVX 8-8-8-8)", 0, 1, 2, 1 }, + { V4L2_PIX_FMT_YUV411P, 12, 8, "YUV411P (12 YUV 4:1:1 planar)", 0, 0, 1, 1 }, + { V4L2_PIX_FMT_YUV420, 12, 8, "YUV420P (12 YUV 4:2:0 planar)", 0, 0, 1, 1 }, + { V4L2_PIX_FMT_YVU420, 12, 8, "YVU420P (12 YVU 4:2:2 planar)", 0, 1, 0, 1 }, + { V4L2_PIX_FMT_YUV422P, 16, 8, "YUV422P (16 YUV 4:2:2 planar)", 0, 0, 1, 1 }, + { V4L2_PIX_FMT_YVU422M, 16, 8, "YVU422P (16 YVU 4:2:2 planar)", 0, 1, 0, 1 }, + { V4L2_PIX_FMT_YUV444M, 24, 8, "YUV444P (24 YUV 4:4:4 planar)", 0, 0, 1, 1 }, + { V4L2_PIX_FMT_YVU444M, 24, 8, "YVU444P (24 YVU 4:4:4 planar)", 0, 1, 0, 1 }, + { V4L2_PIX_FMT_NV12, 12, 8, "NV12 (12 Y/CbCr 4:2:0)", 0, 0, 1, 2 }, + { V4L2_PIX_FMT_NV21, 12, 8, "NV21 (12 Y/CrCb 4:2:0)", 0, 1, 0, 2 }, + { V4L2_PIX_FMT_NV16, 16, 8, "NV16 (16 Y/CbCr 4:2:2)", 0, 0, 1, 2 }, + { V4L2_PIX_FMT_NV61, 16, 8, "NV61 (16 Y/CrCb 4:2:2)", 0, 1, 0, 2 }, + { V4L2_PIX_FMT_SBGGR8, 8, 8, "SBGGR8 (8 BGBG.. GRGR..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SGBRG8, 8, 8, "SGBRG8 (8 GBGB.. RGRG..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SGRBG8, 8, 8, "SGRBG8 (8 GRGR.. BGBG..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SRGGB8, 8, 8, "SRGGB8 (8 RGRG.. GBGB..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SBGGR10, 16, 10, "SBGGR10 (10 BGBG.. GRGR..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SGBRG10, 16, 10, "SGBRG10 (10 GBGB.. RGRG..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SGRBG10, 16, 10, "SGRBG10 (10 GRGR.. BGBG..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SRGGB10, 16, 10, "SRGGB10 (10 RGRG.. GBGB..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SBGGR12, 16, 12, "SBGGR12 (12 BGBG.. GRGR..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SGBRG12, 16, 12, "SGBRG12 (12 GBGB.. RGRG..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SGRBG12, 16, 12, "SGRBG12 (12 GRGR.. BGBG..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SRGGB12, 16, 12, "SRGGB12 (12 RGRG.. GBGB..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SBGGR14, 16, 14, "SBGGR14 (14 BGBG.. GRGR..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SGBRG14, 16, 14, "SGBRG14 (14 GBGB.. RGRG..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SGRBG14, 16, 14, "SGRBG14 (14 GRGR.. BGBG..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SRGGB14, 16, 14, "SRGGB14 (14 RGRG.. GBGB..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SBGGR16, 16, 16, "SBGGR16 (16 BGBG.. GRGR..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SGBRG16, 16, 16, "SGBRG16 (16 GBGB.. RGRG..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SGRBG16, 16, 16, "SGRBG16 (16 GRGR.. BGBG..)", 0, 0, 0, 1 }, + { V4L2_PIX_FMT_SRGGB16, 16, 16, "SRGGB16 (16 RGRG.. GBGB..)", 0, 0, 0, 1 }, }; static void *xalloc(int size) @@ -130,14 +131,17 @@ static const struct format_info *get_format_info(__u32 f) return NULL; } -/* Read and return raw image data at given bits per pixel (bpp) depth. */ -static unsigned char *read_raw_data(char *filename, int width, int height, int bpp) +/* Read and return image data at given width, height and format information. */ +static unsigned char *read_raw_data(char *filename, int width, int height, + const struct format_info *info) { /* Get file size */ unsigned int line_length; unsigned int padding = 0; unsigned char *b = NULL; unsigned int i; + int bpp = info->bpp; + FILE *f = fopen(filename, "rb"); if (!f) error("fopen failed"); int r = fseek(f, 0, SEEK_END); @@ -147,6 +151,11 @@ static unsigned char *read_raw_data(char *filename, int width, int height, int b r = fseek(f, 0, SEEK_SET); if (r!=0) error("fseek"); + if (info->planes > 1) { + bpp = info->bpc; + height *= info->planes; + } + if (file_size*8 < width*height*bpp) error("out of input data"); if (file_size*8 > width*height*bpp) printf("warning: too large image file\n"); if (file_size % height == 0) { @@ -741,7 +750,7 @@ int main(int argc, char *argv[]) } /* Read, convert, and save image */ - src = read_raw_data(file_in, width, height, info->bpp); + src = read_raw_data(file_in, width, height, info); printf("Image size: %ix%i, bytes per pixel: %i, format: %s\n", width, height, info->bpp, info->name); dst = xalloc(width*height*3);