From patchwork Tue Jul 9 20:18:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jai Luthra X-Patchwork-Id: 13877 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 195DA4483BB for ; Tue, 9 Jul 2019 23:19:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02A4768AB27; Tue, 9 Jul 2019 23:19:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9380268AABC for ; Tue, 9 Jul 2019 23:19:23 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id u14so8648758pfn.2 for ; Tue, 09 Jul 2019 13:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jailuthra-in.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=X58C+95UOMog/o0eHIS9Xolkb2R3U/4hz5GmBJBoZjI=; b=Yz1xtTCS8HCL6lib6BQjX5jKxxmWnSZeIcCQ/LTM12Jr4R1tEqGmE9l4FPOFCnozYb jgNHPnMNcJJfYf2AgcmZecGMXnJdyfxpXmENSDiXMpNcgJFcmKhWgdgQ9sCmH+8f4Z6P O1bAx9wGqrJq1DRtYAI+Ed3e3Wxz/pHRwlxq+8RlqEcyBajUP3cdkEmUw4cmHIdp/rKQ jf6wLP8pgVQD0wHRZhoAzpEeCe6WUiHmk0X3XXJ9ozYfljeFwxBXD//6uJjiNmgCjIGh DKl5KKbxcroWu3Vl8n7jHw93vmcz9iUuhGjcvcMVxtTNDLtGfJ7JYbH01Q1bce6fmrYg lmmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X58C+95UOMog/o0eHIS9Xolkb2R3U/4hz5GmBJBoZjI=; b=E6E/a2agn+uUa/Cb/XMm1Fdd21Z+zH0FqSpd6ew+8wlM6BB+F9+k9GbPhwK8DBnVpM HqhRDytTZKUN92L2x1Lc/XRgbwzj6grS8kqX4NUUt2pXUE9AiaAuwTF0AyI2esmcM809 +/2/zFJ8JHG6pwJ/w5TJ9APxKT/rBIfiqwZJCQpsnFJLnzARGXMHgkEejx2DtvcQlqwj Dw1Epj61yY9dLn5OIj8nVpn/v8OIpQibDCrAO88xiazZVPE93vR3FjjfKpBOxaZ4+Fnm U1MzNYQSGFPLG0tuvlMxkJcCiMAnhm7B0yNnxfC/eqTWXoTzSUH4AmAjnfOEDviiRRno v08Q== X-Gm-Message-State: APjAAAXyJGhipzbWLuLuciyE2UwKDpXxbRgTbSTgzFp+SYHkmSYwFf1W bVQnx7BbtvE1sDb/NEUOkD2bUmDhDHw= X-Google-Smtp-Source: APXvYqzsl9fM8/AxNoRHuZuGMI9OjZxLUkpuhZk/yyfOg1xxaMClEuqTXGE86f0f6oeRXUfA3QPdvQ== X-Received: by 2002:a63:595e:: with SMTP id j30mr30982548pgm.2.1562703561691; Tue, 09 Jul 2019 13:19:21 -0700 (PDT) Received: from localhost.localdomain ([122.180.207.198]) by smtp.googlemail.com with ESMTPSA id b126sm26212575pfa.126.2019.07.09.13.19.20 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 09 Jul 2019 13:19:21 -0700 (PDT) From: Jai Luthra To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Jul 2019 01:48:58 +0530 Message-Id: <20190709201901.26693-2-me@jailuthra.in> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190709201901.26693-1-me@jailuthra.in> References: <20190709201901.26693-1-me@jailuthra.in> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] mlpenc: fix huff offset calculation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" huff offset wasn't always within the bounds before, which lead to corrupt encoding that didn't always trigger lossless check failures Signed-off-by: Jai Luthra --- libavcodec/mlpenc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index f4948451f1..1cee38c82f 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -1699,7 +1699,7 @@ static inline void codebook_bits(MLPEncodeContext *ctx, offset_min = FFMAX(min, HUFF_OFFSET_MIN); offset_max = FFMIN(max, HUFF_OFFSET_MAX); - for (;;) { + while (offset <= offset_max && offset >= offset_min) { BestOffset temp_bo; codebook_bits_offset(ctx, channel, codebook, @@ -1718,12 +1718,8 @@ static inline void codebook_bits(MLPEncodeContext *ctx, if (direction) { offset = temp_bo.max + 1; - if (offset > offset_max) - break; } else { offset = temp_bo.min - 1; - if (offset < offset_min) - break; } } }