From patchwork Fri Jul 26 08:50:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Devonport X-Patchwork-Id: 50750 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a830:0:b0:482:c625:d099 with SMTP id z16csp507701vqo; Fri, 26 Jul 2024 07:16:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUTo549nf/r/Ybk3l0wffMN6wWMkPWe6VpdoQRA/utlqi+1teXUd3TbpemcZLIiGElOLigTpcpLtM1GaE5tMitQCY1dKUmUGnRqoA== X-Google-Smtp-Source: AGHT+IHx7Zp0z3cI0rVPN9x3Qe+VWt80ijxkqQb4L0bNXJ2BNhdplyKrkM87ZSomlg0aY6A7N1Id X-Received: by 2002:a2e:8808:0:b0:2ef:18b7:4408 with SMTP id 38308e7fff4ca-2f039c4e399mr44840071fa.5.1722003413945; Fri, 26 Jul 2024 07:16:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722003413; cv=none; d=google.com; s=arc-20160816; b=bvoOQ3WmwE4bpnFPfCXYIESdGH7/mMgbnLjIP2BaG0Pde5SZ0t382zMfJGRmf/r2jr CbuMJKigAIyGrAkMQkZa/bnKfMeIcJhS6sHMuCK97dk18RizQLIbIRA/ziUZfT/6unfi Pqeu9v3N3jxm3g2oKnvcP9B/4br3goL4mWVngLOOaojiHF5htvrVjrZMY4GLvTjGMsLZ TyKHKAUHHuW8Lp3utmgZxCglbGWFPbvsMmlNqcwhOT1tsm+dxJSY00c5h4aTEwhA+SiI AdD+OPdBEDEfqU+KSlvn+w3uSvfOD4UsO0+h6gcUh3w4fj4gl2t5QAaSPksX1Wn7rhsm aJVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=wTAGuCkGO2eIUzZYyxvitxu4ervG3uz/PV9oZHz6KbY=; fh=KA5iqtJgMmiUSRZI42QMPgPpe1A8iMy+T1nBCoqQKCI=; b=cbJTFT7/GbAdfE8SWY5pWPERYdtLFAnE2sBrH8I/xzY3YlXjHCPJQwpHblC01wsWjn huy+Wh23ptpU+Bv6pZocjRN53BTjzeBiOo+hq9/XZVMO2CrIFPqW6hnJoexmTkzqqOy6 b2Ifgf/f51FwRR/xOkKhZTeZzvl9xJSd40yiiHIATHjm0It9y2wu0MGkyo2vLJ54nugJ DKuqM9q20e1BbiojaVXw91h3uveS5vFjuayZ1d6nmiHuK3A3yNysqeDWwDMS81kPr/t2 uASQOiq6fuj+hbv/ZdJ7KP7CctX4wAN3mW1QBKpr40AIVaE5j4C+Q1BPqP/d8wt2nIZz Tcrg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=GujKTmH7; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2f03d08d683si9697611fa.19.2024.07.26.07.16.53; Fri, 26 Jul 2024 07:16:53 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=GujKTmH7; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 467D068D73C; Fri, 26 Jul 2024 11:51:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3B7368D720 for ; Fri, 26 Jul 2024 11:51:12 +0300 (EEST) Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2ef2fccca2cso12090441fa.1 for ; Fri, 26 Jul 2024 01:51:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721983871; x=1722588671; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=06FYSRD/7dzfdecP140mj2iBrBpQc4ibKpCDb8tg7tc=; b=GujKTmH7qFXRWonOze5FLy8B76zNIBU9Hk+sq8tYa38V76xJs5v/XCbK2urIZxR7UJ ORgw4kIWWw7jU5dmQRWrDEW2LjV9IXJE8Hfdx23YwBsYat2Tx1OzaPW+ILFqgG8Yush1 3YTuk1T8PhfXdMMCuHLcttV8nkM7wIZw+proYMg/N9JhO41i+siu/GSE5wHcac2SQpdm A94Bf9N40WcsyXELkXfrA8kNFFP/+zOqYar73el/zwI+dgq5UaJDbzsREDtoFH4Bt5yl TilH7guQtBidMIHkd+8dRI3rhGwA7r6e0Yz/Wh0/rM08gSCqAj4d0aNEdfseQpOpz7s/ NF+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721983871; x=1722588671; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=06FYSRD/7dzfdecP140mj2iBrBpQc4ibKpCDb8tg7tc=; b=o8z7kA1jmPzuuuWxLR4V1HOt9uAqHBvj+UEp7PWeeEM187wNQlNy9y1UwK5l2mZ7aT ef7uDjX7VgiVhvnXcZSIBwMlBzpgHztF+mhXGHIPJgI9ai44WfB7SQVS7jLALu+MSdo5 Aeo4R2a+21stAPlRTJ6+HCFI0jLh/PpazsFQLazIJo18gCXTRoPntUNCx+jn17b0f1fq ktiRyl/wLe17ERf547TN+sxkRADH4ns3d5rQHcVJTtMIXr0Io/1Z74xxPisMKA+uDLbc 8NHHl1QlgjliKk3Y3HX7pQgEYDHoSMYk68l+EFDIJYVzFzHVgD/4SGpHd736BcXZGf/y a1KA== X-Gm-Message-State: AOJu0Yy3xaR5d5Sq5WROjb77PlxuhzOX0OkvbRg9e7dC4fpEWH7pAIuT K2AzpGLVtOnUdkQ+Im09A9XIXn70cvnZ6ol4Q1DbV3t3h4pB64cY6g0oeQ== X-Received: by 2002:a2e:b013:0:b0:2ef:2cdb:5053 with SMTP id 38308e7fff4ca-2f039dbadf3mr34822251fa.37.1721983871181; Fri, 26 Jul 2024 01:51:11 -0700 (PDT) Received: from localhost.localdomain ([152.110.13.78]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ac63b59aa5sm1665543a12.43.2024.07.26.01.51.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 26 Jul 2024 01:51:10 -0700 (PDT) From: tonetechnician@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Jul 2024 10:50:44 +0200 Message-Id: <20240726085044.50356-2-tonetechnician@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240726085044.50356-1-tonetechnician@gmail.com> References: <20240726085044.50356-1-tonetechnician@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/1] lavc/exr: decode_block() fails when input resolution not exactly divisable by 8 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Sean Devonport Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DGm3O3bf4LWH From: Sean Devonport This stops decode_block() from failing when the .exr resolution is not divisable by 8 (e.g 108x192). The dc_w and dc_h needs to be round up and not down. --- libavcodec/exr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 4bac0be89b..5df2c55609 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -987,8 +987,8 @@ static int dwa_uncompress(const EXRContext *s, const uint8_t *src, int compresse int64_t version, lo_usize, lo_size; int64_t ac_size, dc_size, rle_usize, rle_csize, rle_raw_size; int64_t ac_count, dc_count, ac_compression; - const int dc_w = td->xsize >> 3; - const int dc_h = td->ysize >> 3; + const int dc_w = (td->xsize + 7) >> 3; + const int dc_h = (td->ysize + 7) >> 3; GetByteContext gb, agb; int skip, ret;