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 3C612476BB for ; Tue, 19 Sep 2023 20:03:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C8FA68CA08; Tue, 19 Sep 2023 22:59:31 +0300 (EEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2023.outbound.protection.outlook.com [40.92.65.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4AEF68C95D for ; Tue, 19 Sep 2023 22:59:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lgsXeuY1b2er/bEiuQQQJ6ubY3jbXl2imyNxGdWsMN+6ZF3X45jFYGrGVq9tXXY7VhNhcElzrQxDsbLRBDzctvpMwYDjWxkLETkYHCU6z5r9tw3hH4DJx0fs1LlF0UFJ0UXo2BjPVQJfpyLMUP49HKb7VfwNIubR74Y+cHMICxTXuRjWVJOG2IUgsxbTerPSWQUU7v/SxsMAbW5d3nvP1vLZbJHM7pGqFBaWZyphWdXuqeHiTCn/vcUYNQtBBrVZ76DzbFSUDIs1e1Vg3Mtu89UQDOAirXyEaQLjHGeki5+1SIax8t5rruD0aFL1S1mKixaksS89CGm+WgQae03akw== 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=9fddjZypzk/iheDtFq8U0C9ogryYZB1A5GMH7zE5+jo=; b=GvlwnLLxpDLMjcDAaqXtDlFx5IGTV7nETgNzDF5ABgd3EEYluDiN4ZrNorHBdiKVQ+owyFkb2hyPIYwyqQojdaQNgCJ3Xox5ZGyGUKz+Fqdct6W7hpWZ4ZpPpHbGi7yQg5iEGjB5MTMpR1U3D4vCrRVBW++bnZRJTcxDg8C9Zrr1LthTqXF0q2pX+t60/J/v2QAWUHI8N6jUfJE3q76wJpmnbtOnYqA4Fh+eHTNYsRlqKHx4vBaB6UDFOkS0621rROTRclMmrUoYAGYFhKWxttUfpLSD9zPjTB0nhw6CQFbcu+eHUio5Z8zDkL6j8oZ6ruhaX4u71MQAHITgVMy/+A== 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=9fddjZypzk/iheDtFq8U0C9ogryYZB1A5GMH7zE5+jo=; b=KJzLMwrV6NjBkkt99Dldx17pEW4wmWqs7r56phEzio/ZMwGGNCBWQMY8KNsPmNWrW/5UVXTnGSPladu2Rnwk0cbSfIIyLKNo9WOAn2IjlnBAhJcckHjh1JKxqLHeHiKlHkFef5l+tv5MK+6E7PBw8z3+cuZQWx74F5KdYIo8ZtugDjlFUehpcdDBwOgdMxI2Ifj0qQ2HTa3KX2KyN3XPwL63Xzpfy05aM7awaX0NGkZVHX6/RzM0TXfipLPpXdM469ztdMzCdiZfi1BAy1JXaDrDV4z/2sjuIuDDqko4YcKRn+7/rJBqa4gIOSYo+C3Rp7NaKKfCwHbABNvIk39RJw== 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:59:28 +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:59:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Sep 2023 21:57:32 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [wnrRSBuc7pFPR+oDf4LZ6+fvOzINz8BR] 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-40-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: b7a73f6a-f943-4928-9e49-08dbb94aee3e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5S1I1qr9rwSLU/6Qu644Hd6sAQxtwu8NVjGySZkC/IDQumoti4U3rj87pMQ+FGkMF2TI/YrjwfTM1+sDQBW2nJVO+ni61x3GDBPqlW8ZQ9LvTlYnJFTuADoVfhaHiF3q5amRWUGhzd0nljafJfY5CIqkKhCzzh4EQQu9sOotmqVhc2BNvEGNRAcFJjhoVfCrkZyMlv5JMSrpqpYB9tzoH4+ut4uejqiSpqeuNKvJPqkfupEzeseXHLfhty/okYUE8EiQ81N0ODYk1kcVCRvA5abnseqdhFxyhy+nrp3enky4j71HxMMolbeHgo+pmZJLpfEnHSxaKa3GkkLW/R7FsRarxUvFHFrIcZRhTxdL8XLCU/ZmzPItA26PQfI49XdyHotzsvbPOp927w3AjFyKINPAG7JwlOUoUHcgT8KbkcPPJDpD/h0OU8sL17X0JiNP+GuJyVbbieOdR4KxfzfKzf7MRPn01M0ByfmR+++Z5JhjY/76c1oFeLsCnvXDIq0EQ7gDekx+uUlx4RuVlB78jcBgf+IpvYd9vNDLLZO7+59EiqUS+oPrQNBpFU5hOdgkZMLaO3/oqCol6JWxI0YLdh/l+U3+6FN5lVO9BFD4Uln7mYm+xdbZd5nbKoTd681o X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WfRgQpL68BoHVg5GR1IF5gW+01F8UCPH6IDXKoazCdMjSvIhqUajbcwIZIw6?= =?us-ascii?Q?ggOddDElLXKen0oXYz571dqhngWILLAaCFHZRN1MUphXlRe1h8FgTrr+q6ke?= =?us-ascii?Q?/Cn0GiUJoYWiDRweOwy28SGkPRxs/6oqAepa6uzB2hkiAZg10Z4K1KTZxwXv?= =?us-ascii?Q?IlJrZOVu5K3Evq70i9hvD9JRTYB+ZLAGP/o7xcoo47EIP6xUsVDijrWErIrA?= =?us-ascii?Q?n5uPHBK7XAQxjiy/knE/s2UqrzA/O/jpWUqPjRNdsxDgzFC7JBio+p2tJRgM?= =?us-ascii?Q?OIQozJ5zPUBNYIhKJ+3nVpSlPAd7fQj+NKgDdO3LwiQNHc97s2TvGJR+1gZc?= =?us-ascii?Q?NSpDfp6OXmf+ogFJwHIZP+ZqR24r+ABg70QHiL3/5lBGDveFYuyEG+ZT5x9m?= =?us-ascii?Q?ofxHrAS6iXP2tagvsBdTI6fjg5gRhdvopnMuvKmdusKFVsTyCyE6mwPHXf0x?= =?us-ascii?Q?C7Ns2VgMOfQaMIEp0O1H/M/ef1i2K6dg1WFwyePKUotofR3eDDr/qlqwDhgr?= =?us-ascii?Q?FQ32VqF6Ycc2szwu0KjYhKRgSqCpQCet7zBCw+fJJA8+QSBNCE4FGEVr0o+3?= =?us-ascii?Q?LHdXH0PE99Cw4ZRZvZM9fR+n8xOmoNSfM/vYYxeK+nxh+8dE8PbZdrKTJrA9?= =?us-ascii?Q?d8R10/9nGd7LhRypQxJH2qQZ7/onqyTYZJbEgfPluJMMra1cenYSC0B7E9wX?= =?us-ascii?Q?UPatTiRWusEE1ZMdexIcy5bVssCzBHygQKqfcV7J6H+datD+jR/v6a6xY9Ys?= =?us-ascii?Q?Xc+Hlaxxf9eV+kbKqEZLrUzqDLjQ6fzBctlQsVBXGny+BZqNQmD6RBSmb4Vv?= =?us-ascii?Q?OUlM3xsOxGsT2tHEE/scjehIrtw4Gky+OuPoWy18AJxeMjW/AjmeLyeyDMp8?= =?us-ascii?Q?OeoKtJ/i9cwBrUYS8Xgslq8v3NdNDbrGzjlVpbG/17C44BvnCE+OCH0ObxjZ?= =?us-ascii?Q?B40qlBUXJP1f3U3u5poaLbtCeX1+KAYNz1rACnJvpjk1eMOijtD13HmQCpsP?= =?us-ascii?Q?JqGJqe4i/sBvgs66pfOLkbonznR5xXr0NOKFc59Ad1X33ftgzUYWy4BD/mb+?= =?us-ascii?Q?JYQb6F6LZgtHoXD1Nlww4k1entJ3w7Eq3lsVMKDfQ+D0s/MorqnKj/DNXCEr?= =?us-ascii?Q?h3ZDzkEJZ5a8vpbfYHt3J3PxlltZ9O+qX7to8admDL9GyEHjkFAYL3wJy5sl?= =?us-ascii?Q?N4JTyaypCp/PTo5iuu4Dpujii7L9wtlyAYShGd7II8877eStNLYqUSykmzTH?= =?us-ascii?Q?ODY555EkkJJrCf/IJ+NB?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7a73f6a-f943-4928-9e49-08dbb94aee3e 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:59:28.1026 (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 40/42] avcodec/hevcdec: 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). Signed-off-by: Andreas Rheinhardt --- libavcodec/hevc_filter.c | 8 ++++---- libavcodec/hevc_mvs.c | 6 +++--- libavcodec/hevc_refs.c | 22 ++++++++++------------ libavcodec/hevcdec.c | 24 ++++++++++-------------- libavcodec/hevcdec.h | 4 ++-- 5 files changed, 29 insertions(+), 35 deletions(-) diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index 0c45310ea6..07bae34782 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -26,7 +26,7 @@ #include "libavutil/internal.h" #include "hevcdec.h" -#include "threadframe.h" +#include "progressframe.h" #define LUMA 0 #define CB 1 @@ -874,15 +874,15 @@ void ff_hevc_hls_filter(HEVCLocalContext *lc, int x, int y, int ctb_size) if (y && x_end) { sao_filter_CTB(lc, s, x, y - ctb_size); if (s->threads_type & FF_THREAD_FRAME ) - ff_thread_report_progress(&s->ref->tf, y, 0); + ff_thread_progress_report(&s->ref->tf, y); } if (x_end && y_end) { sao_filter_CTB(lc, s, x , y); if (s->threads_type & FF_THREAD_FRAME ) - ff_thread_report_progress(&s->ref->tf, y + ctb_size, 0); + ff_thread_progress_report(&s->ref->tf, y + ctb_size); } } else if (s->threads_type & FF_THREAD_FRAME && x_end) - ff_thread_report_progress(&s->ref->tf, y + ctb_size - 4, 0); + ff_thread_progress_report(&s->ref->tf, y + ctb_size - 4); } void ff_hevc_hls_filters(HEVCLocalContext *lc, int x_ctb, int y_ctb, int ctb_size) diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index 0a8cc2c43d..be02d52b3e 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -23,7 +23,7 @@ #include "hevc.h" #include "hevcdec.h" -#include "threadframe.h" +#include "progressframe.h" static const uint8_t l0_l1_cand_idx[12][2] = { { 0, 1, }, @@ -248,7 +248,7 @@ static int temporal_luma_motion_vector(const HEVCContext *s, int x0, int y0, x &= ~15; y &= ~15; if (s->threads_type == FF_THREAD_FRAME) - ff_thread_await_progress(&ref->tf, y, 0); + ff_thread_progress_await(&ref->tf, y); x_pu = x >> s->ps.sps->log2_min_pu_size; y_pu = y >> s->ps.sps->log2_min_pu_size; temp_col = TAB_MVF(x_pu, y_pu); @@ -262,7 +262,7 @@ static int temporal_luma_motion_vector(const HEVCContext *s, int x0, int y0, x &= ~15; y &= ~15; if (s->threads_type == FF_THREAD_FRAME) - ff_thread_await_progress(&ref->tf, y, 0); + ff_thread_progress_await(&ref->tf, y); x_pu = x >> s->ps.sps->log2_min_pu_size; y_pu = y >> s->ps.sps->log2_min_pu_size; temp_col = TAB_MVF(x_pu, y_pu); diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 9cdc4233df..afb9ff0cc0 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -27,18 +27,15 @@ #include "thread.h" #include "hevc.h" #include "hevcdec.h" +#include "progressframe.h" #include "refstruct.h" -#include "threadframe.h" void ff_hevc_unref_frame(HEVCContext *s, HEVCFrame *frame, int flags) { - /* frame->frame can be NULL if context init failed */ - if (!frame->frame || !frame->frame->buf[0]) - return; - frame->flags &= ~flags; if (!frame->flags) { - ff_thread_release_ext_buffer(s->avctx, &frame->tf); + ff_thread_progress_unref(s->avctx, &frame->tf); + frame->frame = NULL; ff_thread_release_buffer(s->avctx, frame->frame_grain); frame->needs_fg = 0; @@ -84,13 +81,14 @@ static HEVCFrame *alloc_frame(HEVCContext *s) int i, j, ret; for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { HEVCFrame *frame = &s->DPB[i]; - if (frame->frame->buf[0]) + if (frame->frame) continue; - ret = ff_thread_get_ext_buffer(s->avctx, &frame->tf, - AV_GET_BUFFER_FLAG_REF); + ret = ff_thread_progress_get_buffer(s->avctx, &frame->tf, + AV_GET_BUFFER_FLAG_REF); if (ret < 0) return NULL; + frame->frame = frame->tf.f; frame->rpl = ff_refstruct_allocz(s->pkt.nb_nals * sizeof(*frame->rpl)); if (!frame->rpl) @@ -136,7 +134,7 @@ int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame, int poc) for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { HEVCFrame *frame = &s->DPB[i]; - if (frame->frame->buf[0] && frame->sequence == s->seq_decode && + if (frame->frame && frame->sequence == s->seq_decode && frame->poc == poc) { av_log(s->avctx, AV_LOG_ERROR, "Duplicate POC in a sequence: %d.\n", poc); @@ -395,7 +393,7 @@ static HEVCFrame *find_ref_idx(HEVCContext *s, int poc, uint8_t use_msb) for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { HEVCFrame *ref = &s->DPB[i]; - if (ref->frame->buf[0] && ref->sequence == s->seq_decode) { + if (ref->frame && ref->sequence == s->seq_decode) { if ((ref->poc & mask) == poc && (use_msb || ref->poc != s->poc)) return ref; } @@ -442,7 +440,7 @@ static HEVCFrame *generate_missing_ref(HEVCContext *s, int poc) frame->flags = 0; if (s->threads_type == FF_THREAD_FRAME) - ff_thread_report_progress(&frame->tf, INT_MAX, 0); + ff_thread_progress_report(&frame->tf, INT_MAX); return frame; } diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index a476a7c7ce..355604a46f 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -47,9 +47,9 @@ #include "hwconfig.h" #include "internal.h" #include "profiles.h" +#include "progressframe.h" #include "refstruct.h" #include "thread.h" -#include "threadframe.h" static const uint8_t hevc_pel_weight[65] = { [2] = 0, [4] = 1, [6] = 2, [8] = 3, [12] = 4, [16] = 5, [24] = 6, [32] = 7, [48] = 8, [64] = 9 }; @@ -1857,7 +1857,7 @@ static void hevc_await_progress(const HEVCContext *s, const HEVCFrame *ref, if (s->threads_type == FF_THREAD_FRAME ) { int y = FFMAX(0, (mv->y >> 2) + y0 + height + 9); - ff_thread_await_progress(&ref->tf, y, 0); + ff_thread_progress_await(&ref->tf, y); } } @@ -3210,7 +3210,7 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) fail: if (s->ref && s->threads_type == FF_THREAD_FRAME) - ff_thread_report_progress(&s->ref->tf, INT_MAX, 0); + ff_thread_progress_report(&s->ref->tf, INT_MAX); return ret; } @@ -3381,14 +3381,15 @@ static int hevc_ref_frame(HEVCContext *s, HEVCFrame *dst, HEVCFrame *src) { int ret; - ret = ff_thread_ref_frame(&dst->tf, &src->tf); - if (ret < 0) - return ret; + ff_thread_progress_ref(&dst->tf, &src->tf); + dst->frame = dst->tf.f; if (src->needs_fg) { ret = av_frame_ref(dst->frame_grain, src->frame_grain); - if (ret < 0) + if (ret < 0) { + ff_hevc_unref_frame(s, dst, ~0); return ret; + } dst->needs_fg = 1; } @@ -3428,7 +3429,6 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { ff_hevc_unref_frame(s, &s->DPB[i], ~0); - av_frame_free(&s->DPB[i].frame); av_frame_free(&s->DPB[i].frame_grain); } @@ -3474,11 +3474,6 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) return AVERROR(ENOMEM); for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { - s->DPB[i].frame = av_frame_alloc(); - if (!s->DPB[i].frame) - return AVERROR(ENOMEM); - s->DPB[i].tf.f = s->DPB[i].frame; - s->DPB[i].frame_grain = av_frame_alloc(); if (!s->DPB[i].frame_grain) return AVERROR(ENOMEM); @@ -3510,7 +3505,7 @@ static int hevc_update_thread_context(AVCodecContext *dst, for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { ff_hevc_unref_frame(s, &s->DPB[i], ~0); - if (s0->DPB[i].frame->buf[0]) { + if (s0->DPB[i].frame) { ret = hevc_ref_frame(s, &s->DPB[i], &s0->DPB[i]); if (ret < 0) return ret; @@ -3671,6 +3666,7 @@ const FFCodec ff_hevc_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, .caps_internal = FF_CODEC_CAP_EXPORTS_CROPPING | + FF_CODEC_CAP_USES_PROGRESSFRAMES | FF_CODEC_CAP_INIT_CLEANUP, .p.profiles = NULL_IF_CONFIG_SMALL(ff_hevc_profiles), .hw_configs = (const AVCodecHWConfigInternal *const []) { diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index bed8716f99..827a26c536 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -40,7 +40,7 @@ #include "hevc_sei.h" #include "hevcdsp.h" #include "h274.h" -#include "threadframe.h" +#include "progressframe.h" #include "videodsp.h" #define SHIFT_CTB_WPP 2 @@ -406,7 +406,7 @@ typedef struct DBParams { typedef struct HEVCFrame { AVFrame *frame; AVFrame *frame_grain; - ThreadFrame tf; + ProgressFrame tf; int needs_fg; /* 1 if grain needs to be applied by the decoder */ MvField *tab_mvf; ///< RefStruct reference RefPicList *refPicList; -- 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".