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 3DAEC476D3 for ; Tue, 19 Sep 2023 20:03:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61CC468CA13; Tue, 19 Sep 2023 22:59:45 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2023.outbound.protection.outlook.com [40.92.73.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F6F368CA02 for ; Tue, 19 Sep 2023 22:59:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WmTbMjdIZX4JRV4XN2k7K5ppsMIt8FKbckGjXrTNrvd4l3cVs4Rg2LvQAx8im0fZd10Uq5LnyXIW9yKGzol1OmvPnmsBDqjvhkLgBSnCxpEAk8sEZyib0heCl5hc+PoJEWPmMLnnGwQUVTvVM2Oj/mbrotTtHH7tDrlhsHF1bf9G0nnBKdnb3cTA8YdZc2fu+2GMp3X3RFlw6sYQ3N2PX9MM3LD+hs4zuDPIHetkc62xV9AaNTPh5XiT97GAE3E6qLbsZgAZHxhIgHpwi6/NMmhxJ4i+QWZ2kKApN4LvWnN/lnp9UaXX6GoNdIMiOFu2YhjrIzH98WGz0IjLAZDocg== 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=VJXB3rRtr8c70ZBXWwzfUYq/m+1gEYXBeoTcU7p9rLo=; b=hP1HHBCjYCEvggT2acgfg1hWNbbbMurm3sS3PQfbYk94uRlJgchB64UaxeZ/nONwD3R+PqmiIIdmQCQdJQwcvDjxRj42qhWFuF/dJ7++yzDzQOJIabdYweA/6FnIL9XephmiJpGP49Cw155q6v7cgLOP7zZ7iukDtFtE6YOWOQ9PjKBjewr+AoR7YwftQ+0QEMO9d9qUsxBGrxOPWbQ38DCNDqxYKs0XCBN1AL3K+GESW+dV+oHtwLdBUWh7KIJIOVx1hei2z6dTTxw3W6O8gnOxsD2jV+0Fe3e42WXSaKGe61my71e6cHahr1XtX+8f6XcuLEnaMnrThFKOnepC1w== 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=VJXB3rRtr8c70ZBXWwzfUYq/m+1gEYXBeoTcU7p9rLo=; b=Pk5jRit8Cbrx+qqW/b7bfBNjqE9SDC+O+lAa5x9h6CWV/H+wth3H+XebAHF/iQrmCE4+XN/PXc6B35ok4tuiFWrmzxSsgBsUa4S+vT7giNnMWnjtkQKDmlxbjfzr18aFpEctENspjJRhzkY+aCiCEQJTpTiCrL670bRmLrj8Vvj6eC2VAEyE9jyu3mtDBeFPV1Ibt1sfMNikLCxErR9h9PqqvsYTOXAp/LTcrLv7kySWdb6hyKfTZ+cBXzro9oEizLnS2e9xdsVOKJV94gGvf/aoILFoiqd1KuZMoXT/BiokcDd8VSNhiTYEMznwIzvIcpHbSz9JVdjLSGqFmODdVQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0295.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Tue, 19 Sep 2023 19:59:42 +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:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Sep 2023 21:57:34 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [+ILOVtkLv1k4zjfRt8TFc9UtMWNSKj5m] 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-42-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0295:EE_ X-MS-Office365-Filtering-Correlation-Id: dc3b4e18-70fa-445c-6cee-08dbb94af6d4 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /rv2eBoT+nOZ7aOXPfRkKKJDcTeALr/O7EJLbPbqr0osS/NBJ7baPIVYTusn8r9MPWco5ZWTY+VNjSi+FJR+hFD1/IYPa6ZUWibCkoXpdaPmpthkbijYcYkEbovhrY72ls9G+Rod36+ebQXIHYjxZg+Ie119mBRBj0wACF9CYOS/MwEi0oCFXzMjO7o19Oo02a4qvpeIH7CTQm3SrWWazKxvRsy+Svpuy/D3o8cY7z9ccQ6kk55EsaIEU5VB1A6Yq0XxmTynwm2ofPIc6ayiLM+m5BCXwJFyVDxY0dy1UUTc20jqvaalcR7nETE5DaKMEkOMxNGoY9wzrOH0H5IFtZMnoNeSeHg1ls4gd+K27mgrlEaEHmChqe9hUxq+PBn3A25q6lyzN7oaTNd8MG+2jlU96GBE9jHXhJi1rXv8KpnzsawJn/J/bDzn5nCjxUy+1y7W6eMHdFht9H+beuowDoNrmC8JXUMVejdLL9mguH5KVFz1o1QPxzudIN8v1ZGCykE7kcjRSZ7dwkAO4JUvHbJ+g1N2XgBDnfZX2VfktXw4KK1IiETKA8ye9vLAonVFnf4uQMUOr54QXBkJxEHGZwDSMUNaPCnWIG8bLk87g4OUPs4OakdMjZ073iVdf6bG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?h2h9cilSXd65cTcDTAaDjvOSseVW4k94oDJzFCoootVWX3Pd+eJ+rMMBsQOU?= =?us-ascii?Q?wLHTj4xuYzkcaKupf9LnF8kNAq3VyEzonDHPuI6xmmUimB/rWJN6ZKQg2CzU?= =?us-ascii?Q?aI/r5n1w9w1xhkqQ4s7E79AfrHEDeQVHAsdTuhioph61+ugm45y4fiVu2YYg?= =?us-ascii?Q?0mP565V311Jmc31qxG/1ni9ycQZnZ0yCGtonJ4cUh7iw2LXxKmgwHke/hpjX?= =?us-ascii?Q?wUzndGuSjQWfBPiYApEfb8FZWzyOnQCeMjB92wApvE6MGyqYdFxNPpKZGIDz?= =?us-ascii?Q?T8oTT08hSA2clXQiyqIDYKdVhXwpgKqRJyzQGo2WIQhyhbhi3SCmLeX/kQa8?= =?us-ascii?Q?1vOmJLm7CBWd8eglph7nV3J2xrW3VDSaaF6s8xGDM/eHQLCUFGbsgjjGzcf5?= =?us-ascii?Q?ARupJksDOGfhshOUgxQGE43g5nP6uuSrCb/00r6O1L+1Z0Grpjra4N5Ut8kr?= =?us-ascii?Q?UMz0HYtw6p001msx397nsLK6gA3jcaR1OtWHIevu5+JxI+9Qzefak06PJm3A?= =?us-ascii?Q?jiqp5R7uBlIynFfnyXiP8DkwUR3EQnSDRCKDlyh/91lP4W+DJU/4sosCrrTj?= =?us-ascii?Q?vdt1xOlnFYs15Lm7RVFIJIC94TMKbV8qPC/Q6UOrJApzJ6A19S879SOpu5Cj?= =?us-ascii?Q?Lttm8+zkC+wrCV1y4CWkrzEla90OXnes7fuhmn2S4o6sm9jUIN8M144NjcAq?= =?us-ascii?Q?ODNhgXLmmx7L1dzbM9CS5VTGU515A+YFhEqinXak8BxUMXfzNquBGXq3Yqj/?= =?us-ascii?Q?MJGYgsD0duS7wzJkquENY+zXfuDVTJH4YkO7AMarBctgaHyrtn6J/vpt+BGc?= =?us-ascii?Q?sWgmbL7r7rj8Xwxz+43YLxg942fgEpb47eOuG7uvAmYI5oSA8HojiAsOjEDj?= =?us-ascii?Q?4J2X5SVl+q8ECk/F6ukKEqPDhOUCTJJbzSm7SbEBvQQENnsM+h/Vo1RoZazd?= =?us-ascii?Q?Dzdg98O6X0HGgb4OC2iysk6tUw+WdGhfzph0jDQx+Txr5i/+aAWzuWelKDbE?= =?us-ascii?Q?+LILONHCSA7wfH+wT40jpVTzXq9dhNw42l9aOHk8lH1swPT4hqprm9f6ptBV?= =?us-ascii?Q?F89qQ4NWSzFGWWjUMmkQwKEMZcghRc/It6MPt5DomvFneAPUArop3p0jcGFJ?= =?us-ascii?Q?47P9bz7NwgTTlUFEbPghfDE/gFJbjDv8cDgXwXfA1jNdTslF0XGv1sXlJ2q4?= =?us-ascii?Q?QxOn00Rnnr5dSJuhjrWttfSNQ1IM9AFLfVu351YDVtM21g4ShgyUjA1w3QMv?= =?us-ascii?Q?yzgj5FtkLv5EAhmIagOL?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc3b4e18-70fa-445c-6cee-08dbb94af6d4 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:42.5657 (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: AM8P250MB0295 Subject: [FFmpeg-devel] [PATCH 42/42] avcodec/ffv1dec: 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/ffv1.c | 1 - libavcodec/ffv1.h | 4 +-- libavcodec/ffv1dec.c | 83 +++++++++++++++++++------------------------- 3 files changed, 37 insertions(+), 51 deletions(-) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index b6204740ed..9075b34950 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -31,7 +31,6 @@ #include "avcodec.h" #include "rangecoder.h" #include "ffv1.h" -#include "threadframe.h" av_cold int ff_ffv1_common_init(AVCodecContext *avctx) { diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index 04869da5c9..83a236fda8 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -32,9 +32,9 @@ #include "avcodec.h" #include "get_bits.h" #include "mathops.h" +#include "progressframe.h" #include "put_bits.h" #include "rangecoder.h" -#include "threadframe.h" #ifdef __INTEL_COMPILER #undef av_flatten @@ -87,7 +87,7 @@ typedef struct FFV1Context { int flags; int64_t picture_number; int key_frame; - ThreadFrame picture, last_picture; + ProgressFrame picture, last_picture; struct FFV1Context *fsrc; AVFrame *cur; diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 20cc345780..b7e02b82b2 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -37,8 +37,8 @@ #include "golomb.h" #include "mathops.h" #include "ffv1.h" +#include "progressframe.h" #include "thread.h" -#include "threadframe.h" static inline av_flatten int get_symbol_inline(RangeCoder *c, uint8_t *state, int is_signed) @@ -264,8 +264,8 @@ static int decode_slice(AVCodecContext *c, void *arg) for( si=0; fs != f->slice_context[si]; si ++) ; - if(f->fsrc && !(p->flags & AV_FRAME_FLAG_KEY)) - ff_thread_await_progress(&f->last_picture, si, 0); + if (f->fsrc && !(p->flags & AV_FRAME_FLAG_KEY) && f->last_picture.f) + ff_thread_progress_await(&f->last_picture, si); if(f->fsrc && !(p->flags & AV_FRAME_FLAG_KEY)) { FFV1Context *fssrc = f->fsrc->slice_context[si]; @@ -370,7 +370,7 @@ static int decode_slice(AVCodecContext *c, void *arg) } } - ff_thread_report_progress(&f->picture, si, 0); + ff_thread_progress_report(&f->picture, si); return 0; } @@ -847,11 +847,6 @@ static av_cold int decode_init(AVCodecContext *avctx) if ((ret = ff_ffv1_common_init(avctx)) < 0) return ret; - f->picture.f = av_frame_alloc(); - f->last_picture.f = av_frame_alloc(); - if (!f->picture.f || !f->last_picture.f) - return AVERROR(ENOMEM); - if (avctx->extradata_size > 0 && (ret = read_extra_header(f)) < 0) return ret; @@ -868,31 +863,21 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, int buf_size = avpkt->size; FFV1Context *f = avctx->priv_data; RangeCoder *const c = &f->slice_context[0]->c; - int i, ret; + int i, ret, key_frame; uint8_t keystate = 128; uint8_t *buf_p; AVFrame *p; - if (f->last_picture.f) - ff_thread_release_ext_buffer(avctx, &f->last_picture); - FFSWAP(ThreadFrame, f->picture, f->last_picture); - - f->cur = p = f->picture.f; + ff_thread_progress_unref(avctx, &f->last_picture); + FFSWAP(ProgressFrame, f->picture, f->last_picture); - if (f->version < 3 && avctx->field_order > AV_FIELD_PROGRESSIVE) { - /* we have interlaced material flagged in container */ - p->flags |= AV_FRAME_FLAG_INTERLACED; - if (avctx->field_order == AV_FIELD_TT || avctx->field_order == AV_FIELD_TB) - p->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; - } f->avctx = avctx; ff_init_range_decoder(c, buf, buf_size); ff_build_rac_states(c, 0.05 * (1LL << 32), 256 - 8); - p->pict_type = AV_PICTURE_TYPE_I; //FIXME I vs. P if (get_rac(c, &keystate)) { - p->flags |= AV_FRAME_FLAG_KEY; + key_frame = AV_FRAME_FLAG_KEY; f->key_frame_ok = 0; if ((ret = read_header(f)) < 0) return ret; @@ -903,7 +888,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, "Cannot decode non-keyframe without valid keyframe\n"); return AVERROR_INVALIDDATA; } - p->flags &= ~AV_FRAME_FLAG_KEY; + key_frame = 0; } if (f->ac != AC_GOLOMB_RICE) { @@ -921,10 +906,23 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, return AVERROR_INVALIDDATA; } - ret = ff_thread_get_ext_buffer(avctx, &f->picture, AV_GET_BUFFER_FLAG_REF); + ret = ff_thread_progress_get_buffer(avctx, &f->picture, + AV_GET_BUFFER_FLAG_REF); if (ret < 0) return ret; + f->cur = p = f->picture.f; + + p->pict_type = AV_PICTURE_TYPE_I; //FIXME I vs. P + p->flags = (p->flags & ~AV_FRAME_FLAG_KEY) | key_frame; + + if (f->version < 3 && avctx->field_order > AV_FIELD_PROGRESSIVE) { + /* we have interlaced material flagged in container */ + p->flags |= AV_FRAME_FLAG_INTERLACED; + if (avctx->field_order == AV_FIELD_TT || avctx->field_order == AV_FIELD_TB) + p->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; + } + if (avctx->debug & FF_DEBUG_PICT_INFO) av_log(avctx, AV_LOG_DEBUG, "ver:%d keyframe:%d coder:%d ec:%d slices:%d bps:%d\n", f->version, !!(p->flags & AV_FRAME_FLAG_KEY), f->ac, f->ec, f->slice_count, f->avctx->bits_per_raw_sample); @@ -943,7 +941,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, } else v = buf_p - c->bytestream_start; if (buf_p - c->bytestream_start < v) { av_log(avctx, AV_LOG_ERROR, "Slice pointer chain broken\n"); - ff_thread_report_progress(&f->picture, INT_MAX, 0); + ff_thread_progress_report(&f->picture, INT_MAX); return AVERROR_INVALIDDATA; } buf_p -= v; @@ -985,11 +983,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, for (i = f->slice_count - 1; i >= 0; i--) { FFV1Context *fs = f->slice_context[i]; int j; - if (fs->slice_damaged && f->last_picture.f->data[0]) { + if (fs->slice_damaged && f->last_picture.f) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); const uint8_t *src[4]; uint8_t *dst[4]; - ff_thread_await_progress(&f->last_picture, INT_MAX, 0); + ff_thread_progress_await(&f->last_picture, INT_MAX); for (j = 0; j < desc->nb_components; j++) { int pixshift = desc->comp[j].depth > 8; int sh = (j == 1 || j == 2) ? f->chroma_h_shift : 0; @@ -1011,10 +1009,9 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, fs->slice_height); } } - ff_thread_report_progress(&f->picture, INT_MAX, 0); + ff_thread_progress_report(&f->picture, INT_MAX); - if (f->last_picture.f) - ff_thread_release_ext_buffer(avctx, &f->last_picture); + ff_thread_progress_unref(avctx, &f->last_picture); if ((ret = av_frame_ref(rframe, f->picture.f)) < 0) return ret; @@ -1056,13 +1053,13 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) { FFV1Context *fsrc = src->priv_data; FFV1Context *fdst = dst->priv_data; - int i, ret; + int i; if (dst == src) return 0; { - ThreadFrame picture = fdst->picture, last_picture = fdst->last_picture; + ProgressFrame picture = fdst->picture, last_picture = fdst->last_picture; uint8_t (*initial_states[MAX_QUANT_TABLES])[32]; struct FFV1Context *slice_context[MAX_SLICES]; memcpy(initial_states, fdst->initial_states, sizeof(fdst->initial_states)); @@ -1084,12 +1081,7 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) av_assert1(fdst->max_slice_count == fsrc->max_slice_count); - - ff_thread_release_ext_buffer(dst, &fdst->picture); - if (fsrc->picture.f->data[0]) { - if ((ret = ff_thread_ref_frame(&fdst->picture, &fsrc->picture)) < 0) - return ret; - } + ff_thread_progress_replace(dst, &fdst->picture, &fsrc->picture); fdst->fsrc = fsrc; @@ -1101,15 +1093,9 @@ static av_cold int ffv1_decode_close(AVCodecContext *avctx) { FFV1Context *const s = avctx->priv_data; - if (s->picture.f) { - ff_thread_release_ext_buffer(avctx, &s->picture); - av_frame_free(&s->picture.f); - } + ff_thread_progress_unref(avctx, &s->picture); + ff_thread_progress_unref(avctx, &s->last_picture); - if (s->last_picture.f) { - ff_thread_release_ext_buffer(avctx, &s->last_picture); - av_frame_free(&s->last_picture.f); - } return ff_ffv1_close(avctx); } @@ -1125,5 +1111,6 @@ const FFCodec ff_ffv1_decoder = { UPDATE_THREAD_CONTEXT(update_thread_context), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | + FF_CODEC_CAP_USES_PROGRESSFRAMES, }; -- 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".