[{"id":24438,"web_url":"https://patchwork.libcamera.org/comment/24438/","msgid":"","date":"2022-08-08T19:22:56","subject":"Re: [libcamera-devel] [PATCH 2/2] cam: sdl_texture: Renaming\n\t'pitch' to 'stride'","submitter":{"id":101,"url":"https://patchwork.libcamera.org/api/people/101/","name":"Eric Curtin","email":"ecurtin@redhat.com"},"content":"On Mon, 8 Aug 2022 at 16:56, Laurent Pinchart\n wrote:\n>\n> The libcamera public API uses 'stride' to refer to the line stride.\n> Rename the SDLTexture::pitch_ member variable for consistency.\n>\n> Signed-off-by: Laurent Pinchart \n\nLGTM\n\nReviewed-by: Eric Curtin \n\n> ---\n> src/cam/sdl_texture.cpp | 4 ++--\n> src/cam/sdl_texture.h | 4 ++--\n> src/cam/sdl_texture_mjpg.cpp | 6 +++---\n> src/cam/sdl_texture_yuv.cpp | 6 +++---\n> 4 files changed, 10 insertions(+), 10 deletions(-)\n>\n> diff --git a/src/cam/sdl_texture.cpp b/src/cam/sdl_texture.cpp\n> index 02a8ff28b669..e9040bc5f67e 100644\n> --- a/src/cam/sdl_texture.cpp\n> +++ b/src/cam/sdl_texture.cpp\n> @@ -10,8 +10,8 @@\n> #include \n>\n> SDLTexture::SDLTexture(const SDL_Rect &rect, uint32_t pixelFormat,\n> - const int pitch)\n> - : ptr_(nullptr), rect_(rect), pixelFormat_(pixelFormat), pitch_(pitch)\n> + const int stride)\n> + : ptr_(nullptr), rect_(rect), pixelFormat_(pixelFormat), stride_(stride)\n> {\n> }\n>\n> diff --git a/src/cam/sdl_texture.h b/src/cam/sdl_texture.h\n> index e4d3fb2bcf39..6ccd85eab390 100644\n> --- a/src/cam/sdl_texture.h\n> +++ b/src/cam/sdl_texture.h\n> @@ -16,7 +16,7 @@\n> class SDLTexture\n> {\n> public:\n> - SDLTexture(const SDL_Rect &rect, uint32_t pixelFormat, const int pitch);\n> + SDLTexture(const SDL_Rect &rect, uint32_t pixelFormat, const int stride);\n> virtual ~SDLTexture();\n> int create(SDL_Renderer *renderer);\n> virtual void update(const std::vector> &data) = 0;\n> @@ -26,5 +26,5 @@ protected:\n> SDL_Texture *ptr_;\n> const SDL_Rect rect_;\n> const uint32_t pixelFormat_;\n> - const int pitch_;\n> + const int stride_;\n> };\n> diff --git a/src/cam/sdl_texture_mjpg.cpp b/src/cam/sdl_texture_mjpg.cpp\n> index 8dd5ee3eb6bc..da958e0372af 100644\n> --- a/src/cam/sdl_texture_mjpg.cpp\n> +++ b/src/cam/sdl_texture_mjpg.cpp\n> @@ -39,7 +39,7 @@ struct JpegErrorManager : public jpeg_error_mgr {\n>\n> SDLTextureMJPG::SDLTextureMJPG(const SDL_Rect &rect)\n> : SDLTexture(rect, SDL_PIXELFORMAT_RGB24, rect.w * 3),\n> - rgb_(std::make_unique(pitch_ * rect.h))\n> + rgb_(std::make_unique(stride_ * rect.h))\n> {\n> }\n>\n> @@ -65,7 +65,7 @@ int SDLTextureMJPG::decompress(Span data)\n> jpeg_start_decompress(&cinfo);\n>\n> for (int i = 0; cinfo.output_scanline < cinfo.output_height; ++i) {\n> - JSAMPROW rowptr = rgb_.get() + i * pitch_;\n> + JSAMPROW rowptr = rgb_.get() + i * stride_;\n> jpeg_read_scanlines(&cinfo, &rowptr, 1);\n> }\n>\n> @@ -79,5 +79,5 @@ int SDLTextureMJPG::decompress(Span data)\n> void SDLTextureMJPG::update(const std::vector> &data)\n> {\n> decompress(data[0]);\n> - SDL_UpdateTexture(ptr_, nullptr, rgb_.get(), pitch_);\n> + SDL_UpdateTexture(ptr_, nullptr, rgb_.get(), stride_);\n> }\n> diff --git a/src/cam/sdl_texture_yuv.cpp b/src/cam/sdl_texture_yuv.cpp\n> index aa424559abd7..b29c3b937265 100644\n> --- a/src/cam/sdl_texture_yuv.cpp\n> +++ b/src/cam/sdl_texture_yuv.cpp\n> @@ -17,8 +17,8 @@ SDLTextureNV12::SDLTextureNV12(const SDL_Rect &rect, unsigned int stride)\n>\n> void SDLTextureNV12::update(const std::vector> &data)\n> {\n> - SDL_UpdateNVTexture(ptr_, &rect_, data[0].data(), pitch_,\n> - data[1].data(), pitch_);\n> + SDL_UpdateNVTexture(ptr_, &rect_, data[0].data(), stride_,\n> + data[1].data(), stride_);\n> }\n> #endif\n>\n> @@ -29,5 +29,5 @@ SDLTextureYUYV::SDLTextureYUYV(const SDL_Rect &rect, unsigned int stride)\n>\n> void SDLTextureYUYV::update(const std::vector> &data)\n> {\n> - SDL_UpdateTexture(ptr_, &rect_, data[0].data(), pitch_);\n> + SDL_UpdateTexture(ptr_, &rect_, data[0].data(), stride_);\n> }\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 95C3FC3275\n\tfor ;\n\tMon, 8 Aug 2022 19:23:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 75B4C6332E;\n\tMon, 8 Aug 2022 21:23:17 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A442063327\n\tfor ;\n\tMon, 8 Aug 2022 21:23:15 +0200 (CEST)","from mail-qk1-f197.google.com (mail-qk1-f197.google.com\n\t[209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n\tus-mta-191-tFQC64V8OK694drX23UIFA-1; Mon, 08 Aug 2022 15:23:13 -0400","by mail-qk1-f197.google.com with SMTP id\n\tn15-20020a05620a294f00b006b5768a0ed0so8516634qkp.7\n\tfor ;\n\tMon, 08 Aug 2022 12:23:12 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659986597;\n\tbh=YzvkBINzGVB+MYt4hGgspAPXow9WEiw6Srcgu8KZs8Q=;\n\th=References:In-Reply-To:Date:To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=aChVzvL+0nYp625fYqyVidIAv6Z5ohSk2EmLjTjkBVxsalqGfs9QJjHpUt2H7VZnc\n\tJ8X8/RkKphl0OujKtp9MTiGKo0/kenQA9YGaP2SWtjsvbCZdxYmgSxGgAfPXRlRdDx\n\t13K1dpCPIPVbQhkfpbr86nbalxlY1KRfjdOvsYSBIoudMdDBzleogg0JvVH0F3cX7Z\n\t32fzNSji0D5n3aYmNZTf2zFvEspw6TUWWahinpI+WXkhV7HNcjjqksIORiLLke3G3i\n\tA6v4bAjVdVJJ9zsiMbInnXR2cKIrIrQmdQS8sKx+TKu0DCNx7Jn6/YtMpT7m9Xxt8O\n\t/PkBbUWSlJ0GA==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1659986594;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=kI9fdBlR01Ifo3ia5k0bVqRInQQ3uZX6CfMRid7k8l4=;\n\tb=JEkaJPvD1B/M537FwKNuGPZK0s8V/hVLGZ9muwg01sttalJp6czChNAc7YctxEUZVoJfRb\n\tk+5tjy8Umo/wR2GQBo0hqrKD3Wztv/TPy7tBHKfKLsTyPKDbcEcQ49zjSgcHaqUxUz63qq\n\tWGcY1WBorFJopgEGijzJ0AnK9E33K3Q="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=redhat.com\n\theader.i=@redhat.com header.b=\"JEkaJPvD\"; \n\tdkim-atps=neutral","X-MC-Unique":"tFQC64V8OK694drX23UIFA-1","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=kI9fdBlR01Ifo3ia5k0bVqRInQQ3uZX6CfMRid7k8l4=;\n\tb=xx/+VMflfvu03gEO8TAaBDXr1emznvhIJDU2ATexjQtS6kSe+BKy5emHdzjcUxzWIz\n\tJBZ/Xqw6xsOSNQ0Na7qtpRR2HN/PCDTGhGInlysUc5GlJdSShfGM6QfyUaEvxiv/0Jg4\n\txjvnqhgjjMVVlNxhj5U2KmjTfpJL/9VCBNuWWGu9DCwEp92nJzICWNKHkdXp7v7z/23h\n\tQ+dTBqV8PX7pAjYtfxhgvAkw0LivquAc9s+aRGWl4hgH/ZPZatEoHPm1Q6zpUeTCigj9\n\ttrUAfV6CsOmbpT8COJ3TyldsZewrXTYFtBIipmjOCDugLruSFp2Iva/pKQy1gBWRf/0/\n\tCGBA==","X-Gm-Message-State":"ACgBeo3r8125PtHn+4yh/AdQB+N1WNSkz2OFuMIR/88TYIYBlPTJFOGB\n\tZmVjCNB5piPYcZ/nSy5oxS1l+Ca9v2H3gh2kQ4GXGI8q23j3VrGN+RoFdCc3k+M+t1iApW6Fhvm\n\t76t7iG5BzKAxmkf7Oxm2d11lGJ1kM87zH3qgC8iVQ6XzGj0oAQg==","X-Received":["by 2002:ac8:7d07:0:b0:31e:e094:ef12 with SMTP id\n\tg7-20020ac87d07000000b0031ee094ef12mr17486067qtb.301.1659986592454; \n\tMon, 08 Aug 2022 12:23:12 -0700 (PDT)","by 2002:ac8:7d07:0:b0:31e:e094:ef12 with SMTP id\n\tg7-20020ac87d07000000b0031ee094ef12mr17486045qtb.301.1659986592146;\n\tMon, 08 Aug 2022 12:23:12 -0700 (PDT)"],"X-Google-Smtp-Source":"AA6agR6ZfyAmImAVWEsjDWyES1Kv/uDJNaMxGk9M9Wijx0YmnkamsopYbpGVzgP1qoPCdqSeKXBB5lMoDcXllx+gTgM=","MIME-Version":"1.0","References":"<20220808155605.7925-1-laurent.pinchart@ideasonboard.com>\n\t<20220808155605.7925-3-laurent.pinchart@ideasonboard.com>","In-Reply-To":"<20220808155605.7925-3-laurent.pinchart@ideasonboard.com>","Date":"Mon, 8 Aug 2022 20:22:56 +0100","Message-ID":"","To":"Laurent Pinchart ","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Type":"text/plain; charset=\"UTF-8\"","Subject":"Re: [libcamera-devel] [PATCH 2/2] cam: sdl_texture: Renaming\n\t'pitch' to 'stride'","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Eric Curtin via libcamera-devel ","Reply-To":"Eric Curtin ","Cc":"libcamera devel ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":24456,"web_url":"https://patchwork.libcamera.org/comment/24456/","msgid":"<20220809072529.xx5b3lfaufp5tlyv@uno.localdomain>","date":"2022-08-09T07:25:29","subject":"Re: [libcamera-devel] [PATCH 2/2] cam: sdl_texture: Renaming\n\t'pitch' to 'stride'","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent\n\nOn Mon, Aug 08, 2022 at 06:56:05PM +0300, Laurent Pinchart via libcamera-devel wrote:\n> The libcamera public API uses 'stride' to refer to the line stride.\n> Rename the SDLTexture::pitch_ member variable for consistency.\n>\n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> src/cam/sdl_texture.cpp | 4 ++--\n> src/cam/sdl_texture.h | 4 ++--\n> src/cam/sdl_texture_mjpg.cpp | 6 +++---\n> src/cam/sdl_texture_yuv.cpp | 6 +++---\n> 4 files changed, 10 insertions(+), 10 deletions(-)\n>\n> diff --git a/src/cam/sdl_texture.cpp b/src/cam/sdl_texture.cpp\n> index 02a8ff28b669..e9040bc5f67e 100644\n> --- a/src/cam/sdl_texture.cpp\n> +++ b/src/cam/sdl_texture.cpp\n> @@ -10,8 +10,8 @@\n> #include \n>\n> SDLTexture::SDLTexture(const SDL_Rect &rect, uint32_t pixelFormat,\n> -\t\t const int pitch)\n> -\t: ptr_(nullptr), rect_(rect), pixelFormat_(pixelFormat), pitch_(pitch)\n> +\t\t const int stride)\n> +\t: ptr_(nullptr), rect_(rect), pixelFormat_(pixelFormat), stride_(stride)\n> {\n> }\n>\n> diff --git a/src/cam/sdl_texture.h b/src/cam/sdl_texture.h\n> index e4d3fb2bcf39..6ccd85eab390 100644\n> --- a/src/cam/sdl_texture.h\n> +++ b/src/cam/sdl_texture.h\n> @@ -16,7 +16,7 @@\n> class SDLTexture\n> {\n> public:\n> -\tSDLTexture(const SDL_Rect &rect, uint32_t pixelFormat, const int pitch);\n> +\tSDLTexture(const SDL_Rect &rect, uint32_t pixelFormat, const int stride);\n> \tvirtual ~SDLTexture();\n> \tint create(SDL_Renderer *renderer);\n> \tvirtual void update(const std::vector> &data) = 0;\n> @@ -26,5 +26,5 @@ protected:\n> \tSDL_Texture *ptr_;\n> \tconst SDL_Rect rect_;\n> \tconst uint32_t pixelFormat_;\n> -\tconst int pitch_;\n> +\tconst int stride_;\n> };\n> diff --git a/src/cam/sdl_texture_mjpg.cpp b/src/cam/sdl_texture_mjpg.cpp\n> index 8dd5ee3eb6bc..da958e0372af 100644\n> --- a/src/cam/sdl_texture_mjpg.cpp\n> +++ b/src/cam/sdl_texture_mjpg.cpp\n> @@ -39,7 +39,7 @@ struct JpegErrorManager : public jpeg_error_mgr {\n>\n> SDLTextureMJPG::SDLTextureMJPG(const SDL_Rect &rect)\n> \t: SDLTexture(rect, SDL_PIXELFORMAT_RGB24, rect.w * 3),\n> -\t rgb_(std::make_unique(pitch_ * rect.h))\n> +\t rgb_(std::make_unique(stride_ * rect.h))\n> {\n> }\n>\n> @@ -65,7 +65,7 @@ int SDLTextureMJPG::decompress(Span data)\n> \tjpeg_start_decompress(&cinfo);\n>\n> \tfor (int i = 0; cinfo.output_scanline < cinfo.output_height; ++i) {\n> -\t\tJSAMPROW rowptr = rgb_.get() + i * pitch_;\n> +\t\tJSAMPROW rowptr = rgb_.get() + i * stride_;\n> \t\tjpeg_read_scanlines(&cinfo, &rowptr, 1);\n> \t}\n>\n> @@ -79,5 +79,5 @@ int SDLTextureMJPG::decompress(Span data)\n> void SDLTextureMJPG::update(const std::vector> &data)\n> {\n> \tdecompress(data[0]);\n> -\tSDL_UpdateTexture(ptr_, nullptr, rgb_.get(), pitch_);\n> +\tSDL_UpdateTexture(ptr_, nullptr, rgb_.get(), stride_);\n> }\n> diff --git a/src/cam/sdl_texture_yuv.cpp b/src/cam/sdl_texture_yuv.cpp\n> index aa424559abd7..b29c3b937265 100644\n> --- a/src/cam/sdl_texture_yuv.cpp\n> +++ b/src/cam/sdl_texture_yuv.cpp\n> @@ -17,8 +17,8 @@ SDLTextureNV12::SDLTextureNV12(const SDL_Rect &rect, unsigned int stride)\n>\n> void SDLTextureNV12::update(const std::vector> &data)\n> {\n> -\tSDL_UpdateNVTexture(ptr_, &rect_, data[0].data(), pitch_,\n> -\t\t\t data[1].data(), pitch_);\n> +\tSDL_UpdateNVTexture(ptr_, &rect_, data[0].data(), stride_,\n> +\t\t\t data[1].data(), stride_);\n> }\n> #endif\n>\n> @@ -29,5 +29,5 @@ SDLTextureYUYV::SDLTextureYUYV(const SDL_Rect &rect, unsigned int stride)\n>\n> void SDLTextureYUYV::update(const std::vector> &data)\n> {\n> -\tSDL_UpdateTexture(ptr_, &rect_, data[0].data(), pitch_);\n> +\tSDL_UpdateTexture(ptr_, &rect_, data[0].data(), stride_);\n> }\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 358EAC3272\n\tfor ;\n\tTue, 9 Aug 2022 07:25:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 949D36332A;\n\tTue, 9 Aug 2022 09:25:35 +0200 (CEST)","from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[IPv6:2001:4b98:dc4:8::228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8765063325\n\tfor ;\n\tTue, 9 Aug 2022 09:25:33 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 33EBC1BF20B;\n\tTue, 9 Aug 2022 07:25:31 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660029935;\n\tbh=5ntz/cchDFAbtcYgmxCOeLLcED8Q9BWvGBSLa/uYnlw=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=1Nozr3ijgabhuKTvdVwPxhMpCHf9BicUWWrRQfsFmr/InGPhqh+a6p0+QJh3xEpyB\n\ttSN326gTZNIriMEHvRIE5sHgaxn7xCLEIQdBA47HFr1ctDGlACWvL9TLA8gZ+6nwX4\n\t1R21KZxWlsbwOV6FH75EWcPXZ5wwt4N2nrAiJ4ArH5mPKRDZkM0P2gYulv8PibjNFA\n\tzLviUA0+2pq25zwIwqciwzy3Mnnmqwuy+YAFNPjQncdo5+JeVBLPbepAPveUPbV6fG\n\t8wK9RLAVcP0csNQAYrobDdrKgEwCzvpT/WCYRYVf0kEtogc177c5VrTuZ2A/uFD+pN\n\tMAE0lhnKgWuPg==","Date":"Tue, 9 Aug 2022 09:25:29 +0200","To":"Laurent Pinchart ","Message-ID":"<20220809072529.xx5b3lfaufp5tlyv@uno.localdomain>","References":"<20220808155605.7925-1-laurent.pinchart@ideasonboard.com>\n\t<20220808155605.7925-3-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220808155605.7925-3-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 2/2] cam: sdl_texture: Renaming\n\t'pitch' to 'stride'","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]