From patchwork Tue Aug 15 15:17:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4710 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp5674865vsu; Tue, 15 Aug 2017 08:18:09 -0700 (PDT) X-Received: by 10.28.67.68 with SMTP id q65mr1794375wma.162.1502810289077; Tue, 15 Aug 2017 08:18:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502810289; cv=none; d=google.com; s=arc-20160816; b=t2WhK75kXU35LD51xUBY+GGPUJO4RtPur0dhcKsb9Zj1Fc/8cthSB4BDKjJJM8NOUn zYv58U2hB6KrAcg46dK+DYEvKJXQ41WlV/zHq6lt6qjUjHX/h3dC7NKIRDzbEU10f0bG 2A1TPUDyv+MxgxwLhryyFdCMx3RsCXKAEbg2DR++NcRONQ3ZR96vb3HWsY13GdoX0COU FGc8ugQoWV43NXd+F7JCpg3OIlY+4vocF215E61BZj4/Zo8Oyr8ypZ9Ak91FvRUyg/QI 8yoEGYvlJ3w5tWo7mubiLsd4B5Eq02bIN662CHUGlKnj8kpHUwwr3nK1jIo1f23GX2AE ujJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=EdxfOFM/T++EjCJupLzJriTomOPFCPaio8ssrPFm7ls=; b=JhyXo3o7dyly85sBEnZf4J94vHGCFxGlwFhngiKf8tPxIv2etnbCiJKmU11kV+tLKs v7i37HyiqSNJFQG/fd/Ld5uGneEkLR7gwMqs8CHba8ff+WDhydYyYRd9mKh4uSjpXz1Y kjiekWygBYWyy8AFYZDiHKhS1FaRhTWH6CvwCvBiewYfAOaYfIdSsVmT5Y8Xptp/ckSB bbDD+UL47x3aGPoYD4mO8JXi2cBAKIe73wxiytQL5GKTZq/RENgroJ5yNymxD2024Pta LFvRdf6qSOCGLp+ICxp8G4ZdUmKhb+raNKH0wHvn//kCckeq83EDG5LVlrRrghOolEl+ 4uBw== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k69si1403331wmc.216.2017.08.15.08.18.08; Tue, 15 Aug 2017 08:18:09 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 54897689C65; Tue, 15 Aug 2017 18:18:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D7B168837F for ; Tue, 15 Aug 2017 18:17:54 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dhdbS-0005O3-55 for ffmpeg-devel@ffmpeg.org; Tue, 15 Aug 2017 17:17:58 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id xTHq1v00j0S5wYM01THr97; Tue, 15 Aug 2017 17:17:52 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 15 Aug 2017 17:17:49 +0200 Message-Id: <20170815151749.17024-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH] swresample/resample: Fix flush refelction 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libswresample/resample.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libswresample/resample.c b/libswresample/resample.c index 39c242bf41..df49505bf9 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -544,18 +544,21 @@ static int64_t get_out_samples(struct SwrContext *s, int in_samples) { } static int resample_flush(struct SwrContext *s) { + ResampleContext *c = s->resample; AudioData *a= &s->in_buffer; int i, j, ret; - if((ret = swri_realloc_audio(a, s->in_buffer_index + 2*s->in_buffer_count)) < 0) + int reflection = (FFMIN(s->in_buffer_count, c->filter_length) + 1) / 2; + + if((ret = swri_realloc_audio(a, s->in_buffer_index + s->in_buffer_count + reflection)) < 0) return ret; av_assert0(a->planar); for(i=0; ich_count; i++){ - for(j=0; jin_buffer_count; j++){ + for(j=0; jch[i] + (s->in_buffer_index+s->in_buffer_count+j )*a->bps, a->ch[i] + (s->in_buffer_index+s->in_buffer_count-j-1)*a->bps, a->bps); } } - s->in_buffer_count += (s->in_buffer_count+1)/2; + s->in_buffer_count += reflection; return 0; }