From patchwork Mon Jan 24 14:45:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33776 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp387404ioh; Mon, 24 Jan 2022 06:48:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJw/0KZr+dO0UmYq8xhvSCcUC2dw0PbkKg9bVvhO+ODvIym/ByMl7WM7gHavd2AE6+Fndwok X-Received: by 2002:a17:906:a21a:: with SMTP id r26mr13090200ejy.174.1643035735956; Mon, 24 Jan 2022 06:48:55 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g26si10161836edf.602.2022.01.24.06.48.55; Mon, 24 Jan 2022 06:48:55 -0800 (PST) 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=CTlk0VlB; 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 8598768B0CC; Mon, 24 Jan 2022 16:47:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2025.outbound.protection.outlook.com [40.92.90.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3206E68B042 for ; Mon, 24 Jan 2022 16:47:30 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YJ4bKbWXee3BEJxtBCDjBWjjCBYvdG8Hfbb+SA1qBcsd5QXeGOCI2b1Lgk7/2m1woTnbjcWTDkQJuGc37O0lpOMoR6/rdqkteTHG1EGrVJKBbLdZmiC1iEdAAtrG4Hs8eAVuYyzvkpTcbvxVii/XC28p/7Ws41IB+skf0nJztZUGcV8Yl609+PiHMIQRMBom4YGIQwkzXc3++MWFylAFqG23+0qyMMV7MxtUx4fyVGXJQFksY1Atfm6BknXUeJ/2rYbHlN5hvwM7a20j+U6B2HUTd/rVhJ7z1EzEmvwhE9S+adq3y6t2RZm88gZ+SgdiVJ/K98clTc7KP8zvN458JQ== 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=iUsXuU2o1R7q8xk6JtXBTR0lwjPA2X/COT8F48gZCA0=; b=SKlvAto7w67OakBGGwevUMX0rGCxZDumFju10qd31t2+QHw/dIHIDB6mU71fD6FYKSDVDwK8LRvVmSYk7klqdwrx/pt+NfGyA7shp1Q6GgtpUPoG0V8qeio0kZW+N8FiwkeP0UbHSw4v/DcOYys2ay3lV2bW2aJKrfeUSk6WBYTxHsqMPRGgaXdDgzbkrGbXRvQYP6BgPbQpLypZ0FnJgFZ/WK9ICmcJb+O1Ql7UGKyBfJsAJbj6bqKGrHDBbb/q4/Zw5cc5Fvc4NiyOX2zmdupUgDezab5ZjiT+TcSBCM/rMhybH8VH9prMt9/gqiBgY0kC2azyQZ1OQTxX4lYXeg== 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=iUsXuU2o1R7q8xk6JtXBTR0lwjPA2X/COT8F48gZCA0=; b=CTlk0VlBWmfLCcfM26jgymenvdKrVQyNxWtV4USMzB3g81nVV9D4+Zym587E45lIFoyqlYbyUGX6lE0fp89aoMvrCrLpDHW3ObORTegGuNj4YhasiTtrt6VygJThyYXMqbfg/rp2Ct7UFSBbRHbgDh2yYEzH23YjuEgV+JwpY1zPORfmkL99VAY3JjlJUh2ZFTmsxAJ852lB19eaO3mujdK6n5WsiTkrnHJU6jNw2Jc3E6FiHG8vJuFiUNDfhqImS+GSdoQ8xIiPkSGglQMbETbX7TTOe+SCRU50K+5ggcfBT77KIBCBOGe1xOf7yI8QfJY2LSZ6psck/uLcXVcmmw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB3088.eurprd03.prod.outlook.com (2603:10a6:802:2f::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 14:47:29 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 14:47:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 15:45:59 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [WWfZ9uq+4XW+/nGycFy+1++GCqC8/kI1] X-ClientProxiedBy: AM5PR0201CA0016.eurprd02.prod.outlook.com (2603:10a6:203:3d::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124144616.559446-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c22e6502-b59c-463c-026d-08d9df487206 X-MS-TrafficTypeDiagnostic: VI1PR03MB3088:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YdrIFrBu1Bu2tnSm3EjMjbhfKsi2t0JtjhNVIDoKzUHhYi5NjFEs32nySrQM4QfRWZelS+00RkJjJU+4+DXMUQu3E0Qm8Wyae9VMbtoLN6gJuEuY7oEorPQc0lYIqhlt3DNpZ32WO+UfJvWRVK/18M5x2nemt2dFVEMJnMmBM0tFSpdctYdkkJBf39mJ9w4rgV2IXg5jvRvoHleeiJIFDMyT2JC/6QR64q9jyG+N8MN8MNFP0D4UD37wB3eNwtZW/7Uf3sbXEmEdxuvzOguidfgXDDcgNWlOhcS2lU8DqJQTdKh1KhDPo39d7pezFp4ExdJR01tu1tgEu989Iy/Lkq78iJuIlGXT7Ov7NiLjUWgzb/hu+/mCC6eQhWz1+OX+jbToZeViHqUSBqKXbe2AeHquqZTqJGLh5K2oPV6pCoFT1we4qq+qDsiHLI41fn2NQ0VSWCik3e/CBzSOg5/3U7F1NojqFtvHJE8mVLT7CW6Ey7qMHm00+HygJsa2q5WooOe+4uUxK/IS+nPwC6qkp74WWrR0kGvjMvgJ2p3pe/1BJbzdiM2jgHP4EeZNpQcCvARLvHV5C8/sYDOIecx1rw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /lsejtGptedaLTht5WDw70Wd8gImfOX1Bpbk5qfvKHLStsQOrivS/1voNF+Rl5AN3F8y9J/VlIVh0++Hq1OrvQTbe2/yqRGS9hdOLVYCSkdADj3lLLvan/ghuOl7duCh4UR2JVoIgIE2kAOiy7UU9dob1+0hxDPpjoqL1ssDXma+vM6JyH1WZrI6S9+MgWFVUU2d6Ja2reUxjidN9rf45lszLFJruNr6PT39J9Tpflkyq8r6lX9SUkhNMyFAC73bjRKw0nq+Dh73GJFxucXkCdVLkBTUa1aSQEboRzRieqjV6OweLMivMibFRpjGz+XGW72JLxTCbxf/6qTCdd/Hy6ATrLVPfqW5H58kdcfAe9mIPmavvtpB05UP5h03C2+GBB8IU+zTvTH320LYy0Cq0gMXEE7TPXdfE56BlrNojMzzsqKt4aNDD90I/knCs3E/8Ilho1s/kYJnt1tHDJ4vua2fEyXcNXtl/Tr+6dwR3d2K+N2FphnFThP3N5Jyd2PpUFTsWGk45gMbXmFzI39Uq/mdNQrBeI8+lJA547G3LSkbp2c0Swk1YLAyZmH0PIKhFXjpPQQJ+O6Rk27EbODc9u70RCL5rSeA2nfdN18VoW+ojWDexXRkZV9Ytj0f6aRvi9nTjrfAj+rKCpTl0DtE1Dn6K09Qqrc9LEBQCTewXrpzbTjz8Dkb5ShZMHH8ZUV8NbRojddBTo6HXk7txeKd3ZBFYwn293qP21Dub/5wwYBcDKGwd+enRmzGqCmeZ4HqvzJ6LN1AackVCtBB8PcCSaPE3NxlT8FslC9RsL2lCKZY+UuczILkSzD3GBpGoiRZS5K+lLgx5Qu3FjDY7d3r2hZJMVTTRSbhJbjLSBPIbeK4UL8VC9yO0OVWZXMDyKdeP3bKqtwf9nE/yoTSiQCkXcQv9RrdDsycK3zmTpOnQzQZlc6V/xQFnN94mA9sTXi7qUXMFGxVkER13OHBwtK7AQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c22e6502-b59c-463c-026d-08d9df487206 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 14:47:29.5927 (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: VI1PR03MB3088 Subject: [FFmpeg-devel] [PATCH v2 14/31] lavc/qsvdec: switch to the new FIFO 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2nNDQYorCmsK From: Anton Khirnov --- libavcodec/qsvdec.c | 88 ++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 53 deletions(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index d9e0fef1f1..56cd5c86c9 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -56,6 +56,11 @@ static const AVRational mfx_tb = { 1, 90000 }; AV_NOPTS_VALUE : pts_tb.num ? \ av_rescale_q(mfx_pts, mfx_tb, pts_tb) : mfx_pts) +typedef struct QSVAsyncFrame { + mfxSyncPoint *sync; + QSVFrame *frame; +} QSVAsyncFrame; + typedef struct QSVContext { // the session used for decoding mfxSession session; @@ -71,7 +76,7 @@ typedef struct QSVContext { */ QSVFrame *work_frames; - AVFifoBuffer *async_fifo; + AVFifo *async_fifo; int zero_consume_run; int buffered_count; int reinit_flag; @@ -208,16 +213,6 @@ static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession ses return 0; } -static inline unsigned int qsv_fifo_item_size(void) -{ - return sizeof(mfxSyncPoint*) + sizeof(QSVFrame*); -} - -static inline unsigned int qsv_fifo_size(const AVFifoBuffer* fifo) -{ - return av_fifo_size(fifo) / qsv_fifo_item_size(); -} - static int qsv_decode_preinit(AVCodecContext *avctx, QSVContext *q, enum AVPixelFormat pix_fmt, mfxVideoParam *param) { mfxSession session = NULL; @@ -235,7 +230,7 @@ static int qsv_decode_preinit(AVCodecContext *avctx, QSVContext *q, enum AVPixel } if (!q->async_fifo) { - q->async_fifo = av_fifo_alloc(q->async_depth * qsv_fifo_item_size()); + q->async_fifo = av_fifo_alloc2(q->async_depth, sizeof(QSVAsyncFrame), 0); if (!q->async_fifo) return AVERROR(ENOMEM); } @@ -502,7 +497,6 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, AVFrame *frame, int *got_frame, const AVPacket *avpkt) { - QSVFrame *out_frame; mfxFrameSurface1 *insurf; mfxFrameSurface1 *outsurf; mfxSyncPoint *sync; @@ -561,6 +555,7 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, } if (*sync) { + QSVAsyncFrame aframe; QSVFrame *out_frame = find_frame(q, outsurf); if (!out_frame) { @@ -571,35 +566,36 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, } out_frame->queued += 1; - av_fifo_generic_write(q->async_fifo, &out_frame, sizeof(out_frame), NULL); - av_fifo_generic_write(q->async_fifo, &sync, sizeof(sync), NULL); + + aframe = (QSVAsyncFrame){ sync, out_frame }; + av_fifo_write(q->async_fifo, &aframe, 1); } else { av_freep(&sync); } - if ((qsv_fifo_size(q->async_fifo) >= q->async_depth) || - (!avpkt->size && av_fifo_size(q->async_fifo))) { + if ((av_fifo_can_read(q->async_fifo) >= q->async_depth) || + (!avpkt->size && av_fifo_can_read(q->async_fifo))) { + QSVAsyncFrame aframe; AVFrame *src_frame; - av_fifo_generic_read(q->async_fifo, &out_frame, sizeof(out_frame), NULL); - av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL); - out_frame->queued -= 1; + av_fifo_read(q->async_fifo, &aframe, 1); + aframe.frame->queued -= 1; if (avctx->pix_fmt != AV_PIX_FMT_QSV) { do { - ret = MFXVideoCORE_SyncOperation(q->session, *sync, 1000); + ret = MFXVideoCORE_SyncOperation(q->session, *aframe.sync, 1000); } while (ret == MFX_WRN_IN_EXECUTION); } - av_freep(&sync); + av_freep(&aframe.sync); - src_frame = out_frame->frame; + src_frame = aframe.frame->frame; ret = av_frame_ref(frame, src_frame); if (ret < 0) return ret; - outsurf = &out_frame->surface; + outsurf = &aframe.frame->surface; frame->pts = MFX_PTS_TO_PTS(outsurf->Data.TimeStamp, avctx->pkt_timebase); @@ -611,10 +607,10 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, outsurf->Info.PicStruct & MFX_PICSTRUCT_FIELD_TFF; frame->interlaced_frame = !(outsurf->Info.PicStruct & MFX_PICSTRUCT_PROGRESSIVE); - frame->pict_type = ff_qsv_map_pictype(out_frame->dec_info.FrameType); + frame->pict_type = ff_qsv_map_pictype(aframe.frame->dec_info.FrameType); //Key frame is IDR frame is only suitable for H264. For HEVC, IRAPs are key frames. if (avctx->codec_id == AV_CODEC_ID_H264) - frame->key_frame = !!(out_frame->dec_info.FrameType & MFX_FRAMETYPE_IDR); + frame->key_frame = !!(aframe.frame->dec_info.FrameType & MFX_FRAMETYPE_IDR); /* update the surface properties */ if (avctx->pix_fmt == AV_PIX_FMT_QSV) @@ -633,14 +629,11 @@ static void qsv_decode_close_qsvcontext(QSVContext *q) if (q->session) MFXVideoDECODE_Close(q->session); - while (q->async_fifo && av_fifo_size(q->async_fifo)) { - QSVFrame *out_frame; - mfxSyncPoint *sync; - - av_fifo_generic_read(q->async_fifo, &out_frame, sizeof(out_frame), NULL); - av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL); - - av_freep(&sync); + if (q->async_fifo) { + QSVAsyncFrame aframe; + while (av_fifo_read(q->async_fifo, &aframe, 1) >= 0) + av_freep(&aframe.sync); + av_fifo_freep2(&q->async_fifo); } while (cur) { @@ -650,9 +643,6 @@ static void qsv_decode_close_qsvcontext(QSVContext *q) cur = q->work_frames; } - av_fifo_free(q->async_fifo); - q->async_fifo = NULL; - ff_qsv_close_internal_session(&q->internal_qs); av_buffer_unref(&q->frames_ctx.hw_frames_ctx); @@ -734,7 +724,7 @@ typedef struct QSVDecContext { int load_plugin; - AVFifoBuffer *packet_fifo; + AVFifo *packet_fifo; AVPacket buffer_pkt; } QSVDecContext; @@ -742,10 +732,8 @@ typedef struct QSVDecContext { static void qsv_clear_buffers(QSVDecContext *s) { AVPacket pkt; - while (av_fifo_size(s->packet_fifo) >= sizeof(pkt)) { - av_fifo_generic_read(s->packet_fifo, &pkt, sizeof(pkt), NULL); + while (av_fifo_read(s->packet_fifo, &pkt, 1) >= 0) av_packet_unref(&pkt); - } av_packet_unref(&s->buffer_pkt); } @@ -758,7 +746,7 @@ static av_cold int qsv_decode_close(AVCodecContext *avctx) qsv_clear_buffers(s); - av_fifo_free(s->packet_fifo); + av_fifo_freep2(&s->packet_fifo); return 0; } @@ -797,7 +785,8 @@ static av_cold int qsv_decode_init(AVCodecContext *avctx) } s->qsv.orig_pix_fmt = AV_PIX_FMT_NV12; - s->packet_fifo = av_fifo_alloc(sizeof(AVPacket)); + s->packet_fifo = av_fifo_alloc2(1, sizeof(AVPacket), + AV_FIFO_FLAG_AUTO_GROW); if (!s->packet_fifo) { ret = AVERROR(ENOMEM); goto fail; @@ -823,17 +812,10 @@ static int qsv_decode_frame(AVCodecContext *avctx, void *data, if (avpkt->size) { AVPacket input_ref; - if (av_fifo_space(s->packet_fifo) < sizeof(input_ref)) { - ret = av_fifo_realloc2(s->packet_fifo, - av_fifo_size(s->packet_fifo) + sizeof(input_ref)); - if (ret < 0) - return ret; - } - ret = av_packet_ref(&input_ref, avpkt); if (ret < 0) return ret; - av_fifo_generic_write(s->packet_fifo, &input_ref, sizeof(input_ref), NULL); + av_fifo_write(s->packet_fifo, &input_ref, 1); } /* process buffered data */ @@ -841,12 +823,12 @@ static int qsv_decode_frame(AVCodecContext *avctx, void *data, /* prepare the input data */ if (s->buffer_pkt.size <= 0) { /* no more data */ - if (av_fifo_size(s->packet_fifo) < sizeof(AVPacket)) + if (!av_fifo_can_read(s->packet_fifo)) return avpkt->size ? avpkt->size : qsv_process_data(avctx, &s->qsv, frame, got_frame, avpkt); /* in progress of reinit, no read from fifo and keep the buffer_pkt */ if (!s->qsv.reinit_flag) { av_packet_unref(&s->buffer_pkt); - av_fifo_generic_read(s->packet_fifo, &s->buffer_pkt, sizeof(s->buffer_pkt), NULL); + av_fifo_read(s->packet_fifo, &s->buffer_pkt, 1); } }