From patchwork Mon Jan 24 14:46:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33777 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp387608ioh; Mon, 24 Jan 2022 06:49:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwKnSBuQwuKyT38L+rX3uwYjMpF1XTnanrLpdB4z6Ng05uaf8w6Q9WdhxKxUvDPNsaKhwl1 X-Received: by 2002:a17:906:43d3:: with SMTP id j19mr12290168ejn.568.1643035747726; Mon, 24 Jan 2022 06:49:07 -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 og48si7371658ejc.143.2022.01.24.06.49.07; Mon, 24 Jan 2022 06:49:07 -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=oyJm15Om; 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 9A92568B10C; Mon, 24 Jan 2022 16:47:52 +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-vi1eur05olkn2041.outbound.protection.outlook.com [40.92.90.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF1C468B07F for ; Mon, 24 Jan 2022 16:47:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YymLQ9awr1GSv8hQNE2gmt823htRcNV/3OGWoenL+KS/5feYR3oVAJtsx2tqsdJtzVV0IDtGIyjKRXaE+Ow9gRc0NMZl/ZdTjLM3yA5eO9pbqgIg1h3VKd9iQ9jpXC2LFUj06IM+x4pBgHHyoRpndWVOHWbAS8zRm1g5uY5gwD/cWCKsqG2eSqA3gBBI+3KFc8b4oHCQZ3CjtSEtcUAXH6lAF5KkP52MTfJQLCrWNGJehqnL5Hk7JzsyzY3+HFv5LxovrTXq6IlvcSq4XTtoaDeSuojJRLypw8smVEigkDIAFnYdoRsiYy3RcNIKyWMzkhyiGLOlc/+HEtRvhXP4dQ== 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=20wsIC3tFOfC+ybHOKvgdwt6z7gvlW3xwKhbyY9Bryg=; b=KNWnzDFwZhCXCfKRXxk3ZtDBniA/Cgw4fExZbSw4Im9J/Nlre5dlfNJNNyiqJ4QfZbvhEjpEJHLORUoIWzaUs/IOyPoYUUpIEWiyrUH52AbG2dSPDozJXrWhAKzRxv/XhXtMtqVkETJt8Qu0sz3jgxGt/aREXIx7mnfd6hg54lCz56UkXKZ/Qc/OqFovYRclAx2FOq5X1OuJIZxMWHdkedm56dTSztnp8cKi+paHmEy1f036NYP1eOz3+A7NLl+cAIUbA2Upj9TxHgUKxhUeeS83wO6G89d+86vCRnytG/ZhcafgIuB76HznIqy3JNwHqCRTnEbgmAyUSfJGbbSusg== 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=20wsIC3tFOfC+ybHOKvgdwt6z7gvlW3xwKhbyY9Bryg=; b=oyJm15OmC5LrBBjrI5BD9YydWg8ycBZfwdB+4PV7GDqLbZmdK5muV4aKEv5QG4Pfp65RBQYemVgOELnFTj2Gp+0lGqEdqnzCLH3l63pAm+9QuNqLditDR3vW87btUtIIDchEhM9XC3g08rp0QnN427BKrp+exSYEsyDxLVZDneKL96oWdvdKqMcLwcVnd/AMsKfjErXaXJaxdidNSY3cqk8oX2GvjG2/OBf9ywdPHWMbMnEi3TdBcXU929r3alUA1x6IdUdpeC9P3vvsSgWYndYQfOSBT1A6Rqo7RRhdFpNbj2b4m4JsUGzkZLO2rB1DcWA6k3m4XkZnr5dp84p+xw== 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:44 +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:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 15:46:00 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [axTksoLpGVTOuiGBdOnOzhqzyZCaqVvY] 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-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bc86227e-54cd-4a69-0bdb-08d9df487b2b X-MS-TrafficTypeDiagnostic: VI1PR03MB3088:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4RCfUJ0Anop8uJYNP7E4objq8gkzMrrwiZECiw42KDyE/y/V4JNNjZLjQMqkkuW1b2pxdG+wH2XqjksDZSXPW6KOfn9K3DK5lDtGsAkt8+3z5ACtL0yzJS+OQ7v87idopdwuecNPLpbzC2aHQqj5n99N1rOGxqrLuANBcg21iQxHtG3OIV9KJCelg54D/sN4UK6vlE6qqVMG/yVfsVEW7Q5weYg6Y/nAPFFb9p3tnM6Zpvf51v+4Q0H1tEkx8tntnJ3Q16n/EwjCe46TXUnTDcS9yjcHRnjIm+k1VwQyD1mDNnJ60fpS4lgxtSW5GB4h1mIebKSEpcNdtBGi619O0Kx8TC/uu9dHfAF3xta+CbInM0z19GLAILYEbeNQnA9qHDJxx+2ufvdGBSJCU2JxuSTzmNcTXTgp2tgMtp2UIdcfGQPydXpSeyH03aXWfZUUJDaDB/r5NVmlliCjd49X98zKakRBobwcZMTojeo/mLVHKZIIYqUSbH5beFGtlbJiVL9GEGeczwaIrCDMluB1NY6lnts2XNnubYcS+yCBWHkRn38gKkqmMzt33+CVn6NPYAfdVBHTUxuZdP0N+3a7Ag== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K8sE2uu7AXbTM9CAdxBxWeZXxnFdhgbMYfY/PXlHcfDwF5C11ZWc3YYv8XJwvk1dRaF9uXWurfnJa+JIvqtopjIC+n8I4L8xAoRxhaxJywBE/Fnfuw/txtjmQ980Per6knEPMP2RWdtsjIAFCJZqzastHQyYxEBV81scPXCxvqrhFVHQeIEE2oMUAj3BoG7cKKTR0+blFeTc5Q697xmk96W2wla0byfac3rug5qxnOyzoEdeLIB2k5AgKYYPqNSNBihAa2Z1n5QottyF3R90qxJh+Ynxly0XFN5vhUkEEXCTGj7P8dl7opLNmFPxhJqCb2OvYgoJtko3PtTY9oYfdPOx5A8eb8huKRm5KdSh9jQC9eUYBzhNLU5oylmKDBl2oz3ET0h+qBq1D/RyrdI4dVw+nlA7kMRklOReicg2nmuyn42qz1sHSGBWQeLDHPySmI4a4zQ6rwwG4ZdVUwzbxM3/jVag2GB08hv2DIE6o/DXQKPwxDNbvAfA5O6vnANz5WCcLV8NfovGiKbtI9yOKy91VaTwdnzBlbr5Cs0p1rWu6QbsV1X+DvYF7RrcwnA8Dt47CC0Sr2dFjDBMHVnZJ1UC8y/bdu5Jw2YCR+HFmvMG+loXMdHavj7fgH40TRHbvVNVbUu6eJzT6aA6yzrHIGmVja9xQaU0fqMEMnIYttImpi8F2GYyqSPvVfriaQbc/Y+DhbTWHJWyvX7sBrrfrgKGA/+PHQtHl/Vx4dsIrVTuj6BmiFyP24gf0i4P6Y/fNRYmnBCCCdWcHOgf4+ab39LNfAn3ksYC5oslvTVyvy9TGXVxZHQNVxZ+G1CZ+ode3EpXgbMVXHfeC+lJ8TCcNwSs05jSpLG/mRbEaFL2/bgJW+jWLGsjqwmE/FP0RJHxxLUBmvHhc2YeXEs0dRNRCa3pBcWBUzLU0Vk8FUE5Reb/CvjXfvMukefgge43AOgK9oEM6uE5M+DeTALs+x2uwQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc86227e-54cd-4a69-0bdb-08d9df487b2b 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:44.9037 (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 15/31] lavc/qsvenc: switch to 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: twyvYVfITwho From: Anton Khirnov --- libavcodec/qsvenc.c | 126 +++++++++++++++++++------------------------- libavcodec/qsvenc.h | 2 +- 2 files changed, 55 insertions(+), 73 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index acb82f321c..a12f7bce42 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -88,6 +88,12 @@ static const struct profile_names vp9_profiles[] = { #endif }; +typedef struct QSVPacket { + AVPacket pkt; + mfxSyncPoint *sync; + mfxBitstream *bs; +} QSVPacket; + static const char *print_profile(enum AVCodecID codec_id, mfxU16 profile) { const struct profile_names *profiles; @@ -1315,16 +1321,6 @@ static int qsvenc_init_session(AVCodecContext *avctx, QSVEncContext *q) return 0; } -static inline unsigned int qsv_fifo_item_size(void) -{ - return sizeof(AVPacket) + sizeof(mfxSyncPoint*) + sizeof(mfxBitstream*); -} - -static inline unsigned int qsv_fifo_size(const AVFifoBuffer* fifo) -{ - return av_fifo_size(fifo)/qsv_fifo_item_size(); -} - int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) { int iopattern = 0; @@ -1333,7 +1329,7 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) q->param.AsyncDepth = q->async_depth; - q->async_fifo = av_fifo_alloc(q->async_depth * qsv_fifo_item_size()); + q->async_fifo = av_fifo_alloc2(q->async_depth, sizeof(QSVPacket), 0); if (!q->async_fifo) return AVERROR(ENOMEM); @@ -1636,15 +1632,13 @@ static void print_interlace_msg(AVCodecContext *avctx, QSVEncContext *q) static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, const AVFrame *frame) { - AVPacket new_pkt = { 0 }; - mfxBitstream *bs = NULL; + QSVPacket pkt = { { 0 } }; #if QSV_VERSION_ATLEAST(1, 26) mfxExtAVCEncodedFrameInfo *enc_info = NULL; mfxExtBuffer **enc_buf = NULL; #endif mfxFrameSurface1 *surf = NULL; - mfxSyncPoint *sync = NULL; QSVFrame *qsv_frame = NULL; mfxEncodeCtrl* enc_ctrl = NULL; int ret; @@ -1667,17 +1661,17 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, } } - ret = av_new_packet(&new_pkt, q->packet_size); + ret = av_new_packet(&pkt.pkt, q->packet_size); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error allocating the output packet\n"); return ret; } - bs = av_mallocz(sizeof(*bs)); - if (!bs) + pkt.bs = av_mallocz(sizeof(*pkt.bs)); + if (!pkt.bs) goto nomem; - bs->Data = new_pkt.data; - bs->MaxLength = new_pkt.size; + pkt.bs->Data = pkt.pkt.data; + pkt.bs->MaxLength = pkt.pkt.size; #if QSV_VERSION_ATLEAST(1, 26) if (avctx->codec_id == AV_CODEC_ID_H264) { @@ -1687,13 +1681,13 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, enc_info->Header.BufferId = MFX_EXTBUFF_ENCODED_FRAME_INFO; enc_info->Header.BufferSz = sizeof (*enc_info); - bs->NumExtParam = 1; + pkt.bs->NumExtParam = 1; enc_buf = av_mallocz(sizeof(mfxExtBuffer *)); if (!enc_buf) goto nomem; enc_buf[0] = (mfxExtBuffer *)enc_info; - bs->ExtParam = enc_buf; + pkt.bs->ExtParam = enc_buf; } #endif @@ -1701,12 +1695,12 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, q->set_encode_ctrl_cb(avctx, frame, &qsv_frame->enc_ctrl); } - sync = av_mallocz(sizeof(*sync)); - if (!sync) + pkt.sync = av_mallocz(sizeof(*pkt.sync)); + if (!pkt.sync) goto nomem; do { - ret = MFXVideoENCODE_EncodeFrameAsync(q->session, enc_ctrl, surf, bs, sync); + ret = MFXVideoENCODE_EncodeFrameAsync(q->session, enc_ctrl, surf, pkt.bs, pkt.sync); if (ret == MFX_WRN_DEVICE_BUSY) av_usleep(500); } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_WRN_IN_EXECUTION); @@ -1725,15 +1719,13 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, ret = 0; - if (*sync) { - av_fifo_generic_write(q->async_fifo, &new_pkt, sizeof(new_pkt), NULL); - av_fifo_generic_write(q->async_fifo, &sync, sizeof(sync), NULL); - av_fifo_generic_write(q->async_fifo, &bs, sizeof(bs), NULL); + if (*pkt.sync) { + av_fifo_write(q->async_fifo, &pkt, 1); } else { free: - av_freep(&sync); - av_packet_unref(&new_pkt); - av_freep(&bs); + av_freep(&pkt.sync); + av_packet_unref(&pkt.pkt); + av_freep(&pkt.bs); #if QSV_VERSION_ATLEAST(1, 26) if (avctx->codec_id == AV_CODEC_ID_H264) { av_freep(&enc_info); @@ -1757,60 +1749,56 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, if (ret < 0) return ret; - if ((qsv_fifo_size(q->async_fifo) >= q->async_depth) || - (!frame && av_fifo_size(q->async_fifo))) { - AVPacket new_pkt; - mfxBitstream *bs; - mfxSyncPoint *sync; + if ((av_fifo_can_read(q->async_fifo) >= q->async_depth) || + (!frame && av_fifo_can_read(q->async_fifo))) { + QSVPacket qpkt; #if QSV_VERSION_ATLEAST(1, 26) mfxExtAVCEncodedFrameInfo *enc_info; mfxExtBuffer **enc_buf; #endif enum AVPictureType pict_type; - av_fifo_generic_read(q->async_fifo, &new_pkt, sizeof(new_pkt), NULL); - av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL); - av_fifo_generic_read(q->async_fifo, &bs, sizeof(bs), NULL); + av_fifo_read(q->async_fifo, &qpkt, 1); do { - ret = MFXVideoCORE_SyncOperation(q->session, *sync, 1000); + ret = MFXVideoCORE_SyncOperation(q->session, *qpkt.sync, 1000); } while (ret == MFX_WRN_IN_EXECUTION); - new_pkt.dts = av_rescale_q(bs->DecodeTimeStamp, (AVRational){1, 90000}, avctx->time_base); - new_pkt.pts = av_rescale_q(bs->TimeStamp, (AVRational){1, 90000}, avctx->time_base); - new_pkt.size = bs->DataLength; + qpkt.pkt.dts = av_rescale_q(qpkt.bs->DecodeTimeStamp, (AVRational){1, 90000}, avctx->time_base); + qpkt.pkt.pts = av_rescale_q(qpkt.bs->TimeStamp, (AVRational){1, 90000}, avctx->time_base); + qpkt.pkt.size = qpkt.bs->DataLength; - if (bs->FrameType & MFX_FRAMETYPE_IDR || bs->FrameType & MFX_FRAMETYPE_xIDR) { - new_pkt.flags |= AV_PKT_FLAG_KEY; + if (qpkt.bs->FrameType & MFX_FRAMETYPE_IDR || qpkt.bs->FrameType & MFX_FRAMETYPE_xIDR) { + qpkt.pkt.flags |= AV_PKT_FLAG_KEY; pict_type = AV_PICTURE_TYPE_I; - } else if (bs->FrameType & MFX_FRAMETYPE_I || bs->FrameType & MFX_FRAMETYPE_xI) + } else if (qpkt.bs->FrameType & MFX_FRAMETYPE_I || qpkt.bs->FrameType & MFX_FRAMETYPE_xI) pict_type = AV_PICTURE_TYPE_I; - else if (bs->FrameType & MFX_FRAMETYPE_P || bs->FrameType & MFX_FRAMETYPE_xP) + else if (qpkt.bs->FrameType & MFX_FRAMETYPE_P || qpkt.bs->FrameType & MFX_FRAMETYPE_xP) pict_type = AV_PICTURE_TYPE_P; - else if (bs->FrameType & MFX_FRAMETYPE_B || bs->FrameType & MFX_FRAMETYPE_xB) + else if (qpkt.bs->FrameType & MFX_FRAMETYPE_B || qpkt.bs->FrameType & MFX_FRAMETYPE_xB) pict_type = AV_PICTURE_TYPE_B; - else if (bs->FrameType == MFX_FRAMETYPE_UNKNOWN) { + else if (qpkt.bs->FrameType == MFX_FRAMETYPE_UNKNOWN) { pict_type = AV_PICTURE_TYPE_NONE; av_log(avctx, AV_LOG_WARNING, "Unknown FrameType, set pict_type to AV_PICTURE_TYPE_NONE.\n"); } else { - av_log(avctx, AV_LOG_ERROR, "Invalid FrameType:%d.\n", bs->FrameType); + av_log(avctx, AV_LOG_ERROR, "Invalid FrameType:%d.\n", qpkt.bs->FrameType); return AVERROR_INVALIDDATA; } #if QSV_VERSION_ATLEAST(1, 26) if (avctx->codec_id == AV_CODEC_ID_H264) { - enc_buf = bs->ExtParam; - enc_info = (mfxExtAVCEncodedFrameInfo *)(*bs->ExtParam); - ff_side_data_set_encoder_stats(&new_pkt, + enc_buf = qpkt.bs->ExtParam; + enc_info = (mfxExtAVCEncodedFrameInfo *)(*enc_buf); + ff_side_data_set_encoder_stats(&qpkt.pkt, enc_info->QP * FF_QP2LAMBDA, NULL, 0, pict_type); av_freep(&enc_info); av_freep(&enc_buf); } #endif - av_freep(&bs); - av_freep(&sync); + av_freep(&qpkt.bs); + av_freep(&qpkt.sync); - av_packet_move_ref(pkt, &new_pkt); + av_packet_move_ref(pkt, &qpkt.pkt); *got_packet = 1; } @@ -1840,29 +1828,23 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q) cur = q->work_frames; } - while (q->async_fifo && av_fifo_size(q->async_fifo)) { - AVPacket pkt; - mfxSyncPoint *sync; - mfxBitstream *bs; - - av_fifo_generic_read(q->async_fifo, &pkt, sizeof(pkt), NULL); - av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL); - av_fifo_generic_read(q->async_fifo, &bs, sizeof(bs), NULL); - + if (q->async_fifo) { + QSVPacket pkt; + while (av_fifo_read(q->async_fifo, &pkt, 1) >= 0) { #if QSV_VERSION_ATLEAST(1, 26) if (avctx->codec_id == AV_CODEC_ID_H264) { - mfxExtBuffer **enc_buf = bs->ExtParam; - mfxExtAVCEncodedFrameInfo *enc_info = (mfxExtAVCEncodedFrameInfo *)(*bs->ExtParam); + mfxExtBuffer **enc_buf = pkt.bs->ExtParam; + mfxExtAVCEncodedFrameInfo *enc_info = (mfxExtAVCEncodedFrameInfo *)(*enc_buf); av_freep(&enc_info); av_freep(&enc_buf); } #endif - av_freep(&sync); - av_freep(&bs); - av_packet_unref(&pkt); + av_freep(&pkt.sync); + av_freep(&pkt.bs); + av_packet_unref(&pkt.pkt); + } + av_fifo_freep2(&q->async_fifo); } - av_fifo_free(q->async_fifo); - q->async_fifo = NULL; av_freep(&q->opaque_surfaces); av_buffer_unref(&q->opaque_alloc_buf); diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 65f035045c..fb278b8829 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -150,7 +150,7 @@ typedef struct QSVEncContext { mfxExtBuffer **extparam; - AVFifoBuffer *async_fifo; + AVFifo *async_fifo; QSVFramesContext frames_ctx;