From patchwork Wed Mar 8 15:25:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Faiz X-Patchwork-Id: 2836 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp1078313vsy; Wed, 8 Mar 2017 07:26:23 -0800 (PST) X-Received: by 10.28.63.84 with SMTP id m81mr14348930wma.42.1488986783381; Wed, 08 Mar 2017 07:26:23 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q6si418177wmg.122.2017.03.08.07.26.22; Wed, 08 Mar 2017 07:26:23 -0800 (PST) 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 294B9688289; Wed, 8 Mar 2017 17:26:06 +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 8B7766804FA for ; Wed, 8 Mar 2017 17:25:59 +0200 (EET) Received: by mail-pf0-f194.google.com with SMTP id v190so4109772pfb.0 for ; Wed, 08 Mar 2017 07:26:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=4c4DH3dvDammkaFFhozJ/qU9M0fSft0OIX+IKFkjT3g=; b=N1MbxJW9bm3SZw14rP2U0wsnBWjNj5jV3KM2/fLBklX/eObu9gdeOHCZfV2+/iluej vGvC1GerXR4dzGjhCJ3JnIjpvQKoxcUsA1Yr4y8BHuNK0vvN5E01sRhulZ3tUK3SFiGp jw0ED4erkfLKifqQK8emGzwzTdtmRTyyi3ij4DxdjPczUzNE79K9Mj7QoP5BYbE7S+Pf rNzGvHXB4GGu/ym/0C0N7KkqMS3V9V9CrFX23n7WHajHRCcIn6ifk5WhpMcYPjN9ClgJ npzUrsTHmXcV/xrqGlP5Ell0yyg5gwJHjwh9wHsP+vVV+XaLb2PAgKbX21eKgy5sgtmC POpQ== 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=4c4DH3dvDammkaFFhozJ/qU9M0fSft0OIX+IKFkjT3g=; b=mDD4zWkUxIIZROe6iww4+uWYR4kNMocq4bYgoxANlGP/EtsG0gUBFDg2t12Txguvka COPmSJtWwuLJpUbDiVV9PL4xXHCPszvAXfMnl6tXia3QQAZ09rzSALmn20IaqG9djc0u nBnZZr6qOOq1HKKJi4Swt7GzreKWd6tZVPaOke4oYjmNC6K9NIY/JSTEHzRlAqaT2ZOb CZ6nlKpzkQvlUPebix6PUe0yFXFUw7j39JdB3MQUyhb3jlBuec0iPAu9l/SrYcIxvLWS VLOElNU0tZQBm2O1br4Q/cFOsYg5p4UU99ta5pnbRgpteBTXA8nuYxNIWRhptkmrrlBu JGpg== X-Gm-Message-State: AMke39kQ/Hp50KZAjzw6rIiuOACtYNoOOtWEoAsV0XuOTxPiWlCKL23akMjGMgxvpoeWLQ== X-Received: by 10.84.216.81 with SMTP id f17mr9511035plj.170.1488986771037; Wed, 08 Mar 2017 07:26:11 -0800 (PST) Received: from localhost.localdomain ([114.121.238.218]) by smtp.gmail.com with ESMTPSA id d189sm7040171pga.17.2017.03.08.07.26.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Mar 2017 07:26:10 -0800 (PST) From: Muhammad Faiz To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Mar 2017 22:25:42 +0700 Message-Id: <20170308152542.31004-1-mfcc64@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] swresample/resample: do not allow odd filter_length 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" except filter_length == 1 odd filter_length gives worse frequency response, even when compared with shorter filter_length also makes build_filter simpler Signed-off-by: Muhammad Faiz --- libswresample/resample.c | 56 +++++++++++--------------------- tests/fate/libswresample.mak | 76 ++++++++++++++++++++++---------------------- 2 files changed, 56 insertions(+), 76 deletions(-) diff --git a/libswresample/resample.c b/libswresample/resample.c index b0d14d1..8f3428f 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -155,6 +155,8 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap if (!tab || !sin_lut) goto fail; + av_assert0(tap_count == 1 || tap_count % 2 == 0); + /* if upsampling, only need to interpolate, no filter */ if (factor > 1.0) factor = 1.0; @@ -165,7 +167,7 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap } for(ph = 0; ph < ph_nb; ph++) { s = sin_lut[ph]; - for(i=0;i<=tap_count;i++) { + for(i=0;i 1) + filter_length = FFALIGN(filter_length, 2); if (exact_rational) { int phase_count_exact, phase_count_exact_den; @@ -320,7 +300,7 @@ static ResampleContext *resample_init(ResampleContext *c, int out_rate, int in_r } if (!c || c->phase_count != phase_count || c->linear!=linear || c->factor != factor - || c->filter_length != FFMAX((int)ceil(filter_size/factor), 1) || c->format != format + || c->filter_length != filter_length || c->format != format || c->filter_type != filter_type || c->kaiser_beta != kaiser_beta) { c = av_mallocz(sizeof(*c)); if (!c) @@ -354,7 +334,7 @@ static ResampleContext *resample_init(ResampleContext *c, int out_rate, int in_r c->phase_count = phase_count; c->linear = linear; c->factor = factor; - c->filter_length = FFMAX((int)ceil(filter_size/factor), 1); + c->filter_length = filter_length; c->filter_alloc = FFALIGN(c->filter_length, 8); c->filter_bank = av_calloc(c->filter_alloc, (phase_count+1)*c->felem_size); c->filter_type = filter_type; diff --git a/tests/fate/libswresample.mak b/tests/fate/libswresample.mak index d07d027..78dbde7 100644 --- a/tests/fate/libswresample.mak +++ b/tests/fate/libswresample.mak @@ -26,16 +26,16 @@ endef #you can use this if you need to update it! #make -k `make fate-list | grep swr` | egrep 'TEST|stddev' | tr '\n' '@' | sed 's#TEST *\([^@]*\)@stddev: *\([0-9.]*\)[^b@]*bytes: *\([0-9]*\) */ *\([0-9]*\)@#fate-\1: CMP_TARGET = \2@fate-\1: SIZE_TOLERANCE = \3 - \4@@#g' | tr '@' '\n' -fate-swr-resample-dblp-2626-44100: CMP_TARGET = 1352.69 +fate-swr-resample-dblp-2626-44100: CMP_TARGET = 1352.67 fate-swr-resample-dblp-2626-44100: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample-dblp-2626-48000: CMP_TARGET = 1352.66 fate-swr-resample-dblp-2626-48000: SIZE_TOLERANCE = 31512 - 20480 -fate-swr-resample-dblp-2626-8000: CMP_TARGET = 1353.09 +fate-swr-resample-dblp-2626-8000: CMP_TARGET = 1352.56 fate-swr-resample-dblp-2626-8000: SIZE_TOLERANCE = 31512 - 20482 -fate-swr-resample-dblp-2626-96000: CMP_TARGET = 1352.68 +fate-swr-resample-dblp-2626-96000: CMP_TARGET = 1352.67 fate-swr-resample-dblp-2626-96000: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample-dblp-44100-2626: CMP_TARGET = 185.82 @@ -62,7 +62,7 @@ fate-swr-resample-dblp-48000-8000: SIZE_TOLERANCE = 576000 - 20484 fate-swr-resample-dblp-48000-96000: CMP_TARGET = 0.47 fate-swr-resample-dblp-48000-96000: SIZE_TOLERANCE = 576000 - 20480 -fate-swr-resample-dblp-8000-2626: CMP_TARGET = 2506.02 +fate-swr-resample-dblp-8000-2626: CMP_TARGET = 2503.33 fate-swr-resample-dblp-8000-2626: SIZE_TOLERANCE = 96000 - 20486 fate-swr-resample-dblp-8000-44100: CMP_TARGET = 15.09 @@ -74,7 +74,7 @@ fate-swr-resample-dblp-8000-48000: SIZE_TOLERANCE = 96000 - 20480 fate-swr-resample-dblp-8000-96000: CMP_TARGET = 13.81 fate-swr-resample-dblp-8000-96000: SIZE_TOLERANCE = 96000 - 20480 -fate-swr-resample-dblp-96000-2626: CMP_TARGET = 675.08 +fate-swr-resample-dblp-96000-2626: CMP_TARGET = 675.07 fate-swr-resample-dblp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474 fate-swr-resample-dblp-96000-44100: CMP_TARGET = 1.44 @@ -86,16 +86,16 @@ fate-swr-resample-dblp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480 fate-swr-resample-dblp-96000-8000: CMP_TARGET = 58.57 fate-swr-resample-dblp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496 -fate-swr-resample-fltp-2626-44100: CMP_TARGET = 1352.69 +fate-swr-resample-fltp-2626-44100: CMP_TARGET = 1352.67 fate-swr-resample-fltp-2626-44100: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample-fltp-2626-48000: CMP_TARGET = 1352.66 fate-swr-resample-fltp-2626-48000: SIZE_TOLERANCE = 31512 - 20480 -fate-swr-resample-fltp-2626-8000: CMP_TARGET = 1353.09 +fate-swr-resample-fltp-2626-8000: CMP_TARGET = 1352.56 fate-swr-resample-fltp-2626-8000: SIZE_TOLERANCE = 31512 - 20482 -fate-swr-resample-fltp-2626-96000: CMP_TARGET = 1352.68 +fate-swr-resample-fltp-2626-96000: CMP_TARGET = 1352.67 fate-swr-resample-fltp-2626-96000: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample-fltp-44100-2626: CMP_TARGET = 185.82 @@ -122,7 +122,7 @@ fate-swr-resample-fltp-48000-8000: SIZE_TOLERANCE = 576000 - 20484 fate-swr-resample-fltp-48000-96000: CMP_TARGET = 0.47 fate-swr-resample-fltp-48000-96000: SIZE_TOLERANCE = 576000 - 20480 -fate-swr-resample-fltp-8000-2626: CMP_TARGET = 2506.02 +fate-swr-resample-fltp-8000-2626: CMP_TARGET = 2503.33 fate-swr-resample-fltp-8000-2626: SIZE_TOLERANCE = 96000 - 20486 fate-swr-resample-fltp-8000-44100: CMP_TARGET = 15.09 @@ -134,7 +134,7 @@ fate-swr-resample-fltp-8000-48000: SIZE_TOLERANCE = 96000 - 20480 fate-swr-resample-fltp-8000-96000: CMP_TARGET = 13.81 fate-swr-resample-fltp-8000-96000: SIZE_TOLERANCE = 96000 - 20480 -fate-swr-resample-fltp-96000-2626: CMP_TARGET = 675.08 +fate-swr-resample-fltp-96000-2626: CMP_TARGET = 675.07 fate-swr-resample-fltp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474 fate-swr-resample-fltp-96000-44100: CMP_TARGET = 1.44 @@ -146,16 +146,16 @@ fate-swr-resample-fltp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480 fate-swr-resample-fltp-96000-8000: CMP_TARGET = 58.57 fate-swr-resample-fltp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496 -fate-swr-resample-s16p-2626-44100: CMP_TARGET = 1393.02 +fate-swr-resample-s16p-2626-44100: CMP_TARGET = 1392.98 fate-swr-resample-s16p-2626-44100: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample-s16p-2626-48000: CMP_TARGET = 1393.01 fate-swr-resample-s16p-2626-48000: SIZE_TOLERANCE = 31512 - 20480 -fate-swr-resample-s16p-2626-8000: CMP_TARGET = 1393.91 +fate-swr-resample-s16p-2626-8000: CMP_TARGET = 1393.36 fate-swr-resample-s16p-2626-8000: SIZE_TOLERANCE = 31512 - 20482 -fate-swr-resample-s16p-2626-96000: CMP_TARGET = 1393.09 +fate-swr-resample-s16p-2626-96000: CMP_TARGET = 1393.07 fate-swr-resample-s16p-2626-96000: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample-s16p-44100-2626: CMP_TARGET = 185.84 @@ -182,7 +182,7 @@ fate-swr-resample-s16p-48000-8000: SIZE_TOLERANCE = 576000 - 20484 fate-swr-resample-s16p-48000-96000: CMP_TARGET = 0.73 fate-swr-resample-s16p-48000-96000: SIZE_TOLERANCE = 576000 - 20480 -fate-swr-resample-s16p-8000-2626: CMP_TARGET = 2506.02 +fate-swr-resample-s16p-8000-2626: CMP_TARGET = 2503.32 fate-swr-resample-s16p-8000-2626: SIZE_TOLERANCE = 96000 - 20486 fate-swr-resample-s16p-8000-44100: CMP_TARGET = 15.13 @@ -206,16 +206,16 @@ fate-swr-resample-s16p-96000-48000: SIZE_TOLERANCE = 1152000 - 20480 fate-swr-resample-s16p-96000-8000: CMP_TARGET = 58.60 fate-swr-resample-s16p-96000-8000: SIZE_TOLERANCE = 1152000 - 20496 -fate-swr-resample-s32p-2626-44100: CMP_TARGET = 1393.02 +fate-swr-resample-s32p-2626-44100: CMP_TARGET = 1392.99 fate-swr-resample-s32p-2626-44100: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample-s32p-2626-48000: CMP_TARGET = 1393.01 fate-swr-resample-s32p-2626-48000: SIZE_TOLERANCE = 31512 - 20480 -fate-swr-resample-s32p-2626-8000: CMP_TARGET = 1393.90 +fate-swr-resample-s32p-2626-8000: CMP_TARGET = 1393.36 fate-swr-resample-s32p-2626-8000: SIZE_TOLERANCE = 31512 - 20482 -fate-swr-resample-s32p-2626-96000: CMP_TARGET = 1393.01 +fate-swr-resample-s32p-2626-96000: CMP_TARGET = 1393.00 fate-swr-resample-s32p-2626-96000: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample-s32p-44100-2626: CMP_TARGET = 185.82 @@ -242,7 +242,7 @@ fate-swr-resample-s32p-48000-8000: SIZE_TOLERANCE = 576000 - 20484 fate-swr-resample-s32p-48000-96000: CMP_TARGET = 0.47 fate-swr-resample-s32p-48000-96000: SIZE_TOLERANCE = 576000 - 20480 -fate-swr-resample-s32p-8000-2626: CMP_TARGET = 2506.02 +fate-swr-resample-s32p-8000-2626: CMP_TARGET = 2503.33 fate-swr-resample-s32p-8000-2626: SIZE_TOLERANCE = 96000 - 20486 fate-swr-resample-s32p-8000-44100: CMP_TARGET = 15.09 @@ -254,7 +254,7 @@ fate-swr-resample-s32p-8000-48000: SIZE_TOLERANCE = 96000 - 20480 fate-swr-resample-s32p-8000-96000: CMP_TARGET = 13.81 fate-swr-resample-s32p-8000-96000: SIZE_TOLERANCE = 96000 - 20480 -fate-swr-resample-s32p-96000-2626: CMP_TARGET = 675.08 +fate-swr-resample-s32p-96000-2626: CMP_TARGET = 675.07 fate-swr-resample-s32p-96000-2626: SIZE_TOLERANCE = 1152000 - 20474 fate-swr-resample-s32p-96000-44100: CMP_TARGET = 1.44 @@ -389,16 +389,16 @@ fate-swr-resample_exact-$(3)-$(1)-$(2): FUZZ = 0.1 fate-swr-resample_exact-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav endef -fate-swr-resample_exact-dblp-2626-44100: CMP_TARGET = 1352.69 +fate-swr-resample_exact-dblp-2626-44100: CMP_TARGET = 1352.67 fate-swr-resample_exact-dblp-2626-44100: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample_exact-dblp-2626-48000: CMP_TARGET = 1352.66 fate-swr-resample_exact-dblp-2626-48000: SIZE_TOLERANCE = 31512 - 20480 -fate-swr-resample_exact-dblp-2626-8000: CMP_TARGET = 1353.09 +fate-swr-resample_exact-dblp-2626-8000: CMP_TARGET = 1352.56 fate-swr-resample_exact-dblp-2626-8000: SIZE_TOLERANCE = 31512 - 20482 -fate-swr-resample_exact-dblp-2626-96000: CMP_TARGET = 1352.68 +fate-swr-resample_exact-dblp-2626-96000: CMP_TARGET = 1352.67 fate-swr-resample_exact-dblp-2626-96000: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample_exact-dblp-44100-2626: CMP_TARGET = 185.82 @@ -425,7 +425,7 @@ fate-swr-resample_exact-dblp-48000-8000: SIZE_TOLERANCE = 576000 - 20484 fate-swr-resample_exact-dblp-48000-96000: CMP_TARGET = 0.47 fate-swr-resample_exact-dblp-48000-96000: SIZE_TOLERANCE = 576000 - 20480 -fate-swr-resample_exact-dblp-8000-2626: CMP_TARGET = 2506.02 +fate-swr-resample_exact-dblp-8000-2626: CMP_TARGET = 2503.33 fate-swr-resample_exact-dblp-8000-2626: SIZE_TOLERANCE = 96000 - 20486 fate-swr-resample_exact-dblp-8000-44100: CMP_TARGET = 14.59 @@ -437,7 +437,7 @@ fate-swr-resample_exact-dblp-8000-48000: SIZE_TOLERANCE = 96000 - 20480 fate-swr-resample_exact-dblp-8000-96000: CMP_TARGET = 13.62 fate-swr-resample_exact-dblp-8000-96000: SIZE_TOLERANCE = 96000 - 20480 -fate-swr-resample_exact-dblp-96000-2626: CMP_TARGET = 675.08 +fate-swr-resample_exact-dblp-96000-2626: CMP_TARGET = 675.07 fate-swr-resample_exact-dblp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474 fate-swr-resample_exact-dblp-96000-44100: CMP_TARGET = 1.23 @@ -449,16 +449,16 @@ fate-swr-resample_exact-dblp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480 fate-swr-resample_exact-dblp-96000-8000: CMP_TARGET = 58.52 fate-swr-resample_exact-dblp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496 -fate-swr-resample_exact-fltp-2626-44100: CMP_TARGET = 1352.69 +fate-swr-resample_exact-fltp-2626-44100: CMP_TARGET = 1352.67 fate-swr-resample_exact-fltp-2626-44100: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample_exact-fltp-2626-48000: CMP_TARGET = 1352.66 fate-swr-resample_exact-fltp-2626-48000: SIZE_TOLERANCE = 31512 - 20480 -fate-swr-resample_exact-fltp-2626-8000: CMP_TARGET = 1353.09 +fate-swr-resample_exact-fltp-2626-8000: CMP_TARGET = 1352.56 fate-swr-resample_exact-fltp-2626-8000: SIZE_TOLERANCE = 31512 - 20482 -fate-swr-resample_exact-fltp-2626-96000: CMP_TARGET = 1352.68 +fate-swr-resample_exact-fltp-2626-96000: CMP_TARGET = 1352.67 fate-swr-resample_exact-fltp-2626-96000: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample_exact-fltp-44100-2626: CMP_TARGET = 185.82 @@ -485,7 +485,7 @@ fate-swr-resample_exact-fltp-48000-8000: SIZE_TOLERANCE = 576000 - 20484 fate-swr-resample_exact-fltp-48000-96000: CMP_TARGET = 0.47 fate-swr-resample_exact-fltp-48000-96000: SIZE_TOLERANCE = 576000 - 20480 -fate-swr-resample_exact-fltp-8000-2626: CMP_TARGET = 2506.02 +fate-swr-resample_exact-fltp-8000-2626: CMP_TARGET = 2503.33 fate-swr-resample_exact-fltp-8000-2626: SIZE_TOLERANCE = 96000 - 20486 fate-swr-resample_exact-fltp-8000-44100: CMP_TARGET = 14.59 @@ -497,7 +497,7 @@ fate-swr-resample_exact-fltp-8000-48000: SIZE_TOLERANCE = 96000 - 20480 fate-swr-resample_exact-fltp-8000-96000: CMP_TARGET = 13.62 fate-swr-resample_exact-fltp-8000-96000: SIZE_TOLERANCE = 96000 - 20480 -fate-swr-resample_exact-fltp-96000-2626: CMP_TARGET = 675.08 +fate-swr-resample_exact-fltp-96000-2626: CMP_TARGET = 675.07 fate-swr-resample_exact-fltp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474 fate-swr-resample_exact-fltp-96000-44100: CMP_TARGET = 1.23 @@ -509,16 +509,16 @@ fate-swr-resample_exact-fltp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480 fate-swr-resample_exact-fltp-96000-8000: CMP_TARGET = 58.52 fate-swr-resample_exact-fltp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496 -fate-swr-resample_exact-s16p-2626-44100: CMP_TARGET = 1393.02 +fate-swr-resample_exact-s16p-2626-44100: CMP_TARGET = 1392.98 fate-swr-resample_exact-s16p-2626-44100: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample_exact-s16p-2626-48000: CMP_TARGET = 1393.01 fate-swr-resample_exact-s16p-2626-48000: SIZE_TOLERANCE = 31512 - 20480 -fate-swr-resample_exact-s16p-2626-8000: CMP_TARGET = 1393.91 +fate-swr-resample_exact-s16p-2626-8000: CMP_TARGET = 1393.36 fate-swr-resample_exact-s16p-2626-8000: SIZE_TOLERANCE = 31512 - 20482 -fate-swr-resample_exact-s16p-2626-96000: CMP_TARGET = 1393.09 +fate-swr-resample_exact-s16p-2626-96000: CMP_TARGET = 1393.07 fate-swr-resample_exact-s16p-2626-96000: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample_exact-s16p-44100-2626: CMP_TARGET = 185.84 @@ -545,7 +545,7 @@ fate-swr-resample_exact-s16p-48000-8000: SIZE_TOLERANCE = 576000 - 20484 fate-swr-resample_exact-s16p-48000-96000: CMP_TARGET = 0.73 fate-swr-resample_exact-s16p-48000-96000: SIZE_TOLERANCE = 576000 - 20480 -fate-swr-resample_exact-s16p-8000-2626: CMP_TARGET = 2506.02 +fate-swr-resample_exact-s16p-8000-2626: CMP_TARGET = 2503.32 fate-swr-resample_exact-s16p-8000-2626: SIZE_TOLERANCE = 96000 - 20486 fate-swr-resample_exact-s16p-8000-44100: CMP_TARGET = 14.63 @@ -569,16 +569,16 @@ fate-swr-resample_exact-s16p-96000-48000: SIZE_TOLERANCE = 1152000 - 20480 fate-swr-resample_exact-s16p-96000-8000: CMP_TARGET = 58.56 fate-swr-resample_exact-s16p-96000-8000: SIZE_TOLERANCE = 1152000 - 20496 -fate-swr-resample_exact-s32p-2626-44100: CMP_TARGET = 1393.02 +fate-swr-resample_exact-s32p-2626-44100: CMP_TARGET = 1392.99 fate-swr-resample_exact-s32p-2626-44100: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample_exact-s32p-2626-48000: CMP_TARGET = 1393.01 fate-swr-resample_exact-s32p-2626-48000: SIZE_TOLERANCE = 31512 - 20480 -fate-swr-resample_exact-s32p-2626-8000: CMP_TARGET = 1393.90 +fate-swr-resample_exact-s32p-2626-8000: CMP_TARGET = 1393.36 fate-swr-resample_exact-s32p-2626-8000: SIZE_TOLERANCE = 31512 - 20482 -fate-swr-resample_exact-s32p-2626-96000: CMP_TARGET = 1393.01 +fate-swr-resample_exact-s32p-2626-96000: CMP_TARGET = 1393.00 fate-swr-resample_exact-s32p-2626-96000: SIZE_TOLERANCE = 31512 - 20480 fate-swr-resample_exact-s32p-44100-2626: CMP_TARGET = 185.82 @@ -605,7 +605,7 @@ fate-swr-resample_exact-s32p-48000-8000: SIZE_TOLERANCE = 576000 - 20484 fate-swr-resample_exact-s32p-48000-96000: CMP_TARGET = 0.47 fate-swr-resample_exact-s32p-48000-96000: SIZE_TOLERANCE = 576000 - 20480 -fate-swr-resample_exact-s32p-8000-2626: CMP_TARGET = 2506.02 +fate-swr-resample_exact-s32p-8000-2626: CMP_TARGET = 2503.33 fate-swr-resample_exact-s32p-8000-2626: SIZE_TOLERANCE = 96000 - 20486 fate-swr-resample_exact-s32p-8000-44100: CMP_TARGET = 14.59 @@ -617,7 +617,7 @@ fate-swr-resample_exact-s32p-8000-48000: SIZE_TOLERANCE = 96000 - 20480 fate-swr-resample_exact-s32p-8000-96000: CMP_TARGET = 13.62 fate-swr-resample_exact-s32p-8000-96000: SIZE_TOLERANCE = 96000 - 20480 -fate-swr-resample_exact-s32p-96000-2626: CMP_TARGET = 675.08 +fate-swr-resample_exact-s32p-96000-2626: CMP_TARGET = 675.07 fate-swr-resample_exact-s32p-96000-2626: SIZE_TOLERANCE = 1152000 - 20474 fate-swr-resample_exact-s32p-96000-44100: CMP_TARGET = 1.23