From patchwork Mon Apr 8 20:13:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47941 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3f98:b0:1a7:a0dc:8de5 with SMTP id ay24csp136497pzb; Mon, 8 Apr 2024 13:16:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWFDGWkKd/KO3RzOG493K8UqW2vv9Trj/YfoKiVwJgguqBacidmsLzuH/K/sqQkBCSa5qVKXc52dTa87TkjyTwmqUq5LBql/its4A== X-Google-Smtp-Source: AGHT+IG9+SkXV9lHnwdyI1Mv0oH9HZTaNE0f68LRZMLDfEvHeONVfFfwEOYjberGwlQSudWei1Nh X-Received: by 2002:a05:6512:51a:b0:516:d241:11f0 with SMTP id o26-20020a056512051a00b00516d24111f0mr8521709lfb.7.1712607406686; Mon, 08 Apr 2024 13:16:46 -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 a9-20020a1709064a4900b00a4e7713adfbsi3822070ejv.964.2024.04.08.13.16.46; Mon, 08 Apr 2024 13:16:46 -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=OsEvMIVL; 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 E0AF568D367; Mon, 8 Apr 2024 23:15:20 +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-ve1eur01olkn2071.outbound.protection.outlook.com [40.92.66.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FE3B68D307 for ; Mon, 8 Apr 2024 23:15:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ogHwwu1SPKhNDbbZFmuYcH2FF5Xzgu/fp9SRdBVNGL8TC2m3jvvFsFPMsnxJcje889efac0Y6mRJsEGjInaUjE97jtWZNa1oAcAuruJsyPX2kEG4+DfiUmoTnFz2k9hy9c9TdJNKYmmWFmuCpee91oOPPTTKYPTBzQWg7LNp+m3MDPIttdm20o0sKF2Web5yqgQ8NeZ7BHfWobLp3l+mFcRN5nkWaZeKbt6lSxeMIXOVMfpoqzkQMS99IaRCp36bIzFIqh9o4JfWPrlV0P4eX6vD8hVYcTbDszFxhoEMRA7jawlRyVTv3iE1YfQ8+DuVkqsRy1JAUCgM81ce6mwJ9w== 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=LHLXzN91cUd+qj53kuxQfoMopV5FzU6Hq4hwKd31bA4=; b=l+csvSQii6zdNhxq/1ut0e7ihPVoktQdE7QivpC7qdXa+bVLrgIKGL8DauNrDjr3C7qNfzn26ulpYBI+qWFCS1ksmoqMUhUFfUZ76LGQaEtkYyooQDXjsVuouHP+CPk9xEOon7pTXNJX1RbGUdPS88rY6obd5aNLJDwfs0vcPnN5hLM2KnpGn/PpZsD6i6b/lMDxykVr6NxeaBM0GvCsbwttnkiXmOG/F+T05K3a5YH0mmLO7ZWdSymTPCDjjDvpnORG5EHhs+Bor/RaWM5VUz45HXWkkMuKuLxdJWVmENOhOp8dt5SPVtxOX3WsvUm4Ngse8enPn8x89BGnDa+jMA== 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=LHLXzN91cUd+qj53kuxQfoMopV5FzU6Hq4hwKd31bA4=; b=OsEvMIVLE5BUHDGrt/jTubx4gwN5bCLOl9XoqR/yNEsTJ9gDJRZTeLDlG7AINWwiB2spgo2DqGAfT3KvZJ0KIpkoXp/xwHYs0B21k6QM/whJ6Rcdes+6Y/9m3P9645J+61XdZVtD2sic4NIiwMAEi97K2aTVjDQEyF7TJGueghDyHKNL7QBVno/uFZ7KrRBS5FS5zHGXhyJ/1h7qRqdyU6Nf1hL1CBEVNzZhVrPemrhttCxc8FWKRzAujJd2zZcSM3v41N8yeN6peHbVnizSLbLmkieGKznRP5XzwqRf2ZlOMe508WafClxX6b3A3muDX1Fn83rOVJWmYEdvFvtIJg== 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:12 +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:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Apr 2024 22:13:54 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [biuIK53c9ebkDvxTzm6uCmgi7JyWMyochUpUbYTwHEo=] 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-15-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: 6dcdd98a-2675-47c3-c298-08dc580898c3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3lmIDjWhadRquKdLYSxFlfA0EQHz8co+QuauXqcpgTQT3ngd1i6RL9GDnVjzTbjXVzHpHQqiwWMHJbvJ3gldwcl41SMtGw922Fdn06l21CxtCmHq81g4Dod+0N7GfbYlmgzlEb4aGWFy4LJehghq51hHDiyl5DlDVvx07K4xtXIS6Wue2Xf6yzluB8HIe9iS4wttflGGd1f4uVniT7kBGLZ+iLfeHBvytBjt1VVUa9SZd7m2Br8Fm/Hi4F5IcFRuNVKM8jYcF7MCxu4KRXTU1DhsXvBYIjpHZ85EuQ29OHqFB0sPVhQ/CKEqMQeP/sOR+rX/6b8pVm+WRZudfMPik4ArT0N/rvPnqH+kkku7FTueqzzuNsoEmpv9vDzeyhw83SiVYi8Pxm+LdG4NtnrfqPAC2H//B9lBZXNYKuFgh42W9KYyEKF+gbViBh2z6p37Zw4WKTMpLkprEQSF2DZFjnceyprOCHUWYX+R+fYKkIGtXgS+5LH49a496KTXhygBkWSHPtyNnKaf0AeupKQznjGeb3oa0bo4c/RYACtuC87Xq8w3s2PdBFZ2FDf8RRllo9Yzrk0l3jHFX3Z/ee5DFMxRmxsCDhm1Kd+3EA9eiXi/KZSnxLN3+TMuKG5VKloL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K9ujdXPOxYzTGth/dxFbxTqga/z6Mb9jiw7BEBZMYxUWiu9MUccqUQhc8daVlIhm8tpYNzxI+Q8UA3XD0eY1gxKiRKrQlynS1SfjkMQd/Vv1Z7QvVVvoBwWG9/Uwp1dfgV3ZLXybaefNCH1PWlLWB5jE+EqwO62Tbpql7bcwEC7giihzdHlAHd8hqEu7JjtyItqgHZUQbbb7JwGjH5OuVztMugZOgSPBsDtRg0aact3xC7BQ0Y2Mb89sBzc85d1RJQXx+2yGCXUQhmahwv9w1Y+h0BAOcvwTbjrYej9LSbHQnfyjbUDewAfRQq/JW+mzaW/gULBnqGLxLAOAu/NeK+WavzZrMmsR/1fCvGCeWccd41eMV40gaOtEGKc8bCcO6SrN57JrnjGWZl8vAWamDgEqmkXzo2D8c6uwBk9sPEXNNkdeU7PZXa/xdzD+YOVTuG3/3myKg2uQVHETo6r7tXCNo+1601EDfVpcA48IXWn3kO11xcMs8Y3MWnii0O9bUVRI0Q/pzptaSF6xxvX7Md/NOI+ehqqTWJ7Mdg+NrcIPVnA09BFvv+SqKmMq32RfLbMYKq/tdYyfgxqHhPVllWIJE0nmB1X8VqQGewHtPhTt5dJj2eugtYwoW0NKwD9rXtEkrlyxZ0V9KrZeh4glMIMHpQbY9EaHr/JBrr0G34C9qXbC8IE4BbpAbOXgZFLtaG8mm3JO8/7+gNdrBgPUQCfI3uZtwG4NUwPmKV9GMS4zEskiX48TWXm4TcnZruJhTZcRIwHAZjEx9Za5EDQzVipj8jKLv89Lc5v/7t05afu7bl5zOq5qfK6qtF4N3is63v+A1N5PpHqM9rnI36MtGMq/y4XM3rzltC0xAY8VKw2TEZGT3ODnxYX0NViLoEbMlZJjGoLMNrCPT38c5/czvFFCnj/w9/0vvda7bcYISYJ2N6zIQkOujAUhRlJdlDEKjttU81OOT2QV5UY1Ilm0uCSZHlo0XmHJO4kSfAqYZphnHSyvJMKH1pvB7mx4JK2T8qEbgYtMdh4uMy30YKiutHJszRCyj1i4KpKq0F4IIUop3Jelyw+dS8/hv8lCs6dC7q00uxh4weminiLvph5fgNv+KOZ92TXpetJunq6rJrvQR3sw+eX/XTJMCyanfcd0Ap83yz6uztvXcDtCUWcrDSDtX2CBDBredbA1Cn90hsHpo8XkVlraXixUD/EcjsavpBUlq4x4p4dUWuYR0tNWDX81FvhrWt9HgPIa0Q+vhc8lsbXsdY+R2GnU9wW5hcRtt27HKWXi9LLzio417ir/Hg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6dcdd98a-2675-47c3-c298-08dc580898c3 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:12.7871 (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 16/27] avcodec/vp8: Convert to ProgressFrame 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: T9SH+HMXKpVV Signed-off-by: Andreas Rheinhardt --- libavcodec/pthread_frame.c | 2 +- libavcodec/vp8.c | 104 ++++++++++++------------------------- libavcodec/vp8.h | 5 +- libavcodec/webp.c | 3 +- 4 files changed, 40 insertions(+), 74 deletions(-) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index ee571be610..e42a9563cd 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -974,7 +974,7 @@ int ff_thread_get_ext_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) /* Hint: It is possible for this function to be called with codecs * that don't support frame threading at all, namely in case * a frame-threaded decoder shares code with codecs that are not. - * This currently affects non-MPEG-4 mpegvideo codecs and and VP7. + * This currently affects non-MPEG-4 mpegvideo codecs. * The following check will always be true for them. */ if (!(avctx->active_thread_type & FF_THREAD_FRAME)) return ff_get_buffer(avctx, f->f, flags); diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 539b5c5395..a1443f6571 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -35,9 +35,9 @@ #include "hwaccel_internal.h" #include "hwconfig.h" #include "mathops.h" +#include "progressframe.h" #include "refstruct.h" #include "thread.h" -#include "threadframe.h" #include "vp8.h" #include "vp89_rac.h" #include "vp8data.h" @@ -103,9 +103,9 @@ static void free_buffers(VP8Context *s) static int vp8_alloc_frame(VP8Context *s, VP8Frame *f, int ref) { - int ret; - if ((ret = ff_thread_get_ext_buffer(s->avctx, &f->tf, - ref ? AV_GET_BUFFER_FLAG_REF : 0)) < 0) + int ret = ff_progress_frame_get_buffer(s->avctx, &f->tf, + ref ? AV_GET_BUFFER_FLAG_REF : 0); + if (ret < 0) return ret; if (!(f->seg_map = ff_refstruct_allocz(s->mb_width * s->mb_height))) goto fail; @@ -117,7 +117,7 @@ static int vp8_alloc_frame(VP8Context *s, VP8Frame *f, int ref) fail: ff_refstruct_unref(&f->seg_map); - ff_thread_release_ext_buffer(&f->tf); + ff_progress_frame_unref(&f->tf); return ret; } @@ -125,26 +125,9 @@ static void vp8_release_frame(VP8Frame *f) { ff_refstruct_unref(&f->seg_map); ff_refstruct_unref(&f->hwaccel_picture_private); - ff_thread_release_ext_buffer(&f->tf); + ff_progress_frame_unref(&f->tf); } -#if CONFIG_VP8_DECODER -static int vp8_ref_frame(VP8Frame *dst, const VP8Frame *src) -{ - int ret; - - vp8_release_frame(dst); - - if ((ret = ff_thread_ref_frame(&dst->tf, &src->tf)) < 0) - return ret; - ff_refstruct_replace(&dst->seg_map, src->seg_map); - ff_refstruct_replace(&dst->hwaccel_picture_private, - src->hwaccel_picture_private); - - return 0; -} -#endif /* CONFIG_VP8_DECODER */ - static void vp8_decode_flush_impl(AVCodecContext *avctx, int free_mem) { VP8Context *s = avctx->priv_data; @@ -184,7 +167,7 @@ static VP8Frame *vp8_find_free_buffer(VP8Context *s) av_log(s->avctx, AV_LOG_FATAL, "Ran out of free frames!\n"); abort(); } - if (frame->tf.f->buf[0]) + if (frame->tf.f) vp8_release_frame(frame); return frame; @@ -1830,7 +1813,7 @@ static const uint8_t subpel_idx[3][8] = { */ static av_always_inline void vp8_mc_luma(VP8Context *s, VP8ThreadData *td, uint8_t *dst, - const ThreadFrame *ref, const VP8mv *mv, + const ProgressFrame *ref, const VP8mv *mv, int x_off, int y_off, int block_w, int block_h, int width, int height, ptrdiff_t linesize, vp8_mc_func mc_func[3][3]) @@ -1847,7 +1830,7 @@ void vp8_mc_luma(VP8Context *s, VP8ThreadData *td, uint8_t *dst, y_off += mv->y >> 2; // edge emulation - ff_thread_await_progress(ref, (3 + y_off + block_h + subpel_idx[2][my]) >> 4, 0); + ff_progress_frame_await(ref, (3 + y_off + block_h + subpel_idx[2][my]) >> 4); src += y_off * linesize + x_off; if (x_off < mx_idx || x_off >= width - block_w - subpel_idx[2][mx] || y_off < my_idx || y_off >= height - block_h - subpel_idx[2][my]) { @@ -1863,7 +1846,7 @@ void vp8_mc_luma(VP8Context *s, VP8ThreadData *td, uint8_t *dst, } mc_func[my_idx][mx_idx](dst, linesize, src, src_linesize, block_h, mx, my); } else { - ff_thread_await_progress(ref, (3 + y_off + block_h) >> 4, 0); + ff_progress_frame_await(ref, (3 + y_off + block_h) >> 4); mc_func[0][0](dst, linesize, src + y_off * linesize + x_off, linesize, block_h, 0, 0); } @@ -1888,7 +1871,7 @@ void vp8_mc_luma(VP8Context *s, VP8ThreadData *td, uint8_t *dst, */ static av_always_inline void vp8_mc_chroma(VP8Context *s, VP8ThreadData *td, uint8_t *dst1, - uint8_t *dst2, const ThreadFrame *ref, const VP8mv *mv, + uint8_t *dst2, const ProgressFrame *ref, const VP8mv *mv, int x_off, int y_off, int block_w, int block_h, int width, int height, ptrdiff_t linesize, vp8_mc_func mc_func[3][3]) @@ -1905,7 +1888,7 @@ void vp8_mc_chroma(VP8Context *s, VP8ThreadData *td, uint8_t *dst1, // edge emulation src1 += y_off * linesize + x_off; src2 += y_off * linesize + x_off; - ff_thread_await_progress(ref, (3 + y_off + block_h + subpel_idx[2][my]) >> 3, 0); + ff_progress_frame_await(ref, (3 + y_off + block_h + subpel_idx[2][my]) >> 3); if (x_off < mx_idx || x_off >= width - block_w - subpel_idx[2][mx] || y_off < my_idx || y_off >= height - block_h - subpel_idx[2][my]) { s->vdsp.emulated_edge_mc(td->edge_emu_buffer, @@ -1930,7 +1913,7 @@ void vp8_mc_chroma(VP8Context *s, VP8ThreadData *td, uint8_t *dst1, mc_func[my_idx][mx_idx](dst2, linesize, src2, linesize, block_h, mx, my); } } else { - ff_thread_await_progress(ref, (3 + y_off + block_h) >> 3, 0); + ff_progress_frame_await(ref, (3 + y_off + block_h) >> 3); mc_func[0][0](dst1, linesize, src1 + y_off * linesize + x_off, linesize, block_h, 0, 0); mc_func[0][0](dst2, linesize, src2 + y_off * linesize + x_off, linesize, block_h, 0, 0); } @@ -1938,7 +1921,7 @@ void vp8_mc_chroma(VP8Context *s, VP8ThreadData *td, uint8_t *dst1, static av_always_inline void vp8_mc_part(VP8Context *s, VP8ThreadData *td, uint8_t *const dst[3], - const ThreadFrame *ref_frame, int x_off, int y_off, + const ProgressFrame *ref_frame, int x_off, int y_off, int bx_off, int by_off, int block_w, int block_h, int width, int height, const VP8mv *mv) { @@ -2003,7 +1986,7 @@ void inter_predict(VP8Context *s, VP8ThreadData *td, uint8_t *const dst[3], { int x_off = mb_x << 4, y_off = mb_y << 4; int width = 16 * s->mb_width, height = 16 * s->mb_height; - const ThreadFrame *ref = &s->framep[mb->ref_frame]->tf; + const ProgressFrame *ref = &s->framep[mb->ref_frame]->tf; const VP8mv *bmv = mb->bmv; switch (mb->partitioning) { @@ -2423,7 +2406,7 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void // if we re-use the same map. if (prev_frame && s->segmentation.enabled && !s->segmentation.update_map) - ff_thread_await_progress(&prev_frame->tf, mb_y, 0); + ff_progress_frame_await(&prev_frame->tf, mb_y); mb = s->macroblocks + (s->mb_height - mb_y - 1) * 2; memset(mb - 1, 0, sizeof(*mb)); // zero left macroblock AV_WN32A(s->intra4x4_pred_mode_left, DC_PRED * 0x01010101); @@ -2631,7 +2614,7 @@ int vp78_decode_mb_row_sliced(AVCodecContext *avctx, void *tdata, int jobnr, td->mv_bounds.mv_max.y -= 64 * num_jobs; if (avctx->active_thread_type == FF_THREAD_FRAME) - ff_thread_report_progress(&curframe->tf, mb_y, 0); + ff_progress_frame_report(&curframe->tf, mb_y); } return 0; @@ -2699,7 +2682,7 @@ int vp78_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int *got_frame, // release no longer referenced frames for (i = 0; i < 5; i++) - if (s->frames[i].tf.f->buf[0] && + if (s->frames[i].tf.f && &s->frames[i] != prev_frame && &s->frames[i] != s->framep[VP8_FRAME_PREVIOUS] && &s->frames[i] != s->framep[VP8_FRAME_GOLDEN] && @@ -2728,14 +2711,14 @@ int vp78_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int *got_frame, goto err; } + if ((ret = vp8_alloc_frame(s, curframe, referenced)) < 0) + goto err; if (s->keyframe) curframe->tf.f->flags |= AV_FRAME_FLAG_KEY; else curframe->tf.f->flags &= ~AV_FRAME_FLAG_KEY; curframe->tf.f->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; - if ((ret = vp8_alloc_frame(s, curframe, referenced)) < 0) - goto err; // check if golden and altref are swapped if (s->update_altref != VP8_FRAME_NONE) @@ -2792,7 +2775,7 @@ int vp78_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int *got_frame, // if we re-use the same map. if (prev_frame && s->segmentation.enabled && !s->segmentation.update_map) - ff_thread_await_progress(&prev_frame->tf, 1, 0); + ff_progress_frame_await(&prev_frame->tf, 1); if (is_vp7) ret = vp7_decode_mv_mb_modes(avctx, curframe, prev_frame); else @@ -2823,7 +2806,7 @@ int vp78_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int *got_frame, num_jobs); } - ff_thread_report_progress(&curframe->tf, INT_MAX, 0); + ff_progress_frame_report(&curframe->tf, INT_MAX); memcpy(&s->framep[0], &s->next_framep[0], sizeof(s->framep[0]) * 4); skip_decode: @@ -2860,24 +2843,8 @@ static int vp7_decode_frame(AVCodecContext *avctx, AVFrame *frame, av_cold int ff_vp8_decode_free(AVCodecContext *avctx) { - VP8Context *s = avctx->priv_data; - int i; - vp8_decode_flush_impl(avctx, 1); - for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++) - av_frame_free(&s->frames[i].tf.f); - - return 0; -} -static av_cold int vp8_init_frames(VP8Context *s) -{ - int i; - for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++) { - s->frames[i].tf.f = av_frame_alloc(); - if (!s->frames[i].tf.f) - return AVERROR(ENOMEM); - } return 0; } @@ -2885,7 +2852,6 @@ static av_always_inline int vp78_decode_init(AVCodecContext *avctx, int is_vp7) { VP8Context *s = avctx->priv_data; - int ret; s->avctx = avctx; s->pix_fmt = AV_PIX_FMT_NONE; @@ -2909,11 +2875,6 @@ int vp78_decode_init(AVCodecContext *avctx, int is_vp7) /* does not change for VP8 */ memcpy(s->prob[0].scan, ff_zigzag_scan, sizeof(s->prob[0].scan)); - if ((ret = vp8_init_frames(s)) < 0) { - ff_vp8_decode_free(avctx); - return ret; - } - return 0; } @@ -2931,13 +2892,20 @@ av_cold int ff_vp8_decode_init(AVCodecContext *avctx) #if CONFIG_VP8_DECODER #if HAVE_THREADS +static void vp8_replace_frame(VP8Frame *dst, const VP8Frame *src) +{ + ff_progress_frame_replace(&dst->tf, &src->tf); + ff_refstruct_replace(&dst->seg_map, src->seg_map); + ff_refstruct_replace(&dst->hwaccel_picture_private, + src->hwaccel_picture_private); +} + #define REBASE(pic) ((pic) ? (pic) - &s_src->frames[0] + &s->frames[0] : NULL) static int vp8_decode_update_thread_context(AVCodecContext *dst, const AVCodecContext *src) { VP8Context *s = dst->priv_data, *s_src = src->priv_data; - int i; if (s->macroblocks_base && (s_src->mb_width != s->mb_width || s_src->mb_height != s->mb_height)) { @@ -2952,13 +2920,8 @@ static int vp8_decode_update_thread_context(AVCodecContext *dst, s->lf_delta = s_src->lf_delta; memcpy(s->sign_bias, s_src->sign_bias, sizeof(s->sign_bias)); - for (i = 0; i < FF_ARRAY_ELEMS(s_src->frames); i++) { - if (s_src->frames[i].tf.f->buf[0]) { - int ret = vp8_ref_frame(&s->frames[i], &s_src->frames[i]); - if (ret < 0) - return ret; - } - } + for (int i = 0; i < FF_ARRAY_ELEMS(s_src->frames); i++) + vp8_replace_frame(&s->frames[i], &s_src->frames[i]); s->framep[0] = REBASE(s_src->next_framep[0]); s->framep[1] = REBASE(s_src->next_framep[1]); @@ -2982,6 +2945,7 @@ const FFCodec ff_vp7_decoder = { FF_CODEC_DECODE_CB(vp7_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .flush = vp8_decode_flush, + .caps_internal = FF_CODEC_CAP_USES_PROGRESSFRAMES, }; #endif /* CONFIG_VP7_DECODER */ @@ -2997,7 +2961,7 @@ const FFCodec ff_vp8_decoder = { FF_CODEC_DECODE_CB(ff_vp8_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS, + .caps_internal = FF_CODEC_CAP_USES_PROGRESSFRAMES, .flush = vp8_decode_flush, UPDATE_THREAD_CONTEXT(vp8_decode_update_thread_context), .hw_configs = (const AVCodecHWConfigInternal *const []) { diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h index 798f67b3de..9bdef0aa88 100644 --- a/libavcodec/vp8.h +++ b/libavcodec/vp8.h @@ -31,8 +31,9 @@ #include "libavutil/mem_internal.h" #include "libavutil/thread.h" +#include "avcodec.h" #include "h264pred.h" -#include "threadframe.h" +#include "progressframe.h" #include "videodsp.h" #include "vp8dsp.h" #include "vpx_rac.h" @@ -150,7 +151,7 @@ typedef struct VP8ThreadData { } VP8ThreadData; typedef struct VP8Frame { - ThreadFrame tf; + ProgressFrame tf; uint8_t *seg_map; ///< RefStruct reference void *hwaccel_picture_private; ///< RefStruct reference diff --git a/libavcodec/webp.c b/libavcodec/webp.c index dbcc5e73eb..7c2a5f0111 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -1571,5 +1571,6 @@ const FFCodec ff_webp_decoder = { FF_CODEC_DECODE_CB(webp_decode_frame), .close = webp_decode_close, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_ICC_PROFILES, + .caps_internal = FF_CODEC_CAP_ICC_PROFILES | + FF_CODEC_CAP_USES_PROGRESSFRAMES, };