Patch Detail
Show a patch.
GET /api/1.1/patches/17028/?format=api
{ "id": 17028, "url": "https://patchwork.libcamera.org/api/1.1/patches/17028/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17028/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20220808155605.7925-3-laurent.pinchart@ideasonboard.com>", "date": "2022-08-08T15:56:05", "name": "[libcamera-devel,2/2] cam: sdl_texture: Renaming 'pitch' to 'stride'", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "92b00d144c7ce1761a95dc8fba2719543b002297", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17028/mbox/", "series": [ { "id": 3389, "url": "https://patchwork.libcamera.org/api/1.1/series/3389/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3389", "date": "2022-08-08T15:56:03", "name": "cam: Miscellaneous fixes for the SDL sink", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3389/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17028/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17028/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 8C88FBE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 8 Aug 2022 15:56:22 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4760B6332A;\n\tMon, 8 Aug 2022 17:56:22 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1202663330\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 8 Aug 2022 17:56:20 +0200 (CEST)", "from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7676673E;\n\tMon, 8 Aug 2022 17:56:19 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659974182;\n\tbh=RYQV0ZR+VB1hu7gVwGg/nmZtPj/f88jVOm/xtfnqVAo=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=LYOISuwJDelABAKloE2TvOapCSClitHh1dllYOYr+x2igdlBlOftg+9XpxHwBgHfT\n\t5s+nYrEaB//2WhmKmCo9jbkk1I9LwxXhCuaZa0EC7vwcw4FVjB1IeBnmuAGp/voeCn\n\tQ7zWrnJyiTKxLQGVga9BPvdAH+Qa8I3SMhr6430+dosHUqlupMI8fVCiDJ9PKD0tQt\n\teCBCxGVjLVddIvz3Kb1CGhuedq48fy4ylG7u9ThNMTnNXn+jhomqVvziKrQZfmMbDQ\n\tUL3ytFk1ef9eIaDBz9fFf2oRnTNYkgbPmWZ4WxAp3tdeRF4ldC1I8SLDGROq2Mq/FS\n\t7qMI2PRmw6vuQ==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1659974179;\n\tbh=RYQV0ZR+VB1hu7gVwGg/nmZtPj/f88jVOm/xtfnqVAo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=WEkZbsmvtwfwwWUNSM+5qsiQ154iJoOWOsYCnAFOyV3tTutazPAKzXabyOC196VWV\n\tL/4Go92JXELAtN++BvtcsN8ZSGN11WBmSU34z/DvEbYSSxpa2YTjl5z2/FVpOb6j87\n\tLhpS1mXbe3yez+adu6r12teg7v+y58C+79NP5slQ=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"WEkZbsmv\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 8 Aug 2022 18:56:05 +0300", "Message-Id": "<20220808155605.7925-3-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.35.1", "In-Reply-To": "<20220808155605.7925-1-laurent.pinchart@ideasonboard.com>", "References": "<20220808155605.7925-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 2/2] cam: sdl_texture: Renaming 'pitch' to\n\t'stride'", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The libcamera public API uses 'stride' to refer to the line stride.\nRename the SDLTexture::pitch_ member variable for consistency.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\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(-)", "diff": "diff --git a/src/cam/sdl_texture.cpp b/src/cam/sdl_texture.cpp\nindex 02a8ff28b669..e9040bc5f67e 100644\n--- a/src/cam/sdl_texture.cpp\n+++ b/src/cam/sdl_texture.cpp\n@@ -10,8 +10,8 @@\n #include <iostream>\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 \ndiff --git a/src/cam/sdl_texture.h b/src/cam/sdl_texture.h\nindex 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<libcamera::Span<const uint8_t>> &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 };\ndiff --git a/src/cam/sdl_texture_mjpg.cpp b/src/cam/sdl_texture_mjpg.cpp\nindex 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<unsigned char[]>(pitch_ * rect.h))\n+\t rgb_(std::make_unique<unsigned char[]>(stride_ * rect.h))\n {\n }\n \n@@ -65,7 +65,7 @@ int SDLTextureMJPG::decompress(Span<const uint8_t> 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<const uint8_t> data)\n void SDLTextureMJPG::update(const std::vector<libcamera::Span<const uint8_t>> &data)\n {\n \tdecompress(data[0]);\n-\tSDL_UpdateTexture(ptr_, nullptr, rgb_.get(), pitch_);\n+\tSDL_UpdateTexture(ptr_, nullptr, rgb_.get(), stride_);\n }\ndiff --git a/src/cam/sdl_texture_yuv.cpp b/src/cam/sdl_texture_yuv.cpp\nindex 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<libcamera::Span<const uint8_t>> &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<libcamera::Span<const uint8_t>> &data)\n {\n-\tSDL_UpdateTexture(ptr_, &rect_, data[0].data(), pitch_);\n+\tSDL_UpdateTexture(ptr_, &rect_, data[0].data(), stride_);\n }\n", "prefixes": [ "libcamera-devel", "2/2" ] }