From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5443849A8E for ; Tue, 27 Feb 2024 09:48:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D5A9668CB18; Tue, 27 Feb 2024 11:48:34 +0200 (EET) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DA81968CA47 for ; Tue, 27 Feb 2024 11:48:28 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id B870DEA066; Tue, 27 Feb 2024 10:48:28 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jZ-B8rjvYV1d; Tue, 27 Feb 2024 10:48:27 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id BA07EE9EFB; Tue, 27 Feb 2024 10:48:26 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Feb 2024 10:48:10 +0100 Message-Id: <20240227094810.1182-2-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240227094810.1182-1-cus@passwd.hu> References: <20240226221940.GV6420@pb2> <20240227094810.1182-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] swresample/resample: rework resample_one function to work the same way as the others X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Marton Balint Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Marton Balint --- libswresample/resample.c | 29 +++++++---------------------- libswresample/resample.h | 4 ++-- libswresample/resample_template.c | 14 ++++++++++++-- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/libswresample/resample.c b/libswresample/resample.c index 17cebad01b..89859dec79 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -356,26 +356,7 @@ static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, A *consumed = 0; - if (c->filter_length == 1 && c->phase_count == 1) { - int64_t index2= (1LL<<32)*c->frac/c->src_incr + (1LL<<32)*c->index + 1; - int64_t incr= (1LL<<32) * c->dst_incr / c->src_incr + 1; - int new_size = (src_size * (int64_t)c->src_incr - c->frac + c->dst_incr - 1) / c->dst_incr; - - dst_size = FFMAX(FFMIN(dst_size, new_size), 0); - if (dst_size > 0) { - for (i = 0; i < dst->ch_count; i++) { - c->dsp.resample_one(dst->ch[i], src->ch[i], dst_size, index2, incr); - if (i+1 == dst->ch_count) { - c->index += dst_size * c->dst_incr_div; - c->index += (c->frac + dst_size * (int64_t)c->dst_incr_mod) / c->src_incr; - av_assert2(c->index >= 0); - *consumed = c->index; - c->frac = (c->frac + dst_size * (int64_t)c->dst_incr_mod) % c->src_incr; - c->index = 0; - } - } - } - } else { + { int64_t end_index = (1LL + src_size - c->filter_length) * c->phase_count; int64_t delta_frac = (end_index - c->index) * c->src_incr - c->frac; int delta_n = (delta_frac + c->dst_incr - 1) / c->dst_incr; @@ -386,8 +367,12 @@ static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, A if (dst_size > 0) { /* resample_linear and resample_common should have same behavior * when frac and dst_incr_mod are zero */ - resample_func = (c->linear && (c->frac || c->dst_incr_mod)) ? - c->dsp.resample_linear : c->dsp.resample_common; + if (c->filter_length == 1 && c->phase_count == 1) + resample_func = c->dsp.resample_one; + else if (c->linear && (c->frac || c->dst_incr_mod)) + resample_func = c->dsp.resample_linear; + else + resample_func = c->dsp.resample_common; for (i = 0; i < dst->ch_count; i++) *consumed = resample_func(c, dst->ch[i], src->ch[i], dst_size, i+1 == dst->ch_count); } diff --git a/libswresample/resample.h b/libswresample/resample.h index 1731dad3cf..8cc29effe8 100644 --- a/libswresample/resample.h +++ b/libswresample/resample.h @@ -51,8 +51,8 @@ typedef struct ResampleContext { int phase_count_compensation; /* desired phase_count when compensation is enabled */ struct { - void (*resample_one)(void *dst, const void *src, - int n, int64_t index, int64_t incr); + int (*resample_one)(struct ResampleContext *c, void *dst, + const void *src, int n, int update_ctx); int (*resample_common)(struct ResampleContext *c, void *dst, const void *src, int n, int update_ctx); int (*resample_linear)(struct ResampleContext *c, void *dst, diff --git a/libswresample/resample_template.c b/libswresample/resample_template.c index 4c227b9940..a8114ea918 100644 --- a/libswresample/resample_template.c +++ b/libswresample/resample_template.c @@ -72,17 +72,27 @@ #endif -static void RENAME(resample_one)(void *dest, const void *source, - int dst_size, int64_t index2, int64_t incr) +static int RENAME(resample_one)(ResampleContext *c, + void *dest, const void *source, + int dst_size, int update_ctx) { DELEM *dst = dest; const DELEM *src = source; int dst_index; + int64_t index2 = (1LL << 32) * c->frac / c->src_incr + 1 + (1LL << 32) * c->index; + int64_t incr = (1LL << 32) * c->dst_incr / c->src_incr + 1; for (dst_index = 0; dst_index < dst_size; dst_index++) { dst[dst_index] = src[index2 >> 32]; index2 += incr; } + + if (update_ctx) { + c->frac = (c->frac + dst_size * (int64_t)c->dst_incr_mod) % c->src_incr; + c->index = 0; + } + + return index2 >> 32; } static int RENAME(resample_common)(ResampleContext *c, -- 2.35.3 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".