From patchwork Thu Sep 6 06:06:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 10243 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp120524jap; Wed, 5 Sep 2018 23:06:43 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZjBkkLZieCPo3g+8z6o/+NbVY3POnBQW0VpHBYCGAZqlxF77S5Zp7p6KsYxOM55UiVUPYm X-Received: by 2002:a1c:9d02:: with SMTP id g2-v6mr925058wme.122.1536214003073; Wed, 05 Sep 2018 23:06:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536214003; cv=none; d=google.com; s=arc-20160816; b=dsTQEnO/l19iX2oFxKJOD9ZUlB17qXzZ98RAThq91K9MlK0ECrpKVpgNjYvTOmqAwJ w13AJMtn5W3i5AHKWFyIw8UjZLbtHyY4/ZMrAJVEbTcfzKcrVLTyBcTPisFcURf6f6Zf 7WHMfU5RmTT1XL6C9t69DcZ8bdJNAmQRMY5zhcFzktQs2QE0k7yl8lhsgAHt9w+2exat vk8xcGr4iFj1ZF4uyLIhE/DQ+OqXV7mjVWOcAnXLjHjDdw39dHuJtNSuS9aEjaR8z2be bjiOIyusOJh5fOHusZzs+C22AJklL5cV2k28wHl6dQNZ6kyrIQ7DWcCuMzl0D3KgwLOK lCPA== 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:in-reply-to:references:mime-version :dkim-signature:delivered-to; bh=PhGV2vADDRM4DYcD4Zit7NOHTaB9cBmC46hqx9+wvkc=; b=np8oZl2jbERii/NZIqjz3v/PylSTKSGtQgiTsDKIHOC7r9U1b/CXRfInGejkGKnxRJ 3WOMFCyldcT4/ebhiUGUUqDuxnRisc+7+6cFPBSvL+lp3G09MD4pycp+UJb5ruNAN3gx vCpej2ifcfSqlpqP0BKc8loex/FDKX7T9Kx3ktSNdeZK6c5lMEfIPTZ0SLggXfGqMXE6 QKXAhto6RcOV9rquaRKiKnGUAcMxdL2p5ros2VOL3LIwO0M5LJ5MlNj0DKZE6S4thYGl 4Nql3ZJdmD0d6bWG49bLm1Lzr6hy6fpQdWSDnTr8v/YoyF+TXr8opunChrgCgkRxqDWN fgtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KdZOtp5j; 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 z65-v6si3155632wme.78.2018.09.05.23.06.42; Wed, 05 Sep 2018 23:06:43 -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=20161025 header.b=KdZOtp5j; 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 053CA689F1F; Thu, 6 Sep 2018 09:06:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f52.google.com (mail-it0-f52.google.com [209.85.214.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40B3B689EE6 for ; Thu, 6 Sep 2018 09:06:26 +0300 (EEST) Received: by mail-it0-f52.google.com with SMTP id 139-v6so12727456itf.0 for ; Wed, 05 Sep 2018 23:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=bGHrMDuJ6QvJx6jVbUXCoSLqs9wzvOYMDzxwfs32TTo=; b=KdZOtp5jSeROUrK+m866eV7z4EdWhUM9q57bsyum6KOAgd5hTa6prSGA9l71LHDnH5 Bcw8URl9JHKJ3YZ/EzWsiJDSdaGhfgp61zMeoURFBCywuFdV993wzfqyQ6x2I09XYGbH ggJ0s+diQ1MCTYV2T4zBCgX3J3GEAFidGHHDRHgiPZi5sKQC7LfMvh9z04LbyMAFDy/y FNk4wlb+335XM8m7fOiiwx4Vd9gSmixjmt+7dwKhTjh8Z/b05oRRl5YVoom6G8MSw0XI pZZWjNHE4EPyn2fHqRsBagkb0IsxK/MQhQqSSZ7CHFTuPew80CZq/QkWAiEMYjf/r3LK F5Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=bGHrMDuJ6QvJx6jVbUXCoSLqs9wzvOYMDzxwfs32TTo=; b=Pc8xMLBsfyMCjmlqTme58guVBwlMYQpma6ze1Y7xRy676zEY4eLJRjYGesuRxi0cVd BrOVKImbF4VumpFVa5iE4MxWCPa/9ixjLhCIdIz5sJtGQNWleNFZma4tY4NRYClubS9+ kTVdMFjPXywfVob5AiU+SRu3G3ViPqX14gGPAshrDp+l+C9jQb2M42Pc5U2uHZKJGbG0 p2/aZtHHUMvWnh43FjHsy2AwQP9zUfcLrj2t/RNkvkiLUZuDWue0HA89X7O2/DIIUdpT eER9dCZLhcIszcBediBSw5H+k4JBwRCVB3AkvGBaNalcBID4z7jpeO5SpyZtjDzpu15D 1d/A== X-Gm-Message-State: APzg51BSIiGhl6O/QRW6tNAH67bJpybhwCT/UWNb+Z0ligk09o+A1b7T yUueHbIuafWh7CJG+3im5oUlCLq0ZJbz8Djxwf8FSg== X-Received: by 2002:a24:ac44:: with SMTP id m4-v6mr1309638iti.90.1536213992326; Wed, 05 Sep 2018 23:06:32 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Gagandeep Singh Date: Thu, 6 Sep 2018 11:36:22 +0530 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [GSOC][PATCH 2/3] lavc/cfhd:corrected decompanding for table 9 used in cfhd 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" On Fri, Aug 17, 2018 at 11:34 AM Gagandeep Singh wrote: > > > On Thu, Aug 16, 2018 at 2:37 AM Kieran Kunhya wrote: > >> On Tue, 14 Aug 2018 at 08:43 Gagandeep Singh >> wrote: >> >> > Second patch for fixing decompanding in table 9. >> > >> > Gagandeep Singh >> > >> >> Seems ok >> >> Kieran >> > > Thanks!! > > Gagandeep Singh > Hi, This patch is to be applied along with the other updated patches. Thanks Gagandeep Singh > _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > From 4f0c812aaf50738e579bde0bb12b9f2391eb15e5 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Thu, 6 Sep 2018 11:12:16 +0530 Subject: [GSOC][PATCH 2/3] lavc/cfhd: correct decompanding for old codebook (table 9) --- libavcodec/cfhd.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index 3929b54f31..e78fa81655 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -114,7 +114,30 @@ static inline int dequant_and_decompand(int level, int quantisation, int codeboo { if (lossless) return level; - if (codebook == 0 || codebook == 1) { + if (codebook == 0) { + if (level >= 40 && level < 264) { + if (level >= 54) { + level -= 54; + level <<= 2; + level += 54; + } + level -= 40; + level <<= 2; + level += 40; + } else if (level <= -40) { + level = -level; + if (level >= 54) { + level -= 54; + level <<= 2; + level += 54; + } + level -= 40; + level <<= 2; + level += 40; + level = -level; + } + return level * quantisation; + } else if (codebook == 1) { int64_t abslevel = abs(level); if (level < 264) return (abslevel + ((768 * abslevel * abslevel * abslevel) / (255 * 255 * 255))) * -- 2.17.1