From patchwork Fri Jul 5 00:21:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50351 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4006714vqv; Thu, 4 Jul 2024 17:44:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWkBtuXDfjiUXXLrgKZG3KqmYriTBM358dIXsmm7v/Jqy2rWuqvOxfu5lRxBTGEXuBZv4wJpn78tt1Say2eiH2P10vwdiooTVd4RQ== X-Google-Smtp-Source: AGHT+IEtsIHjUdmG8t0w2IwXQwnyx2khub+KNDzZYhlcBZKb+4XZjb7EuvbwcNAXbDzzfR7cikOU X-Received: by 2002:a17:906:58f:b0:a77:aa6d:e0c7 with SMTP id a640c23a62f3a-a77ba4789efmr204054266b.30.1720140247693; Thu, 04 Jul 2024 17:44:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720140247; cv=none; d=google.com; s=arc-20160816; b=w0DwSqZv7baww4ax1dsXphr/LRqMMb/ebF9V9sbT8axkERjlThyXVDmmU3KdSmlLY1 EYSfYUHTuia0ls+LvmuzOSwgJJwq0bC9CO+U4TCYqGLXSghqgGzORpJ9V8Ie0FEnB7Gs xHkbzuANEwk4XeNKgnt7tB3yyDV6XO+g0QvmivujLurwXoKiZHQoK9ckLpMWQptdgq5I QT9RP8gLaq9ajAJTXnBrjYipV23LWj5zZgzk8rPfPQb/ipO1E6HOVHkCnT3uK91X8O/c LPdxqGVghAi8VQZBSrPdWb/7q496pbBKmRkws0bzU6nscFofV733XEhkp8FVp/ySoqGb St4w== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Ofdk+ij4/fBOHV6wPvTob1MckHEx99F1nUxxm5M+fCI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=s8+M/aN0h+pKxMIMzk1MT67wt75nda5z2JfFrrHXLk5MHgtNiFrJ9jroXCKmg1ngM+ A/Z1GebVdglzLISxGLLajz0LY9PehuFxCqVqb5T7k4bFhsydl7T/XgA0ja2Y2l9eV6go f89QlWCisgy7AZSlWzWJaPgBskjSh85UQR5ZL1uQQOfrIxfPPUN85iEf2W1fjX8BVsMY P4hZp8RT2jB6SHuYwTscejWK8AmISX4OoNFWhnaCjXvid+j6SeEJD4AnKqCzIVb4TXBX R6XdeLtfMOSJKod11cxi9anK1obJywW3D/Lr7mOfvI/3c1PuKR8tNdcYQZv7Wl7MiLf1 FDbA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="ME6ND/xg"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a72ae7d7b73si712677766b.409.2024.07.04.17.44.07; Thu, 04 Jul 2024 17:44: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=@niedermayer.cc header.s=gm1 header.b="ME6ND/xg"; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 95A9068DB15; Fri, 5 Jul 2024 03:22:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1B3C68DACA for ; Fri, 5 Jul 2024 03:22:08 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id EECC260002 for ; Fri, 5 Jul 2024 00:22:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720138928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JWWz5hevY8M+lk5CqkcOeKuUU6oRV1l7qu8zWW5MVKE=; b=ME6ND/xgE7YmVT/CH98CnE7YwhFJim8yJqqb0ZiE2mKSjz4enplrbeHpXJDO3/cuRYyl0g fLyGxNv+pBCoD5oXlbnJ4Hb84/r0iKyK8+3AsbPOA2p6tGdhrTh5c5QljOz+jBi70Tss0S kF/BuFZL3uYbbutJJTwP1J5f/NQoZBdrs8XTxKuYKV2K2ckQQSYa9b6dYx3sg6aGKDQw4Y eiLy5eb0898lEhp4/UHVod/zFZe8ErAQd6IyGo7lC3la14EDOIV6wCwPqSlmg+v5nkZHfG kMUvaNoY/YriaJTjFZVSYqpe4FVcwjoqdKVwcTy3O0tnVUYQwPSEhz62KSgQNg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 5 Jul 2024 02:21:55 +0200 Message-ID: <20240705002156.1964272-14-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240705002156.1964272-1-michael@niedermayer.cc> References: <20240705002156.1964272-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 14/15] avcodec/motion_est: Fix score squaring overflow 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: FZRcFmbc90Sk Fixes: CID1604552 Overflowed constant Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/motion_est.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 554fc9780e2..e4f17fb2d86 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -1454,7 +1454,7 @@ static inline int direct_search(MpegEncContext * s, int mb_x, int mb_y) s->b_direct_mv_table[mot_xy][0]= 0; s->b_direct_mv_table[mot_xy][1]= 0; - return 256*256*256*64; + return 256*256*256*64-1; } c->xmin= xmin;