From patchwork Mon Apr 8 20:13:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47948 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3f98:b0:1a7:a0dc:8de5 with SMTP id ay24csp136162pzb; Mon, 8 Apr 2024 13:16:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUK2If8FjvxDomwgUK2ZsE2RZJMAknvx2zqdt26eGGBHP3bn+Xt7OcI6VNccXVRX9UYdhgXt966SkeWcroN05YxG1eOFaZ3yaZ5uQ== X-Google-Smtp-Source: AGHT+IF/pr+/JqhZ2kn8pO3LPVoy5Kl4w8rrCvgK0fIoMlivFIbX3lvvEn7J9gvsAzFzHmgVLMRh X-Received: by 2002:a05:6512:401c:b0:516:be41:5092 with SMTP id br28-20020a056512401c00b00516be415092mr8598262lfb.13.1712607362065; Mon, 08 Apr 2024 13:16:02 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nc14-20020a1709071c0e00b00a51affc3396si3460805ejc.349.2024.04.08.13.16.01; Mon, 08 Apr 2024 13:16:02 -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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=gU29qosh; 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 A81B668D306; Mon, 8 Apr 2024 23:15:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2044.outbound.protection.outlook.com [40.92.66.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D0C368D306 for ; Mon, 8 Apr 2024 23:15:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LdyJA5dYzWDKHMPAtRbMzSoVYqXzvqvbhD2GJwJuBFRhRYRjrYmOyO6MDsMFQDhafaBRohqEAAclb+8wtl9xENdNYvwpDD5TfK9VteS//HURlL8arWZ5yka9ytIf2E5T+VUnWu6mQTLPncsYzz4wY1JXRN4TPqOiQHchvmrEVslRLY0Cz6dPzeF2j/PalYLBx7NZ6kIa79c9ghm62hks5n1i4GlEivOU1Nn6qwIXDqWh1ggvjViMVcGFSoCvrJtjweC47irQCjYZrrxNAAWVZDTvtl5CLIlhw140zUcq1TasIFeS/QDnal+0Hiq06amoMxAD8SomfBq/Qynx1UpHKQ== 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=PTNKtMdTce8/8kqJ376mjrHl/Mstvkk/bgpQB1AogPY=; b=bjwB/eP+Z2Y0kzWSW1KB+BHQoNGia5L+GxhKddDihTuPN8zhmNNfG24m90/X8ajxzX0pGnMB6gGl2fjLk4j74pwkOewYi2INJfNLpXF8u25vDkHFPuvYcs+cTKRmWE3Tfm59Fl4J1UvbKVABE8tW7aEUv2vvlNsLYRVjglPG/8ii0AI+oKybb/S5CoYxY631a+Qbq5gfIiiBCJDCtCBhYUXbOcBk0RM3iWiPaenn19l2nUYk2tP8jbJpcufU5QaqHWg/ef/ASd85NRgg5m0KqfzfClYC7wtmY3G5Cyc2uVU+PIMQB7Aee0AU1uhThM/Sxrb1x3ee84NTq2VEZCXHzA== 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=PTNKtMdTce8/8kqJ376mjrHl/Mstvkk/bgpQB1AogPY=; b=gU29qoshm1AoMHWdmD6PJtaiUux6I7R56uRFnmQclHAThCJ63ITN9Y0f/r5t7Gcv6nM1DY3FPDesFo0V94vhUv/ufAOI46pgIbeRv15kTwWOjy3Pd1GoI7+7Row8YWc6beulJbpyQyyXHzyQHSzGVCnESTVv40Gef1Ax5OYBaj7z6xYpGxtu7b7ww6FOKVmg6bBbO4B/db8xknQSseh/J2MjF60w8aCcYJTVgjehOvvviq2YqPd+OLlAb+l0+MCAx3vDzVuCAVewAKVbsyT4ZN3ODoxFoJ6MkFXH4n6QJH1d2q3syBzqBWsTaB3IRhzF7qCsf/HWg7SNW0n1VHtsZA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0494.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:28d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Mon, 8 Apr 2024 20:15:08 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Mon, 8 Apr 2024 20:15:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Apr 2024 22:13:49 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [ErOe4/MtalqVoDvIDNezt+FyBR8Zev/S0DgW3Jyghlg=] X-ClientProxiedBy: ZR0P278CA0124.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::21) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240408201405.2136840-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0494:EE_ X-MS-Office365-Filtering-Correlation-Id: 70434406-0f4e-4780-643b-08dc580894c8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +LPuEBBesJQXfNk5MG5tfb0o1mn1A09c4K3JsOxIxR2MKeYPv6E5w/Q6SH2DuROdJqVuCcbUH2dNuyn17k46BM5djp+1KNLmQ17ekbFhlFk38sPXHxXlSqybXf3C3msw68H8SAPmue7Wy25rvOlzTNlI3fKdgB0fFZWNNVKyeD4HKQTh+hK2sEaU+jABSyA0bjMy8KbV0fv+jV3ldlCB0UdsLDGfq3s+HkPVTo2B/DLF5FVsC4TLbqTHDrShU6EBCCsMRnc+ZEbvV6H653pYvrXzi90PquZmhTCdzYPia1V3tijZBRbWpXw2OqGOMq8Fq0TxX4xNAvdY0SeAgmuWbsYdEznZb3/uKW7Pj5Ma98OQ5jsmcmoAR7znlpg4CrEGjDfoVejmInKzn6I5xKag+V4sG44mgPfM4p/D9lp1rbTeRcHKbWMVwZjx4KwRq4RnfwFRkiBhY5rKcAmmbZUGIrc806JZoHxU9eeAOQO+mQqS1SRXvw++o32o7lNKbrnO+AiJyex9s8EsO1Vu7d6RXWNzTIDNVC5Rd4GLKnsIafYlmsVesqjBR9D+cdiXZZJalgTPzjFMbAAGwzSEQcyjyRIO06EPAX834uTNWJLf428agKhdJdxyGuqE8XGu0kaQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TEf2Jk8w4mVvKZldjoryhjajvYwzYxh/pT5wAgp8oxXNed6uQY4ar73dVnMnarmKjUrmifCF7Vvu9i1hnrDC87xNHdOViFBHVuqnzoplnbGri41FpKebqfjGvzZM2jHZvYmz6n80MrA8tCn1Dxk5QchJPKOMEP68T71WAlB4i+rodVP06E0D31Z7PIWQG/vZ2MuBGdhYauJTByPrAwRV5jyDuNJtLAIZoqr4HzLc9IoaW/PrVjl5//ZNJ9i8mpk4j31oDnfzW8ujiGbHWi4CEbqoNXkEIQr36nmnNolrUyIhAJzbIp8qG++9Hoy9aHgskJ2PXgwl47n3RH1csFS0zJV5wan3yRCOGdv4/FFGpuWDfKqEIOp8QkSKXwO+YIrysdxxDXE/siN4ZOgvSVHVnX2ZrwSMavTpkihaoBgPzZDs62LfVN3eZdLW1I8qDgkrDH4SuVnhbvSHw9vlIAi5cdz4MCYw8c5ElgCTF1WQa4wM/JprWxJrrMSPTuNAWosf5KJAj0GEEMtnr0B0NbgxJxXvtsxAO2lXHAAD6G40HZtyuo0NvllSAzYbTYU3ATiAI/jeXgbKH2F9HWHYT+Vg3g8vx3N2B1mW9uU+wS1ah5lWe3fAvJN+4/gb/E4i5oXHau+EUs//BKJEbbQmxXTI4hq5wXO82hYSa1WphG/lytIXBBlRwP879Wq6etv6zr8Z694i1/s1rLb7N8IrqWqp09vMvZZosRA4v7uF8aPFhEBVsd5gTmn5V0YTnYQ9kO5XJFIucFWw+c8tU4vEPXKhCacFHWPQDCqnJj9oa7QE1Dy/h/LmetA5bQ6QbJSRP4PRD37rJNGXbEYeNcSfmMD6puetXT8UWPxcykdVFnfXQq4nM6OlA2ZFRJGOp2PKGC8h3UenmlmJ+vNmdbynN8A+uPasjol8++nKsE0gimMYbITxJ55KIpEMkf6tKW12qjnX89yegAk2mmBgUWNEA6Od1hJsNS7h8tkr9AgWMdrAHaafLtdwgjNjlszZ3hZVSBuX7wLmewAXIcrmME0sQ+/9wlZgMw5un9O45yU8I8zVT2pFAsS7txYhCdYWlXZT3/Z5X5dsF/Ogae+OoAyl0TvLZ+l5CavlojMglOj8y5x1lPGmTNhBahUPgXTj9QaP3d0BKIPotklkBhrTPL9pbsg0qw/A6PVa3YwHiJ0Erui1M61C+cfmV0jFKGNz7Ut1zuM/05k+JE+eyh3ccXrMa632li1Zd18kdhbgK6PxUIareOQiqBpGbqr+vRgG4up43vP32vZELuEK5U2smuweuaSa7Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70434406-0f4e-4780-643b-08dc580894c8 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2024 20:15:06.0803 (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: PAXP250MB0494 Subject: [FFmpeg-devel] [PATCH v2 11/27] avcodec/wavpack: Use ThreadProgress 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EenaSuDcH6QN It is more natural given that WavPack doesn't need the data of the previous frame at all; it just needs the DSD context. Signed-off-by: Andreas Rheinhardt --- libavcodec/wavpack.c | 133 ++++++++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 58 deletions(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 73d69d66ff..83f42f392d 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -30,7 +30,7 @@ #include "get_bits.h" #include "refstruct.h" #include "thread.h" -#include "threadframe.h" +#include "threadprogress.h" #include "unary.h" #include "wavpack.h" #include "dsd.h" @@ -107,11 +107,11 @@ typedef struct WavpackContext { int samples; int ch_offset; - AVFrame *frame; - ThreadFrame curr_frame, prev_frame; Modulation modulation; DSDContext *dsdctx; ///< RefStruct reference + ThreadProgress *curr_progress, *prev_progress; ///< RefStruct references + FFRefStructPool *progress_pool; ///< RefStruct reference int dsd_channels; } WavpackContext; @@ -994,6 +994,8 @@ static int wv_dsd_reset(WavpackContext *s, int channels) s->dsd_channels = 0; ff_refstruct_unref(&s->dsdctx); + ff_refstruct_unref(&s->curr_progress); + ff_refstruct_unref(&s->prev_progress); if (!channels) return 0; @@ -1017,22 +1019,31 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) { WavpackContext *fsrc = src->priv_data; WavpackContext *fdst = dst->priv_data; - int ret; - - if (dst == src) - return 0; - - ff_thread_release_ext_buffer(&fdst->curr_frame); - if (fsrc->curr_frame.f->data[0]) { - if ((ret = ff_thread_ref_frame(&fdst->curr_frame, &fsrc->curr_frame)) < 0) - return ret; - } + ff_refstruct_replace(&fdst->curr_progress, fsrc->curr_progress); ff_refstruct_replace(&fdst->dsdctx, fsrc->dsdctx); fdst->dsd_channels = fsrc->dsd_channels; return 0; } + +static av_cold int progress_pool_init_cb(FFRefStructOpaque opaque, void *obj) +{ + ThreadProgress *progress = obj; + return ff_thread_progress_init(progress, 1); +} + +static void progress_pool_reset_cb(FFRefStructOpaque opaque, void *obj) +{ + ThreadProgress *progress = obj; + ff_thread_progress_reset(progress); +} + +static av_cold void progress_pool_free_entry_cb(FFRefStructOpaque opaque, void *obj) +{ + ThreadProgress *progress = obj; + ff_thread_progress_destroy(progress); +} #endif static av_cold int wavpack_decode_init(AVCodecContext *avctx) @@ -1043,11 +1054,17 @@ static av_cold int wavpack_decode_init(AVCodecContext *avctx) s->fdec_num = 0; - s->curr_frame.f = av_frame_alloc(); - s->prev_frame.f = av_frame_alloc(); - - if (!s->curr_frame.f || !s->prev_frame.f) - return AVERROR(ENOMEM); +#if HAVE_THREADS + if (ff_thread_sync_ref(avctx, offsetof(WavpackContext, progress_pool)) == FF_THREAD_IS_FIRST_THREAD) { + s->progress_pool = ff_refstruct_pool_alloc_ext(sizeof(*s->curr_progress), + FF_REFSTRUCT_POOL_FLAG_FREE_ON_INIT_ERROR, NULL, + progress_pool_init_cb, + progress_pool_reset_cb, + progress_pool_free_entry_cb, NULL); + if (!s->progress_pool) + return AVERROR(ENOMEM); + } +#endif return 0; } @@ -1061,19 +1078,14 @@ static av_cold int wavpack_decode_end(AVCodecContext *avctx) av_freep(&s->fdec); s->fdec_num = 0; - ff_thread_release_ext_buffer(&s->curr_frame); - av_frame_free(&s->curr_frame.f); - - ff_thread_release_ext_buffer(&s->prev_frame); - av_frame_free(&s->prev_frame.f); - - ff_refstruct_unref(&s->dsdctx); + ff_refstruct_pool_uninit(&s->progress_pool); + wv_dsd_reset(s, 0); return 0; } -static int wavpack_decode_block(AVCodecContext *avctx, int block_no, - const uint8_t *buf, int buf_size) +static int wavpack_decode_block(AVCodecContext *avctx, AVFrame *frame, int block_no, + const uint8_t *buf, int buf_size, int *new_progress) { WavpackContext *wc = avctx->priv_data; WavpackFrameContext *s; @@ -1521,7 +1533,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, av_log(avctx, AV_LOG_ERROR, "Error reinitializing the DSD context\n"); return ret; } - ff_thread_release_ext_buffer(&wc->curr_frame); ff_init_dsd_data(); } av_channel_layout_copy(&avctx->ch_layout, &new_ch_layout); @@ -1529,18 +1540,25 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, avctx->sample_fmt = sample_fmt; avctx->bits_per_raw_sample = orig_bpp; - ff_thread_release_ext_buffer(&wc->prev_frame); - FFSWAP(ThreadFrame, wc->curr_frame, wc->prev_frame); - /* get output buffer */ - wc->curr_frame.f->nb_samples = s->samples; - ret = ff_thread_get_ext_buffer(avctx, &wc->curr_frame, - AV_GET_BUFFER_FLAG_REF); + frame->nb_samples = s->samples; + ret = ff_thread_get_buffer(avctx, frame, 0); if (ret < 0) return ret; - wc->frame = wc->curr_frame.f; - ff_thread_finish_setup(avctx); + av_assert1(!!wc->progress_pool == !!(avctx->active_thread_type & FF_THREAD_FRAME)); + if (wc->progress_pool) { + if (wc->dsdctx) { + ff_refstruct_unref(&wc->prev_progress); + wc->prev_progress = ff_refstruct_pool_get(wc->progress_pool); + if (!wc->prev_progress) + return AVERROR(ENOMEM); + FFSWAP(ThreadProgress*, wc->prev_progress, wc->curr_progress); + *new_progress = 1; + } + av_assert1(!!wc->dsdctx == !!wc->curr_progress); + ff_thread_finish_setup(avctx); + } } if (wc->ch_offset + s->stereo >= avctx->ch_layout.nb_channels) { @@ -1548,9 +1566,9 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, return ((avctx->err_recognition & AV_EF_EXPLODE) || !wc->ch_offset) ? AVERROR_INVALIDDATA : 0; } - samples_l = wc->frame->extended_data[wc->ch_offset]; + samples_l = frame->extended_data[wc->ch_offset]; if (s->stereo) - samples_r = wc->frame->extended_data[wc->ch_offset + 1]; + samples_r = frame->extended_data[wc->ch_offset + 1]; wc->ch_offset += 1 + s->stereo; @@ -1602,25 +1620,27 @@ static int dsd_channel(AVCodecContext *avctx, void *frmptr, int jobnr, int threa const WavpackContext *s = avctx->priv_data; AVFrame *frame = frmptr; - ff_dsd2pcm_translate (&s->dsdctx [jobnr], s->samples, 0, + ff_dsd2pcm_translate(&s->dsdctx[jobnr], s->samples, 0, (uint8_t *)frame->extended_data[jobnr], 4, (float *)frame->extended_data[jobnr], 1); return 0; } -static int wavpack_decode_frame(AVCodecContext *avctx, AVFrame *rframe, +static int wavpack_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, AVPacket *avpkt) { WavpackContext *s = avctx->priv_data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; int frame_size, ret, frame_flags; + int new_progress = 0; + + av_assert1(!s->curr_progress || s->dsdctx); if (avpkt->size <= WV_HEADER_SIZE) return AVERROR_INVALIDDATA; - s->frame = NULL; s->block = 0; s->ch_offset = 0; @@ -1646,7 +1666,8 @@ static int wavpack_decode_frame(AVCodecContext *avctx, AVFrame *rframe, ret = AVERROR_INVALIDDATA; goto error; } - if ((ret = wavpack_decode_block(avctx, s->block, buf, frame_size)) < 0) + ret = wavpack_decode_block(avctx, frame, s->block, buf, frame_size, &new_progress); + if (ret < 0) goto error; s->block++; buf += frame_size; @@ -1659,26 +1680,23 @@ static int wavpack_decode_frame(AVCodecContext *avctx, AVFrame *rframe, goto error; } - ff_thread_await_progress(&s->prev_frame, INT_MAX, 0); - ff_thread_release_ext_buffer(&s->prev_frame); - - if (s->modulation == MODULATION_DSD) - avctx->execute2(avctx, dsd_channel, s->frame, NULL, avctx->ch_layout.nb_channels); - - ff_thread_report_progress(&s->curr_frame, INT_MAX, 0); - - if ((ret = av_frame_ref(rframe, s->frame)) < 0) - return ret; + if (s->dsdctx) { + if (s->prev_progress) + ff_thread_progress_await(s->prev_progress, INT_MAX); + avctx->execute2(avctx, dsd_channel, frame, NULL, avctx->ch_layout.nb_channels); + if (s->curr_progress) + ff_thread_progress_report(s->curr_progress, INT_MAX); + } *got_frame_ptr = 1; return avpkt->size; error: - if (s->frame) { - ff_thread_await_progress(&s->prev_frame, INT_MAX, 0); - ff_thread_release_ext_buffer(&s->prev_frame); - ff_thread_report_progress(&s->curr_frame, INT_MAX, 0); + if (new_progress) { + if (s->prev_progress) + ff_thread_progress_await(s->prev_progress, INT_MAX); + ff_thread_progress_report(s->curr_progress, INT_MAX); } return ret; @@ -1697,6 +1715,5 @@ const FFCodec ff_wavpack_decoder = { UPDATE_THREAD_CONTEXT(update_thread_context), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | - FF_CODEC_CAP_ALLOCATE_PROGRESS, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };