From patchwork Mon Nov 29 18:51:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31797 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp6577951iob; Mon, 29 Nov 2021 10:52:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJx8uajEkUgqoAa3PpXF936dB83gcoWeg+VzU9xI65EQEHAfkOgSBECZv340Kp4Kt/1u8G2n X-Received: by 2002:a50:fe8e:: with SMTP id d14mr78496580edt.51.1638211974862; Mon, 29 Nov 2021 10:52:54 -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 ds11si34193869ejc.465.2021.11.29.10.52.54; Mon, 29 Nov 2021 10:52:54 -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=@hotmail.com header.s=selector1 header.b=oHGawVXg; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B6A068AD8B; Mon, 29 Nov 2021 20:52:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2036.outbound.protection.outlook.com [40.92.19.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A171568AC54 for ; Mon, 29 Nov 2021 20:52:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hGZKrvLE/wuGr4RuO6W2XEe3zdeKRoERDlDAe7xRF+VGxSWPuNMESiDNbbSmkUgDc/ssz7P6j3AyxqhKSobuvkepSAYjToS+VgL8isQ8Ipie6d+Dq0NJfgm3PvgDAvKYGntYKrxO2ah8W2sVqzNNVrm9aB9qvT9UVQ7CoguTUxldvoSp4qosq1wrunjqiEjgArcvSCjUqCfn6VGhYyquPHRXHxoyWroJYGHl91oqA7XEfkjEza2goR+RQiWLnAZpj2sgP+z0QroQeW/Z2dByfxqjscxtuDC/v6jLPnlcaPooknAeAyA4uNbbeb+JWPEWgMkoI+m4Jn41k9p2NyXpmQ== 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=BTjQeTHV4cgMrm7wvB44U9bcq5qtHzDXtIjO63eeYV4=; b=J5ROPXKV7A5orxy4zpM0dczKfpk1aqgiy17qTwSBa1NiCH20OwwEliWbmxYkI49y0AcLJjfgbBJgRJ5F7Ii5oV8IZFtnU5AcN1aie+UXxRn7OZJtgTeimu68sT7zUOxE6oIvcjN6VHg0tHIlbXQ/PVdSTb7bArr5950S845j0uTUBehfscqYLtnvQVJhukZhqfxa6ajTORQtrMpCW61yNQZqbjy1Cp7go9gvX4ueIZrmCl/4HHLtoPcUxdccVhHzPuzyUo4IbszUwXMLYnfy1EHCT+/717TNEicgYsfBcFepDfBPDkby6ZfEu9+l3pzPefPIIiZguGmQD5rtFWGMhA== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BTjQeTHV4cgMrm7wvB44U9bcq5qtHzDXtIjO63eeYV4=; b=oHGawVXgs3zJfQlg/HXRJ13gNDB6AGjOTdQwiz+bVToBC000x/NJ7Phk614YBk+Zc+vFYlfm5rD/oWYcL/LeDLU2zsRRsn1meSX7ayZeUo3e2hZbVUeENtDkaR2C+5nIphlvFZefAkGntIdmEd3WSRymVDLoddXl4zdBmpdVF3LWPFFgB0EiaMqj5CQNv6JSY2qPKXaD8wgKbODosxQGcKg1dn/WWl4LdshtGpBf1Ki3dMiJ5fdYjA0dzRAv3uA3isN6SGU6tEtypz/H71SdZNm1e93SB7Ag1qJWuB9LyLW2DvtGBGjB1GyOWbkE2VQcPDpeBUDXovMXxlcxZgBswg== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0125.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Mon, 29 Nov 2021 18:51:56 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%5]) with mapi id 15.20.4734.024; Mon, 29 Nov 2021 18:51:56 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 5/5] avcodec/qsvenc: Ensure payload array is initialized when using enc_ctrl Thread-Index: AQHX5VIul1eYTmqHu0elON/QOnDO5A== Date: Mon, 29 Nov 2021 18:51:56 +0000 Message-ID: References: <62b3a721e463650b46e527abcc9169ec1cc3e9f8.1638210102.git.softworkz@hotmail.com> <2362f84d0e53c691dbf248743c6640c91d83a491.1638210102.git.softworkz@hotmail.com> <5a3b242f9bedd7453a810eae1edf78918726d12c.1638210102.git.softworkz@hotmail.com> <65b666e63e9e2f53a526964e9eb4963df018c6f0.1638210102.git.softworkz@hotmail.com> In-Reply-To: <65b666e63e9e2f53a526964e9eb4963df018c6f0.1638210102.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [k7EGwmgY7o7Oz4sfIrDuaWnRsVSh8k4P] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 07a6333e-f3f3-4917-9236-08d9b3695166 x-ms-traffictypediagnostic: DM8P223MB0125: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: +e0e9ZukZ7KUiKX89VON64LXJb7XOLMrKbgXkJ1BfjPNkxUT6VjaZIAT3bOcggTGppeskURtO2yaQgm3vYjh45NBQnzH18HNDCbRz4EC0kLPTNtg10jdOI/q9kZcjfmYRPHS5TpnD2oblg+jK/PFdeARUblsymeu/PrRml5ccHZ5vdvzdspHjgO7IpcxO6DHiIoygMtONoRV+EoNZmWOCB4K0BlLbPgQvm8P7ytxkS8KiWwpvTf2+lsyjlOPWtFjGHw+986aDnrWpfUiVMbqMngykpZrVXx1ztpw7zetrfapG7QWQsaBr0MmyM6FYqY2a0Y1BZXso17KmPXJBRTReWNjwlWl9JeTHSs2OC78wPUy6aVsrUCnmesz7J9nOxjz1dDPJ3mSy1OvLxbQS46T4dcoOdYlxps+48qAiQukGGLYsXGn8uaFoui2Gy6XSadt7PFVkcGtWFql8LreHG2j5qnwGVvJ27JNIWdh9quPMheN1u4lmjQgVySbthfhPLCTXB8jiOte1gfbCxA/SX4GnTmO+jGE4vxctgn8A93fYLld0dBC0lxh5J4MIEb2jo1kvoyIt4OCjjHQSIT/5rbdew== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: TbKRwYNqs6ltJ7udgLVBF7V9IimrkZwL/9rUmbT0jmSUSLTa/KSegjelqZpDeO1y9SDsLLFFtHPiWIVJh4g9E5m7VHquW+QajhIkL7d6E7rdB8KRd2I5dM3MxOui3AzQ2YqkHP1qwKrU+0QhXWQpZ5yWCMnpFBSnLEYgxOblC4gEqioU9FQa47a6VRthcHRtS59qg3gUEglcFO9iFfmkBXYM+icCLli3dUw2K7nqYhSrBzaoz0YFaMjiquCJNTebQNbIyNsMfQGoDJfLA2qZM7UZKFgGLjkFBREsarY3nXvwX5AOW0Q99Et6pBWzPFJnQwm6yjB0pguhVZwpr3nzVzyWTtXu8WX6ciWgt6taD+0Ro1JYnICfthVgcNr6Mosofq9KdQibK9Yzv+XQHpwNQyV/lzu7+muPENpy16T7NObKozwXThfeeqkk5ZzS1kEBbjt3pmVblz2xyL0Vh3b9YBUi+aWpD/2OjumAIT+HVUBPhMht0+j3mD2/tHkQ9hCbOB+dQvmuiPwyc+hzfcVkHpVnzaZJqNeU4+ZF0WcntvuZSxNlX/Qyp0RG+uEIKZfs1WJIGHRhi340nRHnhWMaKOF1kR36Eu/Um+N+Dp/8+r9zZNEnPbRIHft//Iq8MrDC7Z50beAdlsBCdDeuyhrCvGeOLdWfiBazgGBLRnJTUQir6qRQ9AEqr+i6dsQ/VOwyvE5MWhrdn3A3sjxGx7QK7w== MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3912-16-msonline-outlook-1fc6d.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 07a6333e-f3f3-4917-9236-08d9b3695166 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2021 18:51:56.7951 (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: DM8P223MB0125 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/qsvenc: Ensure payload array is initialized when using enc_ctrl 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iajFbBYw9NWF Signed-off-by: softworkz --- libavcodec/qsvenc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 06f55604b5..2c3b22e5f7 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1477,7 +1477,16 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, } #endif - if (q->set_encode_ctrl_cb) { + if (q->set_encode_ctrl_cb && qsv_frame) { + + if (!qsv_frame->enc_ctrl.Payload) { + qsv_frame->enc_ctrl.Payload = av_mallocz(sizeof(mfxPayload*) * QSV_MAX_ENC_PAYLOAD); + if (!qsv_frame->enc_ctrl.Payload) { + av_freep(&frame); + return AVERROR(ENOMEM); + } + } + q->set_encode_ctrl_cb(avctx, frame, &qsv_frame->enc_ctrl); }