From patchwork Fri Sep 22 17:37:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 43873 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:38a7:b0:15d:8365:d4b8 with SMTP id n39csp982566pzf; Fri, 22 Sep 2023 10:38:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEmoMpzGm70mj17a3QqtawWyCLPG709Sq66RsN3R02Y9tzQtLtcXNf73wYSWz26ylrGT6lv X-Received: by 2002:a05:6512:3119:b0:500:86b4:5282 with SMTP id n25-20020a056512311900b0050086b45282mr184944lfb.34.1695404291081; Fri, 22 Sep 2023 10:38:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695404291; cv=none; d=google.com; s=arc-20160816; b=llBmLfBa5YB/jAKxiRV7scW/IuMbSk+1YfCsedxx4hqH+oqyqpSIBqTPE2OGELCD2U Kpg5ADuezodpcdRwpAWpfzXboTFZx43pGa7/DN87pgcGafJ/RlFU1TaQV9v9wSMPNMYk AT2yJN3ibk6Ub3+aaIvRUxP2E2ChXfbQ3m3XmKI4psn6BYM1XKivUpL1QpcXZ/CYJNJW zqDBJUGsbuMjH3iOskNiUjKyzig9zQaBoFQHttmZpYEAHiH7CaVrtS6wrER21ejRAFDp YpY60mXXGlhpGsFeEI4cm+s+PFgEIGrDrzcjblBenCteDjOUwuCpPXPYAX9ioMl2dm/B FNNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=EoSJuC1UedPDT0TgremOzjretsU2JHO3C8/dnZVtSls=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=ttvUZUVmKm5USR7Dc3LUlk9rIN4Zskm0ER1qLH0ysQ9fen/iGLYLQPTdRcJFi7CIR5 jJ/nBeWWK56QLRR1ImLHEbJVS/Gq4VUZImCQ05ik+3d3re5HFV7/HEjyJIVqiwzbmylT n8e13HOTWEwhPiTDulDrVNUL2Z2Zp628w//eEERXXar0howbaBUBMyLPQVQT3SjSQwIl TB7j79Fxc4GuFRHS6emuxpbg81Fpaek9id10MM695KgqfCI+VLxITnxxCDSzOwYRlHxa Z4h1ZVSRLgZyndv+kj3oTkMhZXEOtpeFrzzPUh2uXh77clyFbTSlZHeKF2fT1fPVTuEd w1Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=DBR3I6R8; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w14-20020aa7cb4e000000b005234b299bf4si4026720edt.311.2023.09.22.10.38.10; Fri, 22 Sep 2023 10:38:11 -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=DBR3I6R8; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B91CB68C9C0; Fri, 22 Sep 2023 20:38:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f47.google.com (mail-vs1-f47.google.com [209.85.217.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E56368C7EA for ; Fri, 22 Sep 2023 20:38:01 +0300 (EEST) Received: by mail-vs1-f47.google.com with SMTP id ada2fe7eead31-4510182fe69so1087578137.3 for ; Fri, 22 Sep 2023 10:38:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695404280; x=1696009080; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=3JGYIj0ngmd63zLDSxk0BZttugoOoBN62ckCmc11MrY=; b=DBR3I6R8JjEYfYDBQPGwDi5DSq/oLYhq4HgsZnOhEC7R7SuRY9eRdQyW2j9wjwUnl9 hfuCGS8zjmlfuWXCIJJJeJghbPcBGKASBQEhnAUAAhBWqpYrw8i5xtkwuUynD55cojvU M45Kq9gjEiFHa6idtCAtIfoioD+WrBJp5Wqvvg7TZzLqMov9b9K9KL5Xa5xsGr0zwQL+ 2K2rs39UKIWoCYddy9HU+t/egUOLn7IBWdxXcRBlgrX7wMjsJCRKghBkpfQdwPGOD3Rf NE/lrtNhbznhG3ayEjHC/0hzGzGN7/oY/+/blgWClNwBxcuG+XTrGz16ZhczPuVLIorN qlug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695404280; x=1696009080; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3JGYIj0ngmd63zLDSxk0BZttugoOoBN62ckCmc11MrY=; b=fugK9aAGGsSx2s6pPdWorBtqiJRMth13j+uVhcLjYxbTZeuA9a70BTqJuz00WDv6dD J5LnhSzJ7c80bWFgZUm/9zyLd1TxMapZmclxHmm10zgQWIldqJPUtUq7PTYyz2R/u1Xd ZKhlBcUotZPUamgrcfjbnsrJQOdbeZlKEw5iCx/MoaEtQWu7gVY2QYYrw+wqnprsoNyI HZ4T+gXMyfqkhIKkk2eZFZaykKEWtikGk+uZekf/g2Pcm1VGTKi3EGUO6dh84xzoIL36 RNKtOEtZDFKzTJvrzuy9S84EV+X8vNnpSsH7hGvacXwh8OBxApHG7QJhYWNgHe3DuUEI wa+Q== X-Gm-Message-State: AOJu0YxpFvr/JQEQFRbAeVGVmabT31K4C4wjL07pg7eLKhaI1icUh7ng Hgy8qYZ1Fe7MniIDQMSKN8xY4xcUWu6I8R6fuBRaLw/fQ9k= X-Received: by 2002:a67:fa10:0:b0:44d:5435:a3e with SMTP id i16-20020a67fa10000000b0044d54350a3emr312384vsq.9.1695404279975; Fri, 22 Sep 2023 10:37:59 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a59:9f50:0:b0:3eb:b4c:bd4f with HTTP; Fri, 22 Sep 2023 10:37:58 -0700 (PDT) From: Paul B Mahol Date: Fri, 22 Sep 2023 19:37:58 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] ptrdiff_t related fixes and negative linesizes 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: nj9zGZAPuSNY Hi, Patches attached. From 9381993c4ce1a9b3958d9de6ce7ef4fb4113ea41 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 22 Sep 2023 19:31:47 +0200 Subject: [PATCH 3/3] avcodec/gifdec: rewrite functions that fill block/frame Signed-off-by: Paul B Mahol --- libavcodec/gifdec.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index d90e467cac..fb0b335088 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -86,26 +86,29 @@ static void gif_read_palette(GifState *s, uint32_t *pal, int nb) static void gif_fill(AVFrame *picture, uint32_t color) { - uint32_t *p = (uint32_t *)picture->data[0]; - uint32_t *p_end = p + (picture->linesize[0] / sizeof(uint32_t)) * picture->height; - - for (; p < p_end; p++) - *p = color; + const ptrdiff_t linesize = picture->linesize[0]; + const uint8_t *py = picture->data[0]; + const int w = picture->width; + const int h = picture->height; + + for (int y = 0; y < h; y++) { + uint32_t *px = (uint32_t *)py; + for (int x = 0; x < w; x++) + px[x] = color; + py += linesize; + } } static void gif_fill_rect(AVFrame *picture, uint32_t color, int l, int t, int w, int h) { - const ptrdiff_t linesize = picture->linesize[0] / sizeof(uint32_t); - const uint32_t *py = (uint32_t *)picture->data[0] + t * linesize; - const uint32_t *pr, *pb = py + h * linesize; - uint32_t *px; - - for (; py < pb; py += linesize) { - px = (uint32_t *)py + l; - pr = px + w; - - for (; px < pr; px++) - *px = color; + const ptrdiff_t linesize = picture->linesize[0]; + const uint8_t *py = picture->data[0] + t * linesize; + + for (int y = 0; y < h; y++) { + uint32_t *px = ((uint32_t *)py) + l; + for (int x = 0; x < w; x++) + px[x] = color; + py += linesize; } } -- 2.42.0