From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id B4C734DBA6 for ; Fri, 4 Jul 2025 10:36:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 1B78168F7F1; Fri, 4 Jul 2025 13:35:54 +0300 (EEST) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C66DA68F7D6 for ; Fri, 4 Jul 2025 13:35:51 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-74b50c71b0aso514352b3a.0 for ; Fri, 04 Jul 2025 03:35:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751625350; x=1752230150; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=JcKF096Xu1LNgsAGmPgJZ8R0XhUcqES/v0FwRj2UAgE=; b=cQg3DNEgTiWAHHf4Wr8coFK5nplWcxEbgpXIpNkcplcsaGc2VJcVjNIgWR6b4MdmvP u8y4u0XzQlWnJ99xhZCsNHExryAJWqV0cC1STWXATtH15AhL4su0+PJfKxZ6pOVf7Gzi YoDZoJqlvRVq8dxFOwbzQm2Rmb5oeZvN/qiw8WdK6iklvtl4n8AckMPhTHR4n/mD8xH5 WVIsOK4+tHt8l+/H4FILWQhrWV1GT8o6bOy4ReKEhLSmvvdAkkZZkxoB/mXouNsWZOnB 4gJIFnew3FyiZFmLtCbMLgpnSHrS8sBY/Cc+J6AfRAAgw3O1okjc1qcT0jjYoDVTN6zJ 4Jpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751625350; x=1752230150; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=JcKF096Xu1LNgsAGmPgJZ8R0XhUcqES/v0FwRj2UAgE=; b=vhjM3avEzrxIyRethUN6m4zDfI6XUhGBH9oi7+7vdhq4CJNnMGB2KpBWnl7ghYItYP Na919Hqcn9FpLMimJHW8LgRK87i+KoFC5EJd6gQnHAnPlhmDApFui/ZaJbosmG2t0OIp gTGksiWphHWYCE9dasFu1EQUoQjHAfDLP8se8CFARZj/HikZUwJDMYhYHgeZRwcNc+HO CPWG8XUg80S1bnmERC9X5cjIFfKlQI3vijD3AgrHHaavg5OPxvsxtglRKVXAK9K151ch id8WUJClkdWoPtih79Y/sy5ljXRLyQg1wXP/ZZJHanF4K6kC1NKJJFpSHRlR1lKDYeog gM6A== X-Gm-Message-State: AOJu0YyRsZC4wblKb+kro6Hmq2rLtCaUsHWB6t71PB4AtN7945QkTD3m Qosvs8tcayjIaEVeh8QXedL6J9vDVADjG/ap39C0fwamxZFMmJzRK+wqMUiQRw== X-Gm-Gg: ASbGnctIYDq5jZazIlCWr6ZKKOgonm/u0FfUOVho2w/e6WUHX8wxZg1VnnYy2J53L2B wmaKpxdUZAejbby6oh6yw9X6VV91vpgr3AXCZepX4SWpeChZQ1vpQZoXH5Vuo0e4YyXIBGks1rR 5FFSIvK6CcPO6qBBYF4N2pmP+DXCftDhkcnJvhGiN7AAupRkfIKIRaNjFgtvT0Gb9shFhg+DE14 5Wrh3ThuWCe/vX4abEQNAku5GcySgr6l7jaiZilXrwMCtoxa/18D77qxWoz3GQMHcmbtUvFgZDU 2LXg4NsCxZB/VXiz93aYFq5KAO9t8Qcn20WGDF5SxZGz3cDNL9FE19EjnkyQ60l95FjADnYHKF2 H/Dp+8xmSUJld4wJ6 X-Google-Smtp-Source: AGHT+IGOsiRYfNA3XKypkBu5Q+Xyq35lfRIS1jQwzOx0NNLrTPWqnP5liOvCyVrryoCceuJfW9TiHg== X-Received: by 2002:a05:6a20:7284:b0:220:90a9:a91b with SMTP id adf61e73a8af0-22608fbba1dmr2451266637.9.1751625349917; Fri, 04 Jul 2025 03:35:49 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b38eefd504bsm1677320a12.28.2025.07.04.03.35.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Jul 2025 03:35:49 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <6052128570b267847e5ef5d48c90009ad4b0f139.1751625321.git.ffmpegagent@gmail.com> In-Reply-To: References: X-Original-From: Andreas Rheinhardt Date: Fri, 04 Jul 2025 10:35:21 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/opus/dec: Simplify resetting AVAudioFifo 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: Andreas Rheinhardt 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: From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavcodec/opus/dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/opus/dec.c b/libavcodec/opus/dec.c index b0e149e636..3118f2b99c 100644 --- a/libavcodec/opus/dec.c +++ b/libavcodec/opus/dec.c @@ -323,7 +323,7 @@ static int opus_decode_frame(OpusStreamContext *s, const uint8_t *data, int size } else { av_log(s->avctx, AV_LOG_WARNING, "Spurious CELT delay samples present.\n"); - av_audio_fifo_drain(s->celt_delay, delay_samples); + av_audio_fifo_reset(s->celt_delay); if (s->avctx->err_recognition & AV_EF_EXPLODE) return AVERROR_BUG; } @@ -640,10 +640,10 @@ static av_cold void opus_decode_flush(AVCodecContext *ctx) memset(&s->packet, 0, sizeof(s->packet)); s->delayed_samples = 0; - av_audio_fifo_drain(s->celt_delay, av_audio_fifo_size(s->celt_delay)); + av_audio_fifo_reset(s->celt_delay); swr_close(s->swr); - av_audio_fifo_drain(s->sync_buffer, av_audio_fifo_size(s->sync_buffer)); + av_audio_fifo_reset(s->sync_buffer); ff_silk_flush(s->silk); ff_celt_flush(s->celt); -- ffmpeg-codebot _______________________________________________ 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".