From patchwork Mon Jan 24 14:46:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33788 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp389243ioh; Mon, 24 Jan 2022 06:50:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJyMudpbtuj7aiiOhguaYCHerMZ3ZR2y3EogRySzOI9YMLI19b4Pj7NzcbALI7eAMToOyJ2n X-Received: by 2002:a17:906:6a09:: with SMTP id qw9mr5261389ejc.117.1643035854887; Mon, 24 Jan 2022 06:50:54 -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 ds3si9694086ejc.490.2022.01.24.06.50.53; Mon, 24 Jan 2022 06:50:54 -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=@outlook.com header.s=selector1 header.b=EwMk9nTY; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C94DD68B16A; Mon, 24 Jan 2022 16:48:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065057.outbound.protection.outlook.com [40.92.65.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD7CB68B185 for ; Mon, 24 Jan 2022 16:48:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YaYPdfdBC+JT8Bp8bcsOY42CzOr05ZYPkraHUoBD4MjKqiR1MBQxm9L5isR1qFww3dpLtdV8n8IojgCCiEHHxMsI7LYAhhZo58p3th1Jmk9AAk92CyaoJI3w+VgnVmZ4qLWmojIHJAh92Gj0t5CsWi5buEizSKM8qqMxq++TsRkoruUR/12IFO1vJxbEk6FQGfGo1KjODdpmdhbpmzG6ppar8I3J7v7E85Yafgjci5bqI2PaM1Agaj9VWQGEDLskgrv74NKiJpc9E7rVxWF8HkBCZ8HU+cBb2r/c3ahtFKXNp/PpdF7vvZzlAMQ1vAtoJsAvsHZI3nsT2sN06bCl6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1QFwzacSfO+X2uw4MgGBL9X4+Lb3es5pnSB02G3hHa4=; b=kzbp2/TME2DTo4Inb/xNc7ut24m0I8JQ9urBrjMFJC0BS6fpFjCPmJtq3V8zODYt9dVypbbSvXAtMwEYFx1lDaq33q1sIf73PsaVD1CecQZXpt37Mu8MRC0GEm4KdKToJIJHACzLnBIcLfOoim4pCVyDUnp9S0JfsFYx2njICZhkcMZBiZLEv7zQV7T/VskAUmZSzVP31gD3itcJLikI+ohnhhQse0kTUhYSiHo/kh/rSAr3hI2C4MTZGnA+0klqcBpOvr7Cr3prvdvgaXCyU1L67qIgdu2vFHCqH/8KudTNw5RUbaGHFjJx/a5IqzMbcTnw6BMwofiiBSCzNkUmRg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1QFwzacSfO+X2uw4MgGBL9X4+Lb3es5pnSB02G3hHa4=; b=EwMk9nTYOEUm7OYQpdYmXl4hyVN4rvaec3a40kR6Q4ey6kIE0IYl478TSP7f3Uj+RAEZrpIQHrxyjVy2UZWjamM70k5JZAZP3/GOHI5omD8UD9aKY0hftRbtjwLx76fxZfh10DlgLKZ16hjQe7Kq9zeCYoQhSxYSnNunGMFWpNPbNmM9WW+5S1loUMxIuMCIxHUQMfCTuvf50H/1O7YPkTshiMqa7nNDeJVKj25OMdBbgGtvU3fAZNLYe+uk8IOlfyhajexzNzKceI9QmSgjINKdUMAVqF+OKy0S9/eU232d8iCTBrlowTWSobZWLW0rh2srrIHeOK2cLD4BY7zvwA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB4397.eurprd03.prod.outlook.com (2603:10a6:803:51::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 14:48:38 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 14:48:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 15:46:10 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [K0WHs/UO0h8OB6nQKjfKZnl++30mJkgc] X-ClientProxiedBy: AM5PR0201CA0016.eurprd02.prod.outlook.com (2603:10a6:203:3d::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124144616.559446-25-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d58ae57b-b28b-4f23-468e-08d9df489acc X-MS-TrafficTypeDiagnostic: VI1PR03MB4397:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vrksYCywsBH5fkNbqRdeudC0D0OGDOmsdFLlsknj5OdW/eCg2hZQ5VwbtOj8zdJFdpJT+DNEwe8ODJjBZKdhk8qcBZd5PGfidTq9EZKqsBYoSxCQJ7YKQd35dvAgntDTMX1W2bu4piv/RYatSrK/dbtvH+4pbvWtTrYutA9t8W33QECaaGTeEqYG+OfjE+ur+QjhWQlWxFUJyPW6+69+mTFIKPmvFbOsHfde/IavBpoC3SVoJYJg1TxdabQ5iil4vv72ok5fmkbVESHe9ccyOAsApr6dARHOgKBgs7cdPGehdrniSW73diRTz+NeVJuAg19t7IIj17I3Hvher7Ea8zzGUk3IcUo29j5egrbgo7tLXf1RAxuIfDIoGGcdcdnPV6aPf+8ffEwlcgnAZHyDbYvl+tbAskj+Hj2FeawI6tIcE3a8kK+TZagakCcWEv00owItwDCm8bRYl7M2eRckVTIhEEgnHC7WNifCtd3ld6hSILa4MGOJ/dIplPKQ3U/bufHLjpzwnUpb+u6iCw8Zpqw/nisFvv2lz/Mia8jGAjBTfK524HGcSysCddVzxGHCD8+ImFaxxP77RvTaJP1Ghw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: t+gstpCigo3tkteakIlOzaRuaI+YBOcDrF/nMgPKDSlI/Ge22b3IdhxIcOmH9xwDd7T019/KGqxTLmvUosqg4zSSn6rXKBfJzb2DMlcT3wDy97O52fK6l1R2etlOV+HKycUkDORFMie1Uyi6h7XubHtZrLKSJrZ3u3OCGIcMDHXKafGg8wWsBsYsAAQCgwiiNoQd4fvlFrMbtJyAHpmm8SmQwcEA4XLY3A5OYtgJ8GsJdRP9QhErFfFUWHMIrQPgY27pEiUHr4x7RppEYzoapFYiX9l5eFtpufd5X9xRu0+QyT65qZNEQY3cV3crHuE5quOkiJ8w5kGWDL5FrK3qNou2J2/SjY7qwIVODp5WcQ8P7V9+m2xhbx8XNKvUT1JQJGJtv52iFoMpnzXAxiIPZXdgSfa7EivN799KpJstYNeDNjUsWmN4KCBuv8Svc6AUc33GpT/JitVhFfIxXLAWix0Jb2hDGKw8FYA8IKbVxrrryHt9id4Wv2cuBNCu4HD7zJi2yoyPeVy77OkNUFCDLfpOy+52NuSu09t122Yq6Idd7+76yPELRFXT+CBZFd3860D3sEOHKwdj7OMpIlSnHYVyWgeUWlfGzogKZQYighAa/KiSmQ2ZN9aJv4+dhBdFfc+32O1V2QdDTqtMpuZx1FKOPA/taIhHCXKeZLMKxuQluuZH8x+t2a3QH2lC5Rv8f9u3U3vWCRlQMnLb8ufUSX0p6Jjk2Dec9dGRvAWQ2fP/AlX9Ddf1n/PkPOiSzuEgK7p0KHHaJ6xG9/c5lR33PzCBUALsMk/fYUF2Tqt/cB4Lcb5u7Sgsirs5lzLpHFJnRLEMyXOO4lS4t06b2tpWQK9M/kfLwgrLp3kGnNk+eBi6Ef+rb2DaPiC4rOhubyDd+ieXA/+uLdSiQPJcOtaAWvX+QC/CBYXPzEqrr02QyniYtIWR6/Ekyr5+aEdHazNcHaW30XIj1knNZNYS/Z2VMg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d58ae57b-b28b-4f23-468e-08d9df489acc X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 14:48:37.9228 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR03MB4397 Subject: [FFmpeg-devel] [PATCH v2 25/31] lavu/audio_fifo: switch to new FIFO API 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jy/afaHxQXnZ From: Anton Khirnov --- libavutil/audio_fifo.c | 44 ++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/libavutil/audio_fifo.c b/libavutil/audio_fifo.c index 243efc39e4..b1355e55a0 100644 --- a/libavutil/audio_fifo.c +++ b/libavutil/audio_fifo.c @@ -32,7 +32,7 @@ #include "samplefmt.h" struct AVAudioFifo { - AVFifoBuffer **buf; /**< single buffer for interleaved, per-channel buffers for planar */ + AVFifo **buf; /**< single buffer for interleaved, per-channel buffers for planar */ int nb_buffers; /**< number of buffers */ int nb_samples; /**< number of samples currently in the FIFO */ int allocated_samples; /**< current allocated size, in samples */ @@ -48,7 +48,7 @@ void av_audio_fifo_free(AVAudioFifo *af) if (af->buf) { int i; for (i = 0; i < af->nb_buffers; i++) { - av_fifo_freep(&af->buf[i]); + av_fifo_freep2(&af->buf[i]); } av_freep(&af->buf); } @@ -80,7 +80,7 @@ AVAudioFifo *av_audio_fifo_alloc(enum AVSampleFormat sample_fmt, int channels, goto error; for (i = 0; i < af->nb_buffers; i++) { - af->buf[i] = av_fifo_alloc(buf_size); + af->buf[i] = av_fifo_alloc2(buf_size, 1, 0); if (!af->buf[i]) goto error; } @@ -95,15 +95,19 @@ error: int av_audio_fifo_realloc(AVAudioFifo *af, int nb_samples) { + const size_t cur_size = av_fifo_can_read (af->buf[0]) + + av_fifo_can_write(af->buf[0]); int i, ret, buf_size; if ((ret = av_samples_get_buffer_size(&buf_size, af->channels, nb_samples, af->sample_fmt, 1)) < 0) return ret; - for (i = 0; i < af->nb_buffers; i++) { - if ((ret = av_fifo_realloc2(af->buf[i], buf_size)) < 0) - return ret; + if (buf_size > cur_size) { + for (i = 0; i < af->nb_buffers; i++) { + if ((ret = av_fifo_grow2(af->buf[i], buf_size - cur_size)) < 0) + return ret; + } } af->allocated_samples = nb_samples; return 0; @@ -126,8 +130,8 @@ int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples) size = nb_samples * af->sample_size; for (i = 0; i < af->nb_buffers; i++) { - ret = av_fifo_generic_write(af->buf[i], data[i], size, NULL); - if (ret != size) + ret = av_fifo_write(af->buf[i], data[i], size); + if (ret < 0) return AVERROR_BUG; } af->nb_samples += nb_samples; @@ -137,21 +141,7 @@ int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples) int av_audio_fifo_peek(AVAudioFifo *af, void **data, int nb_samples) { - int i, ret, size; - - if (nb_samples < 0) - return AVERROR(EINVAL); - nb_samples = FFMIN(nb_samples, af->nb_samples); - if (!nb_samples) - return 0; - - size = nb_samples * af->sample_size; - for (i = 0; i < af->nb_buffers; i++) { - if ((ret = av_fifo_generic_peek(af->buf[i], data[i], size, NULL)) < 0) - return AVERROR_BUG; - } - - return nb_samples; + return av_audio_fifo_peek_at(af, data, nb_samples, 0); } int av_audio_fifo_peek_at(AVAudioFifo *af, void **data, int nb_samples, int offset) @@ -171,7 +161,7 @@ int av_audio_fifo_peek_at(AVAudioFifo *af, void **data, int nb_samples, int offs offset *= af->sample_size; size = nb_samples * af->sample_size; for (i = 0; i < af->nb_buffers; i++) { - if ((ret = av_fifo_generic_peek_at(af->buf[i], data[i], offset, size, NULL)) < 0) + if ((ret = av_fifo_peek(af->buf[i], data[i], size, offset)) < 0) return AVERROR_BUG; } @@ -190,7 +180,7 @@ int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples) size = nb_samples * af->sample_size; for (i = 0; i < af->nb_buffers; i++) { - if (av_fifo_generic_read(af->buf[i], data[i], size, NULL) < 0) + if (av_fifo_read(af->buf[i], data[i], size) < 0) return AVERROR_BUG; } af->nb_samples -= nb_samples; @@ -209,7 +199,7 @@ int av_audio_fifo_drain(AVAudioFifo *af, int nb_samples) if (nb_samples) { size = nb_samples * af->sample_size; for (i = 0; i < af->nb_buffers; i++) - av_fifo_drain(af->buf[i], size); + av_fifo_drain2(af->buf[i], size); af->nb_samples -= nb_samples; } return 0; @@ -220,7 +210,7 @@ void av_audio_fifo_reset(AVAudioFifo *af) int i; for (i = 0; i < af->nb_buffers; i++) - av_fifo_reset(af->buf[i]); + av_fifo_reset2(af->buf[i]); af->nb_samples = 0; }