From patchwork Sun Sep 26 06:40:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30582 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3046462iob; Sat, 25 Sep 2021 23:40:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQKxTtGNn5ERV50Wmgk92tozgBV/75qXZIA7XnPAArBrYboeNk4VlU4nPCufxSiEn4Y0mm X-Received: by 2002:a17:906:9747:: with SMTP id o7mr20461558ejy.486.1632638455858; Sat, 25 Sep 2021 23:40:55 -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 m9si16774823ejj.143.2021.09.25.23.40.55; Sat, 25 Sep 2021 23:40:55 -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=imnLjrsT; 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 0CEEB68A936; Sun, 26 Sep 2021 09:40:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070041.outbound.protection.outlook.com [40.92.70.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71F8B68A923 for ; Sun, 26 Sep 2021 09:40:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mPx17ljEyGcoK/2aYD8VJ/eVMdOThVjGMJayzFbTfnpOhl4h5ZuAAiCEMqoQBJ1Vmvq7qZiigB5zIyc5EFyXnCRZkPQ6gLy/37uaPNjnKCq24GMTsgNUvwnp7Zbk/zg4csGCiEENT3tTJbDsW2ziCoKhctM959C97NWDpZTvL7lc5GEl2CKxiYYr5fI2NfalvzF4t1JWPAjN9xQTb2pNGp6zl6AcISTUFMGMmsjw4oxtcdKb2lsHPsndMeUDU5hPRlPqj5S6d777/ko4ybX0n07QBBZleyPy6CUMhB76wAk+llvkmZVs+CXsjsojWBg1Ne7Mgk96Xrn88YQqRVbphg== 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; bh=4IwQNttlcj/j/tjbVgXzEHfvzK64SfzFgJBggOefItM=; b=JYqPHBU9mGu4EshqrDqHQST99S0EojEcoyUTSCw8j3/2m2hYhZuyDl2N6eCABo/DNQCnLlr+Q7JXM6XX9kaFuLYcjYmQOM7BjF8Q6fYE2GfKsuC/0zwU+4AfKWIpcUAkgqdrBlWfRpUN7diAWCnDGLO6pB3uoZNNqqvnnTsCwwXCSa3e/FBPG3gEi3W7gaSVY35NqV9gWsnUDbyC7PhvTBsG36Fzo86n/snll7MIu7e6HQPCcM6PINWDGKXAwf5KkFbHdhMpWFryxEct6NkHfMWs62rqE878F6In+R1yhR4m2wehDIJ+hVt9sPIf5ZcTFu1/I0FAsTypaLE670FwUw== 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=4IwQNttlcj/j/tjbVgXzEHfvzK64SfzFgJBggOefItM=; b=imnLjrsTXErxxd51Xi1UegvD+agrfRiA1HCMQ7SIgfGs6t9+dHhyXbZl5pY7Z/vyGa7RS1wj9ELTG370s1O0Ta8v3ZnD7RJPjOXmANIb78yYu0M/XwcxAjYRd7mubeAPE77WXhfXhdLzBrn1QjtfTEIRf8G1lI1DcFzqbog7G8HhD74K0YgDd2YsgDhhmxUhV3p9WJG9ArDaHhzVo8kFTf3NBN2e0Lf9Uvyu77jf8JWQlH2wYqZ/CoT7tf5K7xOXYRITnZP52TZPn/SKy2Y225XjEGsBUYQZ9xzXmARin4lY+WquOcXjgCjE3p1qcqfp6nNiMpxXSFK+cL2LYQZqqQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3768.eurprd03.prod.outlook.com (2603:10a6:209:37::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.16; Sun, 26 Sep 2021 06:40:44 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4544.021; Sun, 26 Sep 2021 06:40:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Sep 2021 08:40:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [3UegiZa3ZrHaNzGArjkf6kDaQKNKgCLo] X-ClientProxiedBy: AM4PR0302CA0010.eurprd03.prod.outlook.com (2603:10a6:205:2::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210926064027.344398-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0302CA0010.eurprd03.prod.outlook.com (2603:10a6:205:2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.14 via Frontend Transport; Sun, 26 Sep 2021 06:40:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: afca4de4-b2dc-4a67-9d1d-08d980b890c6 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIAJF/k4bgfswNNO8o0J1y91aBk+L/y6h+6Rj/skk2rbdQglmIQmQT215XUMK3f9BrFMF6mFCvmNcAvYEdK4O5LaR/AbymojYldmvmG3nvuBmHtnqu4p6PW1HJ6pPkXoG14Rb4jCIzbQK3s+UxDYwLe7/bAQHQf41Q3ZxePIiIbIJtt1wAVfnWlzl3Qetuum+OkEhU6xOHX5XowjpXRgBxfip0Dur3In0luhU12MFZkCP4Q3eF0jBAkRqb1azOKkcuKWWUBXmFeX0PEG6pMz/xI9llAEVJdEa/E+KGKUQEfqwN9paBPTlsIiHCwD+7TizvktsU8TjOl1mF46cpBMW9mMrFhoWhej6X3NX70w8fHMmYPvRRXoSFIYt8SrbZdVCl2zYC6w5+pHxR8rW+ZdfiyTez04FRdDmmHNi8QgkavvI9vHYo6WtImD5FgD4Ba/KRoZ9wS8BKMVsNhg2jX/5kWB12KeUb61pRDZzQIk/s3mAFTs1hY8Ntt6/DIEDOPwm8DtN3/Zmjdf0lD3GdTA1/xgU1FzgpHJXcQ8yESnVnmfXLz1uJ+UnKWg+afEJVybDPGExWQaOOuCyAKPlQy7sXgAJdtD4flvobql4fbxvENOzuh3bKbKs6kaNPbz1hmhqi2cch/IGOdNCLmmcmIc2Y5peUQU6rU/Nn9y28KCyvGB5A+4GNpDHO8/w4UtZOTG3a8Ev6PEWGnJg== X-MS-TrafficTypeDiagnostic: AM6PR03MB3768: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HK/f/uHwzts8oJsKcGzbAyX8eZYVViyT5666aiLCKMgDBTb4UXiOAR8OKcLPhuMQ6tUnJ+B6Flg71oQqkTEQ2MndQLCnjAPiYCx8zyc966PKxGb72hU4z7Wkffd1SM8mpnsVmUulGZZtc0LYyevE1b6/O/phFYZTVBcI0KM5t/wchMOKi8uOYgknom3QAO71sPzjcCo5opU+Dvqp/m9EMueY0Wp+IB1ByYX5qFzDQjvKuMhEkExn4m2wvru8Vrxkr8fK5k+K9SvSVh7GEXSLDnNGk0a10euneypZJOLoaXMq2QJzHupH5klNpzYJdvKE43DJ+FmTWqpO6MLEvjG6laAE/ENS+LlTD0QH6xe05CD+aT7NDWy/r6ktB6fM9FeIG1gZa5pOWb1A5ZWkD2fAzGYGagePr3zWYftMSG9FcxFO1aZvb6G6j/xYjl1R+5Sw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Q+QOOuh8tykJEPpOfTXDGUSmdDLf3OSWIrT3dJZnlhe2FP1f4Qk1r0vfQA/jcPHTdLagl5rEZj0g//rXLyQYT3uiUa8MczovE4D0JgK1ws4THuhtovSgPgZAH5zKyxjUA18BBtuHqHuGNz1fCCfewA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: afca4de4-b2dc-4a67-9d1d-08d980b890c6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2021 06:40:44.2840 (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: AM6PR03MB3768 Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/qsvenc: Properly flush the FIFO on close 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: EOMab1WqBHBw Freeing the new H.264 specific fields has been forgotten. (This leak only appears in case the encoder has not been completely drained.) Signed-off-by: Andreas Rheinhardt --- libavcodec/qsvenc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index e5d09752cb..26a94cd419 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1626,6 +1626,14 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q) av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL); av_fifo_generic_read(q->async_fifo, &bs, sizeof(bs), NULL); +#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); + av_freep(&enc_info); + av_freep(&enc_buf); + } +#endif av_freep(&sync); av_freep(&bs); av_packet_unref(&pkt);