{"id":9359,"url":"https://patchwork.libcamera.org/api/1.1/patches/9359/?format=json","web_url":"https://patchwork.libcamera.org/patch/9359/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200822134036.16209-1-laurent.pinchart@ideasonboard.com>","date":"2020-08-22T13:40:36","name":"[libcamera-devel] cam: Limit file write to payload size","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4a6b3eb3881814a76046e0e24cb2cc921b1d6464","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9359/mbox/","series":[{"id":1231,"url":"https://patchwork.libcamera.org/api/1.1/series/1231/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1231","date":"2020-08-22T13:40:36","name":"[libcamera-devel] cam: Limit file write to payload size","version":1,"mbox":"https://patchwork.libcamera.org/series/1231/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9359/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9359/checks/","tags":{},"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 25401BD87C\n\tfor ;\n\tSat, 22 Aug 2020 13:41:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AE01D61080;\n\tSat, 22 Aug 2020 15:41:00 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3AFF661080\n\tfor ;\n\tSat, 22 Aug 2020 15:40:59 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BAD5529E\n\tfor ;\n\tSat, 22 Aug 2020 15:40:58 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"AkpdbR/Z\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1598103658;\n\tbh=U+RGkL2qOKp+EnB0NalhPLfO3gvk2MUHxfzQc8LlUCI=;\n\th=From:To:Subject:Date:From;\n\tb=AkpdbR/ZYxTOE9Lt8Uzc6gJwhKnIkZC1zp/XmNMaHZm2pCcUG8mfsjld5GJpjxLF8\n\t3bEjjhl1QW9tzvJ+1E+riZCA/afzN2YHuXEyJkNdiiFInxzqENueawssM27CWuNDHf\n\tYZ6k4N5IoJzvzfEYYa5YI3JokgfvX6/TV8i22BcM=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 22 Aug 2020 16:40:36 +0300","Message-Id":"<20200822134036.16209-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH] cam: Limit file write to payload size","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The payload size in a captured framebuffer is usually equal to the\nbuffer size. However, for compressed formats, the payload may be\nsmaller Only write the payload when capturing to a file.\n\nSigned-off-by: Laurent Pinchart \n---\n src/cam/buffer_writer.cpp | 12 ++++++++++--\n 1 file changed, 10 insertions(+), 2 deletions(-)","diff":"diff --git a/src/cam/buffer_writer.cpp b/src/cam/buffer_writer.cpp\nindex c5a5eb46224a..6305958924a4 100644\n--- a/src/cam/buffer_writer.cpp\n+++ b/src/cam/buffer_writer.cpp\n@@ -64,9 +64,17 @@ int BufferWriter::write(FrameBuffer *buffer, const std::string &streamName)\n \tif (fd == -1)\n \t\treturn -errno;\n \n-\tfor (const FrameBuffer::Plane &plane : buffer->planes()) {\n+\tfor (unsigned int i = 0; i < buffer->planes().size(); ++i) {\n+\t\tconst FrameBuffer::Plane &plane = buffer->planes()[i];\n+\t\tconst FrameMetadata::Plane &meta = buffer->metadata().planes[i];\n+\n \t\tvoid *data = mappedBuffers_[plane.fd.fd()].first;\n-\t\tunsigned int length = plane.length;\n+\t\tunsigned int length = std::min(meta.bytesused, plane.length);\n+\n+\t\tif (length < meta.bytesused)\n+\t\t\tstd::cerr << \"payload size \" << meta.bytesused\n+\t\t\t\t << \" smaller than plane size \" << plane.length\n+\t\t\t\t << std::endl;\n \n \t\tret = ::write(fd, data, length);\n \t\tif (ret < 0) {\n","prefixes":["libcamera-devel"]}