From patchwork Fri Mar 17 01:01:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Faiz X-Patchwork-Id: 2977 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp48318vsy; Thu, 16 Mar 2017 18:01:46 -0700 (PDT) X-Received: by 10.223.162.130 with SMTP id s2mr11468680wra.149.1489712506624; Thu, 16 Mar 2017 18:01:46 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i16si8854602wrc.136.2017.03.16.18.01.46; Thu, 16 Mar 2017 18:01:46 -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; 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=NONE 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 2E922688342; Fri, 17 Mar 2017 03:01:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AD5468831B for ; Fri, 17 Mar 2017 03:01:19 +0200 (EET) Received: by mail-pf0-f194.google.com with SMTP id o126so7407056pfb.1 for ; Thu, 16 Mar 2017 18:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=DGk45J838fkTNP8VTlxAXGjNC6Obw7OYhSRJLVhDZLM=; b=Mo69ocyJCoRSAH1qYbfqrkWjm/8Opc8nBjBz3hBgxEpsEoMsdWFl0i6M+N9+o4SSCC +dAncwGsKyTWnjOpP4H6H4NBXGbp/F8MlWg2ACtH6XvUJNThUqX5mXM5owgOAkE073YY VdnR7C3e+8e+rODHhu2S2YWSCVO9MD0flRNFqZzn7QFrrPlCEEKTiKGorYR1gkxcGcq2 HRkoflTiIPf90vYpDOjhRrrrMHpGf4MtzLD6hkRb83Got1Cnvwruiae2ZTZWhBCKpf+y iLY9lZMHJ60PfXtuguRqUJ60dfks/qAczr8857K8UYuUJmUwUegWksdtU0ZWZjoVYY2q 6Lwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DGk45J838fkTNP8VTlxAXGjNC6Obw7OYhSRJLVhDZLM=; b=NpeAG32W2XAK//Hs03WszTijiCPjKzFnYO9LbFnRsGIRSmUktkUAPIuy7DGIPlhw8U l2L2czAWgLCt5K+uhbaiYvnWQRvf68bxaYVjLJYJq+rIZ4QfXdVuwrGjnqsdWbtl+x9q /Pj0AtLyFb2ayX4vjGQR3AWs+7KDYDQU9622HjZgk8AK/qwag2+RHHEaBpQ2fCGL4wy2 KSx3sDvzl2uFMmOD9n2n2Yd5KI4sNfZ03yMx0UxkyNbxWmQWzCEh0Ie0AtvWmNKkYJ0d GjFk2lCgW0oKgPuPQta7kxVqZFbGERgqeXNv5cmEgTwBCgobOXl/4XVt1Nf5JGpl7UXE 3rZA== X-Gm-Message-State: AFeK/H27Z3Cv2XFsLqbLuucRjrAMkHjBpemdUhMOtO5NT0nS21KMTuje9IiPWbsmFkl3YA== X-Received: by 10.99.217.17 with SMTP id r17mr13182876pgg.140.1489712494763; Thu, 16 Mar 2017 18:01:34 -0700 (PDT) Received: from localhost.localdomain ([114.120.235.151]) by smtp.gmail.com with ESMTPSA id u64sm449636pfk.113.2017.03.16.18.01.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Mar 2017 18:01:34 -0700 (PDT) From: Muhammad Faiz To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Mar 2017 08:01:23 +0700 Message-Id: <20170317010123.25787-1-mfcc64@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] swresample/resample: do not assert compensation_distance on rebuild_filter 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 Cc: Muhammad Faiz MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" when set_compensation is called with zero sample_delta, compensation does not happen (because dst_incr == ideal_dst_incr) but compensation_distance is set regression since 01ebb57c03abde89bca7bdbc552917efcb8f551d Found-by: wm4 Signed-off-by: Muhammad Faiz --- libswresample/resample.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswresample/resample.c b/libswresample/resample.c index 8f3428f..144b232 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -388,7 +388,7 @@ static int rebuild_filter_bank_with_compensation(ResampleContext *c) if (phase_count == c->phase_count) return 0; - av_assert0(!c->frac && !c->dst_incr_mod && !c->compensation_distance); + av_assert0(!c->frac && !c->dst_incr_mod); new_filter_bank = av_calloc(c->filter_alloc, (phase_count + 1) * c->felem_size); if (!new_filter_bank)