From patchwork Fri Jan 24 10:33:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jai Luthra X-Patchwork-Id: 17506 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 6B75F448F4D for ; Fri, 24 Jan 2020 13:03:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4499368AE91; Fri, 24 Jan 2020 13:03:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C291068A764 for ; Fri, 24 Jan 2020 13:02:59 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id x8so832971pgk.8 for ; Fri, 24 Jan 2020 03:02:59 -0800 (PST) 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=ykHunujTnewngmlMEpAQ/zkcm5eGL7IbB1Yq+iCDj+M=; b=yWhmr8/c/5cWmVHl9nbqUX+bL5Hg3yxVuy8F5QgifMLEbq3Yiu/EMic95K8fC7Ikrw O2jDvBQC15NV4ekAp3IvI/Z852iNtScKDKS3V1oMT+qWIEVwp//euoNH0pIPb8iFfb1E WcoGt3X5v2n20BrIn+Z1DleTMtHcRBT0BO4NJ09/63qI9YI8Wt1+Lzt5FWZnU4C2+GE7 3xeQJfctAbw4kWtuVy+KabuD3Ar5Lxjzp7z2Mm20KvZJS7cE2a5+aYrLczzlJE4g+IbH vl0C9Lyvy2AXAgs1oxb+jGJ5sdyYn2t9OTPyNDH/P2HmY/EuORAhhUyNpUdlsH5db1fW roxA== 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=ykHunujTnewngmlMEpAQ/zkcm5eGL7IbB1Yq+iCDj+M=; b=h3bS9lcX2MHShI+Un/7tzGJyyIHgWKfaq9gYolHkHrgom6PiRTKktblugDBQKU1qFI Ipm2HNDSVRvpODl2j/dtUOOUtd9x6crUHTKlkyK7vMuanwnpbvdesCC1x63BVwPOKh50 bwfM4T56C4lZ73cO2gIV6MXva8CixjrbK0phDLsoXOfgxi5PlfpiNfSWH6t0hHN8EbQG zjGgCpR/g7a8pz3F6L/OSTk6XLlnTvpF6F4avyV2UAUV3qzvTYR34i1zus6PRThrPl+7 +qjIR/PGeabp1mlBfnyG5BeOm/HLcAOg04i8pNfavSnqw359uVjNfvE21e42wu0tAmXC bWRQ== X-Gm-Message-State: APjAAAWhLWbKmZ72Msg/SZ6s1hmvKrwPrIvMNTEKBrXh0/UCdb75OTPW zQdQGd9KhH1gesU1A9BVPpF/CHOhDsY= X-Google-Smtp-Source: APXvYqxEKA4nXMkMd1noQ0LB4VnlxXrqdnUkh3iYNc0uCZoZoyu+W7vmp9waAlqEl9DBUhstpU7yBw== X-Received: by 2002:a17:902:8495:: with SMTP id c21mr2919887plo.279.1579862027559; Fri, 24 Jan 2020 02:33:47 -0800 (PST) Received: from localhost.localdomain ([49.207.55.142]) by smtp.googlemail.com with ESMTPSA id j125sm5471274pfg.160.2020.01.24.02.33.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2020 02:33:47 -0800 (PST) From: Jai Luthra To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jan 2020 16:03:31 +0530 Message-Id: <20200124103334.110855-3-me@jailuthra.in> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124103334.110855-1-me@jailuthra.in> References: <20200124103334.110855-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; } } }