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 0ABA647698 for ; Tue, 19 Sep 2023 20:01:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4D4E68C9D7; Tue, 19 Sep 2023 22:58:27 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2070.outbound.protection.outlook.com [40.92.91.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F10EF68C92F for ; Tue, 19 Sep 2023 22:58:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W9kFD8NbZ+mGkluuUFLbmGF+4EJzapeqO0v1dUSsHqmrH2gNseINUlFuCCEtguif69hJLRk7ANZ6tsbQg6/k9ozw+q50NAQLl5qthsVfMc/Cw89nltzx0rMJQA2Fez71muvUeLIe3/0wEpvwzXLqVV3IQS9nm24B28zQdpTMndgQVSFUUdAu8WevpOVrhIqlUmKfQsCG0l2LA+/jr5x9f12WBm4aXsmduqSzcGsiPoEt/UOUyE1AIdQ7BS27TDKHEP34kfkVeZhIoPfkLfPTOVfP5NUgGLvd+9cTpw0aHW5lKMaEOsMlvZDaf+Ry7aqLQINJ4p5sr3mr5slqLpaNLQ== 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=NbETq0PCCer7Mc8lIxdAcPTBITgYFVCyMvoVvsskIYw=; b=Vg3IXJwJCrDkqeamoDddehESPdPZUVjKKjFlGiH6HxnPf1i+D4cdiqdUuugNUL3kEx3dhHkq8LQzPOrMdmzX5kdXAm2khkPR2lkYGDKMhwhEcvkqTcoglJ30hhcTUsrXAzDKBR+RT7BsDe7XDf0bLsNGBw4yCajQWF9GwwqdS1qPKjhS4u0IyS7vaaMToyP9eVmU/Tj4jp7/45iETsQ4f94qvi0Nfy2NieC/QC7WhLSMIiSpPOYNkkGLQ2prV+igjjy/1pWogj0PWcw1b0BtRwM/lXVDr6pDM8fUoT8fcDRJgPK7shM4EvYz+/AMB7woVcfYpq+nel6CK+RB2lKepw== 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=NbETq0PCCer7Mc8lIxdAcPTBITgYFVCyMvoVvsskIYw=; b=BzF0/Xzw85yYHXejeyFIJBKbzE6ZGeWOHLfw0D+fXvzF5GHTaum9SLO61aBWWv6EbN3PQeeKC3xqoY3Hmw0q5pF6rSnXx3fZp4yLyjb7YDNWWq2UbWV9Bl8+xt32zVgmHhOGA+Rv1eA5bW7AcIVi2ZvPu0zNFWVPHZxbLJtXo1tUNTAuytHpOk2aHLsOELbvpnZveTn2q0k1LFNbKHImYVcZWMV3cvmZM8Q/0xi1wVzrsK7eOgsfBP54PXO/9Y1d5C66ks94ri+O/HX/2eU4nuDM0ssNwch0V6u4KiV8nKXQnyh2w5fkwCSawbNMq+qvP/7cxBOaDiH/1W84fRZZ/w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0237.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:276::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Tue, 19 Sep 2023 19:58:25 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023 19:58:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Sep 2023 21:57:21 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ELoKOlxyVV9f1KDbTsXB9ONBiGmkxXxf] X-ClientProxiedBy: ZR0P278CA0086.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230919195734.1005750-29-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0237:EE_ X-MS-Office365-Filtering-Correlation-Id: 071dc83a-a61a-4854-1139-08dbb94ac8e3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hSrGtZDWsqZLRMoQdhdFcvuXDAViI1h+omCVQx2Svl2IJ05KNNqHHfx/a+xal0FfxJhCtapzQdYdywzLjfCEXsOzt/K3Mm/hJqypLwS0QdSvAoPElPXp3GPpz3/H9KeVhTV2lJDCi8LnvaVmjOKeC7LXzOqClJKiLn7TWa+3SKmMb6z0X6bwxv4p/FiK5gXjqJodzXWcjtxb615uBmiz+YZuwT93khVU1OD7ML+H4eCNXY5LO+yvx92Y6cG5CwCD7TMZOQIbHboBr3/HaWVbkIZpDVc+X+j9Getal3kliw4vgFaGYO3SN2JR2vQgqTcLqAdfv30ip4P5GfROlKZDJ+ZZLiBp8M3AsDg7x8hdY8SvyCwpaVdAVUv0iCT9xXpOtsdA7/8h0bFKjsiv5o0h2KfiOtaa2Fz1SrtjqwX7iZ5QhFJdWOD1MJDUOd2uy7ds6DTVD1CfNR1MeQNt6BOduOK10lac1yYtMvs1uGPf2N4MVm5m1mlxsxwePNT8cuR6nDoQHwY0AxjGgpoRxvEvM2xSP+vpuK6yW4Xgl7FLglGWji8KQbo7YYOysk422r/X9rvoWnjldwwd5k7+86hyIaLhGPFQhTKxUGehzgUIt0Y= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kYN8kUniI4P7oGRt/o1ec/Y4/hQfOsT4kAyfsWT9XShdq3mQfeixcgJMcEmc?= =?us-ascii?Q?DlLf0s+1h+Z6mKZggwg5p7XkwGVsLRjGwszn41mdJxlgx8Y5cfN81f2yMh+H?= =?us-ascii?Q?aiGqJUV8m7xX5k22PJBzsMMzs/Wjc8lTsQuWBI40U/fzBMQ9vtumDVXprjiX?= =?us-ascii?Q?96Z0EBQHjW+fgEB5sEoAIk1Vztsy0AE3AaKOO8yileEkLAmcggZl1AHwrE7/?= =?us-ascii?Q?c1vQzExcSUD4PDXf+OyxoPqNJu31G6J44auGXVB9qCIgaWqJGICqEF6mSRKw?= =?us-ascii?Q?/wAx9pPU7IlKxPEDHK0QtET5tKnmeO8co7MjSTJ2/40JhzekuxH1/btKHeo8?= =?us-ascii?Q?x+lKoKoUBM2tE+X+FqWpmYBOpHdqto6nt4O12fyRopTN8FGee3Di+Lbxsypc?= =?us-ascii?Q?dMv8w4u3bYUV6HXJbY+yApJHcpYO6TIlEOe5NrgY38GArs9ocF6TNahsKepx?= =?us-ascii?Q?Cp4asJqw9JESXBuk2kF+d9TcOlrCCZf1v9JX2MySkoY/X88dF2NJsNYouJuZ?= =?us-ascii?Q?R09ArzlQ5jdskAQABdOjCLDG8mvvQldL3hrKqRac0SLNc8jgVoHr/l48FYac?= =?us-ascii?Q?4hhm2vp9QeoqGvNUyMfDOSytG6DE21Mx3P0C66y7oy/OrlMusPIhzX3wdICH?= =?us-ascii?Q?ZrCWJ7Fi2w1jor/XCbRVPOHl0fgPf8ptsJfUXYHq+qZinaPr+94HS7wr7Inw?= =?us-ascii?Q?Th2DsLD54SQNeOxP9TF2LdMZERSJ5YNvS/PxzE6Ykj53MdOwSalrh3FYxD53?= =?us-ascii?Q?bGL40IssZ7vdy0OA/HKpx0JUL5dRMQJR3Uh8VbQoBAXYPCKQ0CUBcWcEGpmq?= =?us-ascii?Q?VLxrLiClhCwjR+osF4/7tezNT3hFImOAL7jP4j6RwldI91VVDAeuRH/TtxjF?= =?us-ascii?Q?RNhXHuvatgxzgCP9NvWEKhzKwMk08sOPpb0NQHOHQ9gUfubpPCbDhgDaVLCE?= =?us-ascii?Q?EH8kyL4It0XjlCXwlXykFmm+E571QdZp86Zt0z86C4Q33TzQmiAUX7LCk+aq?= =?us-ascii?Q?cgpN8c/IBODn1ZvgjBXDgajG2TEwpTEghD+QSFLFstTocTq+/wXL8sq5OcXC?= =?us-ascii?Q?wPt095nICf52Y5oW+0nvE/3nfC75ZjNzf6yNbo8wPZoKZ8TpBWEaMCVOinFl?= =?us-ascii?Q?FH+dkZMBu8Az+9PV06YgLq6GYWPCb/mzmWrDfUFmrvl5v2CZ7/O9G8c3Hyn/?= =?us-ascii?Q?8cf1X8IP8ZJxTIFpwhGV6jDMnROlN4P+qe0/IHG5futXAlDnK0o5PNC0gOhx?= =?us-ascii?Q?YEGgdT8iy7f9EcM+KfXD?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 071dc83a-a61a-4854-1139-08dbb94ac8e3 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2023 19:58:25.4606 (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: DU2P250MB0237 Subject: [FFmpeg-devel] [PATCH 29/42] avcodec/vp3: Switch to ProgressFrames 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: Avoids implicit av_frame_ref() and therefore allocations and error checks. It also avoids explicitly allocating the AVFrames (done implicitly when getting the buffer) and it also allows to reuse the flushing code for freeing the ProgressFrames. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp3.c | 148 +++++++++++++++++------------------------------ 1 file changed, 54 insertions(+), 94 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 98dabfc907..e8e1ebff56 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -46,8 +46,8 @@ #include "hpeldsp.h" #include "jpegquanttables.h" #include "mathops.h" +#include "progressframe.h" #include "thread.h" -#include "threadframe.h" #include "videodsp.h" #include "vp3data.h" #include "vp4data.h" @@ -180,9 +180,9 @@ typedef struct Vp3DecodeContext { int version; int width, height; int chroma_x_shift, chroma_y_shift; - ThreadFrame golden_frame; - ThreadFrame last_frame; - ThreadFrame current_frame; + ProgressFrame golden_frame; + ProgressFrame last_frame; + ProgressFrame current_frame; int keyframe; uint8_t idct_permutation[64]; uint8_t idct_scantable[64]; @@ -336,12 +336,9 @@ static void vp3_decode_flush(AVCodecContext *avctx) { Vp3DecodeContext *s = avctx->priv_data; - if (s->golden_frame.f) - ff_thread_release_ext_buffer(avctx, &s->golden_frame); - if (s->last_frame.f) - ff_thread_release_ext_buffer(avctx, &s->last_frame); - if (s->current_frame.f) - ff_thread_release_ext_buffer(avctx, &s->current_frame); + ff_thread_progress_unref(avctx, &s->golden_frame); + ff_thread_progress_unref(avctx, &s->last_frame); + ff_thread_progress_unref(avctx, &s->current_frame); } static av_cold int vp3_decode_end(AVCodecContext *avctx) @@ -355,9 +352,6 @@ static av_cold int vp3_decode_end(AVCodecContext *avctx) /* release all frames */ vp3_decode_flush(avctx); - av_frame_free(&s->current_frame.f); - av_frame_free(&s->last_frame.f); - av_frame_free(&s->golden_frame.f); for (int i = 0; i < FF_ARRAY_ELEMS(s->coeff_vlc); i++) ff_vlc_free(&s->coeff_vlc[i]); @@ -1899,10 +1893,9 @@ static void vp3_draw_horiz_band(Vp3DecodeContext *s, int y) /* At the end of the frame, report INT_MAX instead of the height of * the frame. This makes the other threads' ff_thread_await_progress() * calls cheaper, because they don't have to clip their values. */ - ff_thread_report_progress(&s->current_frame, + ff_thread_progress_report(&s->current_frame, y_flipped == s->height ? INT_MAX - : y_flipped - 1, - 0); + : y_flipped - 1); } if (!s->avctx->draw_horiz_band) @@ -1933,7 +1926,7 @@ static void vp3_draw_horiz_band(Vp3DecodeContext *s, int y) static void await_reference_row(Vp3DecodeContext *s, const Vp3Fragment *fragment, int motion_y, int y) { - const ThreadFrame *ref_frame; + const ProgressFrame *ref_frame; int ref_row; int border = motion_y & 1; @@ -1946,7 +1939,7 @@ static void await_reference_row(Vp3DecodeContext *s, const Vp3Fragment *fragment ref_row = y + (motion_y >> 1); ref_row = FFMAX(FFABS(ref_row), ref_row + 8 + border); - ff_thread_await_progress(ref_frame, ref_row, 0); + ff_thread_progress_await(ref_frame, ref_row); } #if CONFIG_VP4_DECODER @@ -2057,12 +2050,12 @@ static void render_slice(Vp3DecodeContext *s, int slice) int16_t *block = s->block; int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef; /* When decoding keyframes, the earlier frames may not be available, - * so to avoid using undefined pointer arithmetic on them we just - * use the current frame instead. Nothing is ever read from these - * frames in case of a keyframe. */ - const AVFrame *last_frame = s->last_frame.f->data[0] ? + * so we just use the current frame in this case instead; + * it also avoid using undefined pointer arithmetic. Nothing is + * ever read from these frames in case of a keyframe. */ + const AVFrame *last_frame = s->last_frame.f ? s->last_frame.f : s->current_frame.f; - const AVFrame *golden_frame = s->golden_frame.f->data[0] ? + const AVFrame *golden_frame = s->golden_frame.f ? s->golden_frame.f : s->current_frame.f; int motion_halfpel_index; int first_pixel; @@ -2302,18 +2295,6 @@ static av_cold int allocate_tables(AVCodecContext *avctx) return 0; } -static av_cold int init_frames(Vp3DecodeContext *s) -{ - s->current_frame.f = av_frame_alloc(); - s->last_frame.f = av_frame_alloc(); - s->golden_frame.f = av_frame_alloc(); - - if (!s->current_frame.f || !s->last_frame.f || !s->golden_frame.f) - return AVERROR(ENOMEM); - - return 0; -} - static av_cold int vp3_decode_init(AVCodecContext *avctx) { Vp3DecodeContext *s = avctx->priv_data; @@ -2322,10 +2303,6 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) int c_height; int y_fragment_count, c_fragment_count; - ret = init_frames(s); - if (ret < 0) - return ret; - if (avctx->codec_tag == MKTAG('V', 'P', '4', '0')) { s->version = 3; #if !CONFIG_VP4_DECODER @@ -2493,59 +2470,43 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) } /// Release and shuffle frames after decode finishes -static int update_frames(AVCodecContext *avctx) +static void update_frames(AVCodecContext *avctx) { Vp3DecodeContext *s = avctx->priv_data; - int ret = 0; - if (s->keyframe) { - ff_thread_release_ext_buffer(avctx, &s->golden_frame); - ret = ff_thread_ref_frame(&s->golden_frame, &s->current_frame); - } - /* shuffle frames */ - ff_thread_release_ext_buffer(avctx, &s->last_frame); - FFSWAP(ThreadFrame, s->last_frame, s->current_frame); + if (s->keyframe) + ff_thread_progress_replace(avctx, &s->golden_frame, &s->current_frame); - return ret; + /* shuffle frames */ + ff_thread_progress_unref(avctx, &s->last_frame); + FFSWAP(ProgressFrame, s->last_frame, s->current_frame); } #if HAVE_THREADS -static int ref_frame(Vp3DecodeContext *s, ThreadFrame *dst, const ThreadFrame *src) -{ - ff_thread_release_ext_buffer(s->avctx, dst); - if (src->f->data[0]) - return ff_thread_ref_frame(dst, src); - return 0; -} - -static int ref_frames(Vp3DecodeContext *dst, const Vp3DecodeContext *src) +static void ref_frames(AVCodecContext *avctx, + Vp3DecodeContext *dst, const Vp3DecodeContext *src) { - int ret; - if ((ret = ref_frame(dst, &dst->current_frame, &src->current_frame)) < 0 || - (ret = ref_frame(dst, &dst->golden_frame, &src->golden_frame)) < 0 || - (ret = ref_frame(dst, &dst->last_frame, &src->last_frame)) < 0) - return ret; - return 0; + ff_thread_progress_replace(avctx, &dst->current_frame, &src->current_frame); + ff_thread_progress_replace(avctx, &dst->golden_frame, &src->golden_frame); + ff_thread_progress_replace(avctx, &dst->last_frame, &src->last_frame); } static int vp3_update_thread_context(AVCodecContext *dst, const AVCodecContext *src) { Vp3DecodeContext *s = dst->priv_data; const Vp3DecodeContext *s1 = src->priv_data; - int qps_changed = 0, err; + int qps_changed = 0; - if (!s1->current_frame.f->data[0] || + if (s != s1) { + // copy previous frame data + ref_frames(dst, s, s1); + } + if (!s1->current_frame.f || s->width != s1->width || s->height != s1->height) { - if (s != s1) - ref_frames(s, s1); return -1; } if (s != s1) { - // copy previous frame data - if ((err = ref_frames(s, s1)) < 0) - return err; - s->keyframe = s1->keyframe; // copy qscale data if necessary @@ -2567,7 +2528,8 @@ static int vp3_update_thread_context(AVCodecContext *dst, const AVCodecContext * } } - return update_frames(dst); + update_frames(dst); + return 0; } #endif @@ -2658,15 +2620,18 @@ static int vp3_decode_frame(AVCodecContext *avctx, AVFrame *frame, if (avctx->skip_frame >= AVDISCARD_NONKEY && !s->keyframe) return buf_size; + if ((ret = ff_thread_progress_get_buffer(avctx, &s->current_frame, + AV_GET_BUFFER_FLAG_REF)) < 0) { + // Don't goto error here, as one can't report progress on or + // unref a non-existent frame. + return ret; + } s->current_frame.f->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; if (s->keyframe) s->current_frame.f->flags |= AV_FRAME_FLAG_KEY; else s->current_frame.f->flags &= ~AV_FRAME_FLAG_KEY; - if ((ret = ff_thread_get_ext_buffer(avctx, &s->current_frame, - AV_GET_BUFFER_FLAG_REF)) < 0) - goto error; if (!s->edge_emu_buffer) { s->edge_emu_buffer = av_malloc(9 * FFABS(s->current_frame.f->linesize[0])); @@ -2724,19 +2689,16 @@ static int vp3_decode_frame(AVCodecContext *avctx, AVFrame *frame, #endif } } else { - if (!s->golden_frame.f->data[0]) { + if (!s->golden_frame.f) { av_log(s->avctx, AV_LOG_WARNING, "vp3: first frame not a keyframe\n"); - s->golden_frame.f->pict_type = AV_PICTURE_TYPE_I; - if ((ret = ff_thread_get_ext_buffer(avctx, &s->golden_frame, - AV_GET_BUFFER_FLAG_REF)) < 0) + if ((ret = ff_thread_progress_get_buffer(avctx, &s->golden_frame, + AV_GET_BUFFER_FLAG_REF)) < 0) goto error; - ff_thread_release_ext_buffer(avctx, &s->last_frame); - if ((ret = ff_thread_ref_frame(&s->last_frame, - &s->golden_frame)) < 0) - goto error; - ff_thread_report_progress(&s->last_frame, INT_MAX, 0); + s->golden_frame.f->pict_type = AV_PICTURE_TYPE_I; + ff_thread_progress_replace(avctx, &s->last_frame, &s->golden_frame); + ff_thread_progress_report(&s->golden_frame, INT_MAX); } } ff_thread_finish_setup(avctx); @@ -2814,16 +2776,13 @@ static int vp3_decode_frame(AVCodecContext *avctx, AVFrame *frame, *got_frame = 1; - if (!HAVE_THREADS || !(s->avctx->active_thread_type & FF_THREAD_FRAME)) { - ret = update_frames(avctx); - if (ret < 0) - return ret; - } + if (!HAVE_THREADS || !(s->avctx->active_thread_type & FF_THREAD_FRAME)) + update_frames(avctx); return buf_size; error: - ff_thread_report_progress(&s->current_frame, INT_MAX, 0); + ff_thread_progress_report(&s->current_frame, INT_MAX); if (!HAVE_THREADS || !(s->avctx->active_thread_type & FF_THREAD_FRAME)) av_frame_unref(s->current_frame.f); @@ -3173,7 +3132,8 @@ const FFCodec ff_theora_decoder = { .flush = vp3_decode_flush, UPDATE_THREAD_CONTEXT(vp3_update_thread_context), .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | - FF_CODEC_CAP_EXPORTS_CROPPING | FF_CODEC_CAP_ALLOCATE_PROGRESS, + FF_CODEC_CAP_EXPORTS_CROPPING | + FF_CODEC_CAP_USES_PROGRESSFRAMES, }; #endif @@ -3191,7 +3151,7 @@ const FFCodec ff_vp3_decoder = { .flush = vp3_decode_flush, UPDATE_THREAD_CONTEXT(vp3_update_thread_context), .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | - FF_CODEC_CAP_ALLOCATE_PROGRESS, + FF_CODEC_CAP_USES_PROGRESSFRAMES, }; #if CONFIG_VP4_DECODER @@ -3209,6 +3169,6 @@ const FFCodec ff_vp4_decoder = { .flush = vp3_decode_flush, UPDATE_THREAD_CONTEXT(vp3_update_thread_context), .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | - FF_CODEC_CAP_ALLOCATE_PROGRESS, + FF_CODEC_CAP_USES_PROGRESSFRAMES, }; #endif -- 2.34.1 _______________________________________________ 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".