From patchwork Fri Jun 7 19:26:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramiro Polla X-Patchwork-Id: 49688 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1247650vqo; Fri, 7 Jun 2024 12:34:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU7Si4hl5RLBbW01saBa9oHMd63qIYFK6W2uR5143ZibjgtwmFMzQNb13WJm1W3f+v1gnG+KtXEnkXGGFVzyy+4z732gERmyO8x+A== X-Google-Smtp-Source: AGHT+IEic2+QjpUypSG9waekkt+Amt7GVupwsqwiQJwmWg3D5iRULVwafgsS3HugrgfRYjQUvZWV X-Received: by 2002:a50:c318:0:b0:57a:2756:9007 with SMTP id 4fb4d7f45d1cf-57c509a6f02mr1594530a12.40.1717788847221; Fri, 07 Jun 2024 12:34:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717788847; cv=none; d=google.com; s=arc-20160816; b=PCWERS4NIs2/niSqFnjxsfJrEihsvl2pXbGswIgnGy9Y35n8fCH6FFk5AgjxrQEner yom6iym03rdSc45xLaDjrrna3dmx5id3+fLOwrDg//5GnieET+/Y1XxTcZ3ezt+mL/Wa 22QY7QOT1JPx5mkgu7ttl7DfImDOwbdpkYecPtbmRLctKDzKVsPovc5EeWIlJ3etLYi4 FeMqQmc+etKp/Q/Mdw9xMroQf5J+j4vm0sl1nJ7csIiEXec3EJ7FLjuvJo6eOPCPR/qh 7fiQPwrbjq0igc8wtFnlVhE86lg8PcO6yIlwq6WtM3E9JdkzuGRrJOh3m/OtOPZo6U8o CfZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=NycPFdrOEcujADXz6Dh6eHYjibV7UhpLxCVpT7ZEMoM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=kaHVfgR0VlIK4rfciX6E5jJL0axC+KpGm7GzzkpeAcH+hehtQDoEjPX1ARDH/LpY4n BnGyNrVecARrOtfwGR884pfMVRbHlzDE080OBwl6NwOqTNAYLsOxc8FMU1WkkEdumhPk 15hJ/Ssxv3udUpMU6DxMjUv0VT/aqA7cf0fYE9Qh3rUp/jnwtiEdRV17uodXvbMZ3crp cCGizEYkqNeB9+7NgPoF6OOR+293IhCh4ix6cO++u0a4jq58BIpGiwKsch1dRsSoom69 0SIhfX1U+kR0WqtcP6jQo+ZSwSP04kSF9vInEed0vJWTNthU0JTEhIiJ+ItIBOrxgjYj BUEg==; 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=aJ6EVmgQ; 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 4fb4d7f45d1cf-57aae228e38si2194686a12.371.2024.06.07.12.34.06; Fri, 07 Jun 2024 12:34:07 -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=aJ6EVmgQ; 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 D5B8568D81F; Fri, 7 Jun 2024 22:27:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8FABD68D7B1 for ; Fri, 7 Jun 2024 22:26:57 +0300 (EEST) Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-354b722fe81so2363827f8f.3 for ; Fri, 07 Jun 2024 12:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717788416; x=1718393216; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=cz3QjEMF4YSo7OJry2WTkJCo42xSJzzwgJoqPhfFrvg=; b=aJ6EVmgQiHKlZjC0BWXCs7Z+JEnbxvsp4jm/r7PG9Umv4+1waTDM8dzdlrapD55tAd oEh1bpn6cE22AmZ7Mv91aLKNO+9rkSa+qns/yP0wYXTdMHj6uHCUMNtMWeT+q7PxUH6K iyg7FEjj3a24AZIA9gT7n+xxaQw2gyPN45oygpfstaejlELeQTzOHAZpSH1hIok4Uky9 WxYqWxN3j0zP6vlvWCWRbqENmMPzROwvH86VWNPC7kxlX5Z65DY0mvJcVo71ymZiJBL6 Gh6ZodtTjAVa1vwiYiKLSQrA4Df5eN1j8TEy0igNhhotDloUgkgZle32yHIR2VpQw0B7 mY6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717788416; x=1718393216; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cz3QjEMF4YSo7OJry2WTkJCo42xSJzzwgJoqPhfFrvg=; b=JjF9s0Tu+e6CLnlY+q+aSEbeK8Iny/zXDR+lsEqE4Mll7xhyzSdD0K+LlmWFzSB3CN pp2lPghlKkMsVxjCHKU9aYUH0mYPcuZWduOqN20iKODbptzZwe0xpUgW+kbph5l+z6EY ZBaVq/ICg96tvkDuFhfF8i0Ih0kARNcE4qtGgfDH3hpLMRUEF1NdXlRpNRBa1iKRMSq5 fh+kdSjjznMdQNSVbjPBqjkHQ5wzHPzRf18Iobq2i2w+LfWn2Dtq3LkrIQDijFcpV3WN sEVXMHaHJEgwQvKQV6LJ9tfHLcmmxOicfgICL4I31Zyqh4zHwAX35VWuZs5p5YfFxMoC iU/g== X-Gm-Message-State: AOJu0YwMTPUGo7o/903b2i14muzIoYw8kfKAZGrnGuu2ELyFhyq9nA0A 291TkHPpS+0ItLMv2C8lmoEbmKr41z9BojrLA3PkR7auG5Z0N6DYFET1eQ== X-Received: by 2002:a05:6000:88:b0:356:4a73:af59 with SMTP id ffacd0b85a97d-35efed4093cmr2453150f8f.28.1717788415833; Fri, 07 Jun 2024 12:26:55 -0700 (PDT) Received: from localhost.localdomain (80.164-182-91.adsl-dyn.isp.belgacom.be. [91.182.164.80]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35ef5e989c9sm4558883f8f.73.2024.06.07.12.26.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 12:26:55 -0700 (PDT) From: Ramiro Polla To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jun 2024 21:26:54 +0200 Message-Id: <20240607192654.146995-1-ramiro.polla@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/mjpeg: keep last_dc value unclipped 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: RQr5GTmwW3Fi Do av_clip_int16(val) _after_ copying the value to last_dc. Related commits: c28f648b19d and dffae122d0f Related ticket: 4683 --- libavcodec/mjpegdec.c | 3 +-- tests/ref/fate/jpg-12bpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 1481a7f285..7daec649bc 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -843,9 +843,8 @@ static int decode_block(MJpegDecodeContext *s, int16_t *block, int component, return AVERROR_INVALIDDATA; } val = val * (unsigned)quant_matrix[0] + s->last_dc[component]; - val = av_clip_int16(val); s->last_dc[component] = val; - block[0] = val; + block[0] = av_clip_int16(val); /* AC coefs */ i = 0; {OPEN_READER(re, &s->gb); diff --git a/tests/ref/fate/jpg-12bpp b/tests/ref/fate/jpg-12bpp index b3c662d587..9b039a92c6 100644 --- a/tests/ref/fate/jpg-12bpp +++ b/tests/ref/fate/jpg-12bpp @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 999x749 #sar 0: 1/1 -0, 0, 0, 1, 1496502, 0xd91deb4b +0, 0, 0, 1, 1496502, 0x44efc0af