From patchwork Tue Apr 12 19:23:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35292 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1749896pzh; Tue, 12 Apr 2022 12:23:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEq/odhPDEbEuMaVQ6MAkwzrzNOKFOSNqYI2NjhrP7MupE1lwk/YidFx5fVwPwaiSKsgkj X-Received: by 2002:a50:fa90:0:b0:41d:8c32:838 with SMTP id w16-20020a50fa90000000b0041d8c320838mr6836975edr.140.1649791437966; Tue, 12 Apr 2022 12:23:57 -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 s14-20020a056402520e00b0041d7b087506si203450edd.91.2022.04.12.12.23.57; Tue, 12 Apr 2022 12:23:57 -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=QZ4PtHXh; 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 F238868B39E; Tue, 12 Apr 2022 22:23:53 +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-oln040092070055.outbound.protection.outlook.com [40.92.70.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA14D68B39E for ; Tue, 12 Apr 2022 22:23:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N93BZf+e/u4ViavVVipWNI7IgrslPsX+yp9D0ZX4ifIToF6OHpZLjIb/1BG7pfb0NX8DGJytMxuykKaI00x+HdUWbOuaN+SFQ23PqIhoCXOBmVj7iJBlBENrk9Bg1ShzqtfhVn7HMWDBSOVvirBEHqk1i7j28C5avorvWSHHDHdyEsnXXg9kC9fHDZq99g37kACurI6X/pnRvMEf6o6Ala1DfxuKo8aMi2mpyy4ywKjD021ZebtdhRiizPWxcs8kHzgRVZPASdx6R3QXbCvdvKs+xyJQV59znUZtjyAeeXx2945prnhMCE2nbGyz7niynQEewc6w8TnxCBbfWjxamA== 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=C+A2/UQaJh2EJKw5a9WxtdW9ea0m9njXRTdp70y1HD8=; b=T6rYCJQozbNyfAzN1To46Mk7egf6DkTOR+ZDN/KxPRPx45ZkwkAx054YdFcnRlKpoUvdfRJJfyaTiX5mV+b2sgkuG8fEOeUG14cZQLiuu4Tjxcjs5rA03+S97PT7l1edqNxMDx45zPk8LrWj1JZvGnx6ibBY2WmU3q19AGMG62epfHll3Ri4CHQdS3v/QU1V3tnXJX6MZFJmmPSuHQwpKfvgoPMfyNx/Vqzh2cFES7WxpeNNofEdB0Khx7iBlR70fhvoW3GeQVvx5RHyQM81EFJMBH2bTQLvrS747s/ratuMKk/5S295vW36KXaL8TCAd/+I9c0BfftvtRDj7EofLA== 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=C+A2/UQaJh2EJKw5a9WxtdW9ea0m9njXRTdp70y1HD8=; b=QZ4PtHXhOptgJfY7DRBDZE7yBP57cI/YqynCdClo3YrOurS47jZSWfCAv9SxgDRq2e5LP0wnUEHznyk3T6B2+O1X/ydZkTBmrX5TWsEakZqDUJp+jKtiIYHYZm8VFtaphsw0c0GuYGhqNc4LRRtCRFXOZEcKT/G6e0l8o3DbjUjbF0ls8uXpc658DUThqUAPo02lxOHAGLtADqHXPoa59Q2QWpFFjcI7BurKb1bGsLbRhKEQ+nQKW0JCukkGDnaIwWw7gKTPBCcznMEol2BrmhmeogulR+HtmW6qkmI557FPjm8r9YdpH8ok0RBlz5siyz7mmZIQ2M4/Be82CzQ4NQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB6PR0101MB2230.eurprd01.prod.exchangelabs.com (2603:10a6:4:44::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.30; Tue, 12 Apr 2022 19:23:45 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2%5]) with mapi id 15.20.5164.020; Tue, 12 Apr 2022 19:23:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 21:23:32 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [EFaWEOQTaAdbaNQ+DwO+dY8MYZkTPay/] X-ClientProxiedBy: ZR0P278CA0198.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::12) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220412192336.750669-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c654ec55-c841-4d8a-fe81-08da1cb9f587 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTONvFbsB6nRbYK9Q9ndC83/FE/BKCKYYqJff0GrwlPlE9mvtZkGMuulA5SQrUr20+BIMsNwjf0F9moFg3q8B2cifEy9unTmwUaHsViWshkmTeYjonb9pwvp+BsLdY1mnyLHWWweUOD+xpVIrrkOf5hjKNowPm4iFfNn7XtwHt2+4BSdOdnCIV6F+1O5RySRpZ2y+kO+cf20GlE5z5gLjSFzycjEA9A0D/Djr0ufqCjb/dxYsd5FgfYgInTzIL5lGIdwbUVEMYmnxVzjG3ruWdvAJ+aVlnpsshFitauG2CGfqI8gyAbYTsh3Z7gN+QoC60WHy8tQfwi4teUjD/Kd55g1leJlFkvsr0d9+DVIpD74Bf/3w0ewijhKDKKbGe82J5pSi6Jof7/UH4UxPNo96QldHuajT4AY/L7hzOKoxLDx1/2EiTzoJN0jt1WEoYc+ZzFi7g5RwPTOLwT8TjUkkIL+EACF9MWV9SvXLNB3pqH1JB3lmRV9v8RYS2tD9PA5fuJcxkmmWlH8h4J8P9XKj0addcjZkU1Q8Una7W5AOvrHoGhzW0mpJ1iAIOH2p4W10Srv8Bqnel04X+91DiqwUFxetp2b3R7z5M+8qvdwvj3ARAm1MbOpilzCCeteiSu7wRZC8oA4i0jUSzMNbqdfNqI0+VFVt6f4iZPrWmGkLyufwQ+Ki6XLP4v/tVYwdk1CFWqUgLf12un1KJJm7lRDFNUNftCDd9dC5ONucpks1ZQZqEV11JTu8/tjZSX8U9JNnA= X-MS-TrafficTypeDiagnostic: DB6PR0101MB2230:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NkdPfg+zpWB+xTUJviTXqTy8/D/tGKdPjYac4lD1ztDmnRfvRbQzmA4nVz1LS24XALdnmFXthnu1QxMo78FRc0mqdmcV/LmOKkwr31DT9DGdWCcA+vw5wmh5EW+AAfZMs2ex1b7IHu2RcHLAn43biSiho0pb/0Dw6jhLeI8ICQMd9SKOthh9huHy0Khy/a6ipB1WZ6VaVNPpJvasckqcsCega61sJDDQIQM/hA45EKJaTPmCcCRhfUJZCHDf2BlT8cJcaGQ7TFCdTt0SqupwJFszQ85hv71vNnx/4hcMk/zgw64LnMTjpz6HVasG1OvZyVHtMXpatmwfB2h4Xo5u9aSl6PHp20B2FlY7gw+h4aQk2f3nqH8362PgBKz7WpSWaCqNH0ynXRA/tL4rU35CUK1EJNLj/5CeHXZJRrp56vOb5NMA4fwuQAnyw3cpPsq1gwlRapfWM0lYQw3r61ZO7fxAaY1zL5oOYZhwNRmAcuKlNdsnvLiW5i6s9sXPz3Nzfd174cKEepnAiO67oUYzTffr7kTh+6+D7RaiHAnDZr6QylnA9wzcQYm8JEmOsGbSmHnTS2cHkxGbrnh+84dGqw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vhuSUhGrVgcbCPyT7Mr0lO8Js7X6elytmogy+TWa+vGZtOHf0iGSt4DEm0/gVr6gPA94Wpxfwnoa9nblwOucIRKpIKeDR0V8z8fr/TshDOVo0LX2B0r62bvz0p5gyRFzYyf+LfMFuxKRqvSB+hNuaENGB4+rgU5LzG1pwwfYBIUMmbI3AdSVdALgmF+0GAPOg1JnTp5v8P5nNw3bl8QfAQk6BD/8mYlN6hQ7g0yEinod452Xxx224NhjHfBe/cNb07H84x0+r1+hWJgpbgQc12IrGDvl7I+5w/8aLDY4HlVcdkuNJ0IGPuKl/ymeY6lqgAlXh7EiJ7YfQDjRc8pGMfD8PgOOjpCUQ2LWZNXgZyBsB+lPXDgEFKr26bu8oiNTjWInoII/Bu3f0k9/jHUaddqHdxsA8TCFBnmVVjlHARJmoB7mD3xHK7gRWjH0jq32MxauKpCGlSoqZMpCowgyXaGyeM1LqOMOxn4nDQ2eqzkxWwQku+Z8BHpgQc8lbNHp68RtVbFpG/hKTQbDToQQtmrGmm/WEBKvB4G34+kKzI+qJx0DAwER5qSU13ZyLWwVvGA8axlGl7MVu54feNdWi7jbUP1QqcyHEjhV4FOb2AtPdsYaUITYhHX4nvlAfJeK71GbdENxEulvlzRMOufgBhgVmd4so3AeOiuRcDiIlGHftb+6FVwfKkXcZ5ixDI50nlsoKhDDMmKjzWXkMpNNKreJdRXEDGMpX1evK55KVm7qWXEi5f1w2TMBTfTHe5df4S6YX9nLeawX4t57m5D2DBkuOZNNlvWKy7PVGFd+h3JdwTTeRwhJtrmcEizaap5sjr8yGpFPg/x3otyP9mBONTl0XeNaJIQFEL367pUMXnCKv3BQVwG1DOlnfxdZKsRscEoIJUSab+fXppGBmF/k7jhl64s3IrFDeJ71rwOEIDmNjSFa/nz2RZdY45dAshoI7STB2PDTBYb2or3U8z1EwWkHeHW59QrEnf424vhZ+3PxlZ0Y2RAJalc5NQCuLqE22uLaLNjJMSx6PSjkpji+LZ1G1IozcsVz3O0Y9sr0NTeYfip+R7ARxVYGJDNm8VBYCHLLtJFEDHO5BGm0HVpxJ8o0qV9yOjaGh/D/dDhJ77kvAaK8Bi5YsVoUf51WSqGXY/f+7U9LR3WOI+VdDAeIFr2TcalEJk44RdzL2moHFcO9O6lPy/Xkweg/QXZPQI75B7q1y7OQ3lNwAOVMN/LhdBEH5Zvblob4duBD5EE3xC3tNjcJGphRA4L4HpRoTiH44Le5AvGbBdfNXFSVel88W6E9AQuiGWHt7D6RgpJIVF0CHAf/qzbJnVPaJDkaD4daEgbXPF8rAtb7a2UaXMJNTskieik1Aw5LlbLbey+D78Tiv+DCoM7toinH5IQdNIZUEOdZD3xxur3dF/xtivYRPUkCv4h009xmaDf6QRSRUeyeuSBqbAf4V9XfbtS85Fu7 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c654ec55-c841-4d8a-fe81-08da1cb9f587 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2022 19:23:45.2702 (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: DB6PR0101MB2230 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/vbn(dec|enc): Remove empty close function 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: DCShWL7TNGXG Signed-off-by: Andreas Rheinhardt --- libavcodec/vbndec.c | 6 ------ libavcodec/vbnenc.c | 6 ------ 2 files changed, 12 deletions(-) diff --git a/libavcodec/vbndec.c b/libavcodec/vbndec.c index d6f8121e12..916421925d 100644 --- a/libavcodec/vbndec.c +++ b/libavcodec/vbndec.c @@ -176,11 +176,6 @@ out: return ret; } -static av_cold int vbn_close(AVCodecContext *avctx) -{ - return 0; -} - const FFCodec ff_vbn_decoder = { .p.name = "vbn", .p.long_name = NULL_IF_CONFIG_SMALL("Vizrt Binary Image"), @@ -188,7 +183,6 @@ const FFCodec ff_vbn_decoder = { .p.id = AV_CODEC_ID_VBN, .init = vbn_init, FF_CODEC_DECODE_CB(vbn_decode_frame), - .close = vbn_close, .priv_data_size = sizeof(VBNContext), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE diff --git a/libavcodec/vbnenc.c b/libavcodec/vbnenc.c index 5c855bcd73..0b2c4dced2 100644 --- a/libavcodec/vbnenc.c +++ b/libavcodec/vbnenc.c @@ -132,11 +132,6 @@ static av_cold int vbn_init(AVCodecContext *avctx) return 0; } -static av_cold int vbn_close(AVCodecContext *avctx) -{ - return 0; -} - #define OFFSET(x) offsetof(VBNContext, x) #define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { @@ -163,7 +158,6 @@ const FFCodec ff_vbn_encoder = { .p.priv_class = &vbnenc_class, .init = vbn_init, FF_CODEC_ENCODE_CB(vbn_encode), - .close = vbn_close, .priv_data_size = sizeof(VBNContext), .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE, From patchwork Tue Apr 12 19:25:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35293 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1750537pzh; Tue, 12 Apr 2022 12:25:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx48YsykCGakUyx8FDvolhhdqvuMop0bsRvI7SpOD7+I0zTbrsAM3B9N6YftvIauFihhf3o X-Received: by 2002:a17:906:c092:b0:6cd:f3a1:a11e with SMTP id f18-20020a170906c09200b006cdf3a1a11emr35170547ejz.185.1649791539704; Tue, 12 Apr 2022 12:25:39 -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 d18-20020a170906305200b006e8782b11a5si7306414ejd.418.2022.04.12.12.25.38; Tue, 12 Apr 2022 12:25:39 -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=QHZk5QdQ; 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 1AA7868B3C4; Tue, 12 Apr 2022 22:25:37 +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-oln040092070030.outbound.protection.outlook.com [40.92.70.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 98B6568B39E for ; Tue, 12 Apr 2022 22:25:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S76lf2rXknQGDP18BJ8rg1znGc6vGe5x4dgQeMh+mTJyZ5pUr8QzkbWRxqPTeb0+jmcbLyqvmriRV/Ql1J4vU3fQZPZDR8JtYhDjcWNH4btCvHIjx3V8dadbwqOO2F2r+szGEPmKwKNXP1dakdnGOZUglZbJX8Wo80o1xQZpeVqiS/2KvHdceZPjoqdUAlkDP8Gt5mhOcotAfv2B6ChwB9RbQsz1P9nwmC2aRJHGgpR8HJmMmGZ19TbWe8yVClqDFkQ7j0Nm50Tma/S6u0elo0aaujjNptIB1v1qA3TEaJ9JEF+LTJuOIp5RvunFExUTTj7HQmFK5KmIhxt9aTr0kA== 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=Uj2XqZ/VHXsK1qQK6pRIhNQ8IXIJLQC8Uawzh8d7UtM=; b=Z/xMHNtne+TqDgvNyO2RpTSnC9j7QJRVoDFCHenHM82/BrvzUN/xVlAQWidFakfFgsoMojIgdpsmYCe/VInh8njhi78Fk6p/sNaKFNG+xxDCiwkMbPXAJTvGI6XJ6Ng8nkWPCT62YQzzwhY81YhGyPcJ7Myo6uxPiNIfaaow10MNk9CX5QRSIeFgjcbmwtA0QU1NjOpFnBZCKAPHYE/UdSpJd0r4nzz0qpFXB7N93nv3GgVIX9ml76HhjNqds6R5t0sx/wNWQN+PXwzU6SDRy4XHS3D+Ko89VQM+9a+RpyYfA5pBCd97rOAyVDUl/D1WQ0wLJ5w6Ked2fjK3JoGNcA== 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=Uj2XqZ/VHXsK1qQK6pRIhNQ8IXIJLQC8Uawzh8d7UtM=; b=QHZk5QdQ/UvWd4bSP1cvIPI1E2LekNtZglI6sZw2ogid9GgtNl9jz2niixtqxWQLzQfWJe5oBG4sl2vtwGOb6IyfOhPiXp5RJ/HJQojvOc3GkjEqU5ZzH1GuMETMPHKz0SASNcpfRqUbyU6DQNlKrLeR5jJhQ6WNt+ZY/K6zMxG8ZuAnMpwt4t8tpehfUZjiz2ouKMPJgCCmMhufCAk4pgzdWabpbcJ6esjmHkHlub7Rxx0f1PPeByqjbFS7qSxHYZiOag2U14CUxRPV90/lZ2QAo4JPT1HhfcVO39AoVCIbL9AC5ttQ5B2dAQFqlTbuw2Nqv0ACHihXRfd+MpBDcw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB6PR0101MB2230.eurprd01.prod.exchangelabs.com (2603:10a6:4:44::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.30; Tue, 12 Apr 2022 19:25:29 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2%5]) with mapi id 15.20.5164.020; Tue, 12 Apr 2022 19:25:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 21:25:18 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Dbvjr8F7R323+eSFXTywgL8On9BnTtL8] X-ClientProxiedBy: ZR0P278CA0174.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::20) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220412192521.750751-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 897cd5d9-9218-4d84-6e84-08da1cba342a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTONvFbsB6nRbYK9Q9ndC83oBeJ4vrzQ+jvw2PlXBIAzzZw1Ifl8llSz8Bci56u9hlmgXnPA5k5tlee+ORl3LcmDAUu+VufMCRACxoju2TPCVIF4QFLLncEvrEg+V269Mr5XCiZUeSAH0mGULPMDfwWFAlbbb5NM0EzDYvlpCpUkjfxjfNHuNEC8kUMKgmdIqnIij4enAlOuVW1xFrfUtdEQD5NvMwifJce4rFooYT8m7NR5BFdzaCEwbtX6ylxDu9GPGoVAg/A4Iyn61ArClEQaOLQ2su2j5ObD0wxSt774E/fA69zeR/AQCc0t182k+qPthN2Pt55yQmUSlDs6zAO1081O1EO3aZt3BQuzgwZa9wVPMZRmMZkCWrgWX7vp7wiKAoJ8SwbFCd8loBxmjqa2HP4nIpbeNdnaSvk/kRv90T7VI0FTY14Rp2AShBzmODFwwGR/6rn9jxJkWPvLJWJTvYYPoUf+LuO8FEgoWeAVLoHSz+P0txMKhN01YQItos41fbkiwZ0RnxLVBqFEd/OzqSHw+WAm8PXc4+Ikn4KTqUBLoPouDn+9sbz4q/BCdn4F5zY2sg7+dYZQ6dKFA4/V6NXHyRAPnqw6LzL1p3d9SIsrF1Mq079MQVc9F3ygAdMRG5wWrWiRBoKKbgoPFiPuTZe2i3VWc7BNTioydiMewYLhIV1C8arqatdJJ4Q40d01RxShYuuRdqfIFuqgpWsWDjxonvvNUteaxg0eVyZHP5Mbawz2kUmUzIK294nvDo= X-MS-TrafficTypeDiagnostic: DB6PR0101MB2230:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RquYoo8/59/8ZYULNqTWXhjagb0nMb/rkYw1lcw7Y7ngIef3rTFuccLu27Fn7eJv6HsmRTIWMqhV5wM37EgRthwsDcIBQCb0ZXOGPpO5/EcXA/tQNcFaD7AokkIlvmUWWb+0divXSU6qRznXKJC2e8xiX76WoI40xBtBKT4FzE68QdoypiBR/Oguuwrr4vV0xn+3m7xjWVZeMcIn4MFyabdMTEVv6mu8HtK+fOnGEQzZQegiGHWttuSwIJXNWychaEtEafV2KQwrbAH4noaV9jw6TjP8rRSgBowfbEz5vc5KGQnnL98RPjQVHCcnLJEeVAyrMz3oZVvlk+chRE6s4lOmgZuW+ZC0Q//btyd7CiVtQrev+TMs6mXqWo2JorNGluRmx5/gdlH5vGJ0vWVNiV/id/9J/JVA/t7BheAWIC6QjegLrvVwQF8TJBtVMYmGGiY5vyRvGiKbgFcsd6ylnjhfpgB+rt5QE0+82nmMlH77G9KaRI+4a+1D1vKnCzW/YwhVuSSdhAvVrkZkmmhvc23axZPc30jtw+JAfiPbN6TbwsqT9BlSSF6cfOafQdUUlFQx6COZzQZIG4tZdDgH2g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: u+HElRH4yExj2wb3pCJUjucngvO2gxh7w2rj0Q9yoBEWKxCsjCAMqhsB5biShrDh1TkYTVjHxzXqT+duBEexju1hdYV9m60FILNrRoCyE70wdWNSaKN7ol2C0Cbs9YekGw0Fi/Ef3/H5pcbqNI4DRj1RglS4L+c534RzsifVpNwPIrpJQzIGVGmTojReEhMIEcMh+QrkWYP0876Wd/4WK8wAAcvvt8eoKwPvEnDqYFfcjf8Qd4vwQFDbOxmMRgO5XP+M5t6QMB32NXq2+BvGQmRFUam9EQXKs+YgOuAVnW0BGQHBOCYxRi8wszDKwDhx35OrhU+y7ggjwVSYhaxvXEfWoUqQGM+QYTVfIiQz1uQa74Ieesvnj+w2FhseoqFdiz0YuLtouwaW+xTI6TGPouFWWRzYaO4nyc/Nv+xi48YDC/3zrrRcFSnnjKm3X2ol9oYj8PS+OuBwTLVjU8MTni3uAvoX6LFxxDH+Swi8tiUh5v3ZfSZNSdHVxjdDWFGEQamV9KzMGoDJyjFzcU4JYOnfDPsgMi0DB1ZAkqB1tXJg0J7Y2WFX8fm0StJ9NIPeTw2EkMNGMLTJHR64Px4uwbTE2UQPoM/KhPw8tUUxWI2BJFSrN7kIJk1qX2GW2bvd6p6Q3pCrQ8x55QqhEdDOad2FCb2LziGdESOUaWydzdlivr5mD+stvFEiJ7D06edV9rcOzXCVFveR2tmoY2Ulc/Qy/WesIaH9ujdkfWKBBjHlLXU5aenglacwzmJh+NaKeD6rjMAUnZ4++L9kezHQAZfRpryB6y/194ExDr9eV7a5eoesVF2zBS9SJ/rg5B/D6u9EghOrYTFDNeC84h2ulK+EX+v1p+r0AxIQiXYcifry3lrlxbKJoW0OvYrDBApUBWHpXwObM+Xxc+Ry7+l3SrjUn3tM0jmluv5SC4JZwoaw17hiuNUl5nj0r02Xfw3P1SkC9f1oDlvtRChPXuClt+1R1pNWiFt1i/uuV9pttEfnxZX/CnqvACXTi9r5Pm1JuWXPSBXJUH06Jib/Imsw5NowQ0xAoKXEnaJR95ngSQWlLKTs5Z/BR7bom18Y1hIKCSOzafA7uz6iSl+ctG9OlrZCCaXvjTL/8GRXtnixKSr1VlSq+nXcNvQwhks0pkc59szzG6QZa049Lpzwy1/VwE1Gu54fcweBdgnznWJkV0kqhuz4/d7WaRcCBkSXGakiBpyY70Lphb1W5nrQIx9+UkezJwsHcT0Cvpr7SHZ9ftyvUXrjjn8aFVKmX9PHyW/1nXtP4B/aCpW9MhWvcRMucd/XlR/7e43TfzIRRUCwc87Hs3qE7glb3JEnFyJswR1ZJYN6xcqN4W1NexFzmQu22r+fpT3f5LYHGEFykCBYW+L4/CYxq+lHdtCj/h+8M3sPpbc+nFZ5GSM5zigxncYsdsYW0sYIDSxYGuz2/o7KKuywNnpFLJl7CmwwTPyexj59 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 897cd5d9-9218-4d84-6e84-08da1cba342a X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2022 19:25:29.3068 (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: DB6PR0101MB2230 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/vbn(dec|enc): Avoid leaving stale pointers in context 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: mvMuHETLT3m6 Therefore move the (Get|Put)ByteContext from the context to the stack. It is transient anyway. Signed-off-by: Andreas Rheinhardt --- libavcodec/vbndec.c | 11 ++++------- libavcodec/vbnenc.c | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/libavcodec/vbndec.c b/libavcodec/vbndec.c index 916421925d..56bfb1d544 100644 --- a/libavcodec/vbndec.c +++ b/libavcodec/vbndec.c @@ -34,7 +34,6 @@ typedef struct VBNContext { TextureDSPContext texdsp; TextureDSPThreadContext dec; - GetByteContext gb; } VBNContext; static av_cold int vbn_init(AVCodecContext *avctx) @@ -44,11 +43,9 @@ static av_cold int vbn_init(AVCodecContext *avctx) return 0; } -static int decompress(AVCodecContext *avctx, int compression, uint8_t **outbuf) +static int decompress(AVCodecContext *avctx, GetByteContext *gb, + int compression, uint8_t **outbuf) { - VBNContext *ctx = avctx->priv_data; - GetByteContext *gb = &ctx->gb; - if (compression == VBN_COMPRESSION_NONE) // outbuf is left NULL because gb->buf can be used directly return bytestream2_get_bytes_left(gb); @@ -61,7 +58,7 @@ static int vbn_decode_frame(AVCodecContext *avctx, AVPacket *avpkt) { VBNContext *ctx = avctx->priv_data; - GetByteContext *gb = &ctx->gb; + GetByteContext gb0, *const gb = &gb0; uint8_t *image_buf = NULL; int image_len; int width, height, components, format, compression, pix_fmt, linesize, data_size; @@ -139,7 +136,7 @@ static int vbn_decode_frame(AVCodecContext *avctx, return AVERROR_PATCHWELCOME; } - image_len = decompress(avctx, compression, &image_buf); + image_len = decompress(avctx, gb, compression, &image_buf); if (image_len < 0) return image_len; diff --git a/libavcodec/vbnenc.c b/libavcodec/vbnenc.c index 0b2c4dced2..03d36ccc86 100644 --- a/libavcodec/vbnenc.c +++ b/libavcodec/vbnenc.c @@ -37,7 +37,6 @@ typedef struct VBNContext { AVClass *class; TextureDSPContext dxtc; - PutByteContext pb; int format; TextureDSPThreadContext enc; } VBNContext; @@ -46,7 +45,7 @@ static int vbn_encode(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) { VBNContext *ctx = avctx->priv_data; - PutByteContext *pb = &ctx->pb; + PutByteContext pb0, *const pb = &pb0; int ret; ptrdiff_t linesize; int64_t pkt_size; From patchwork Tue Apr 12 19:25:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35294 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1750593pzh; Tue, 12 Apr 2022 12:25:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiTneKVkUy5MBcc/1P2ntyrDazXMLKHwOv5WlcUYlEFCf63HzPLJjVFmNLA6U921NW3VGn X-Received: by 2002:a17:906:c08a:b0:6ce:36f8:bfe8 with SMTP id f10-20020a170906c08a00b006ce36f8bfe8mr35328683ejz.52.1649791548353; Tue, 12 Apr 2022 12:25:48 -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 b19-20020a056402351300b00418eee96003si178084edd.315.2022.04.12.12.25.48; Tue, 12 Apr 2022 12:25:48 -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=OR4le9XV; 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 150E468B3D1; Tue, 12 Apr 2022 22:25:42 +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-oln040092070030.outbound.protection.outlook.com [40.92.70.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B744368B3B8 for ; Tue, 12 Apr 2022 22:25:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OUwvySmlbCCR5tKjhM8gJ1EcO4ws7caC7iIMV9jU+PsSlKAc7gtrsxWjdjvtMk2WGLpx4Aa1NUGmGKW59rvnnaqDOqeIBrD8HPS40WmN63QXgih3BO4hVB8vt0widk0bf+i8ukO7h63ioLcq6rVrwfqEORgU84StG6x21HJgKW+fNacx/PfVqLIUh0pQIwh8w//PrkVQ6c9TRhiJ5xD/+nwNwZyR5hXMxYlk14EGfdJXNcPW/j5Q2WFzqf2Kn4Bc/t2NdKKkzKPXpCppUB3+a4DEKEVBiPSw7kqxekAd4peH7hvapuBL2uW5Ek770omW8kiPkeks5N9I9cea1o1H4w== 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=tgqmVdwdZAifF11npalmZJrYcTGae1XvP8Kmm708LHY=; b=A35XHuUHgjOjd0A6E2Zr2qU9IR86jM2oJyYCJNbOUh99lIJijJ9A4IghHJWk+o3kGglNdobNCNGZtOIxVapvTy6Z/lJQNmBfMcO4x4uZwBFqOYfJEHQ4H+sd74ZtNRIyFMXEU4NMhAnfvZbc1IqFT+byQGKZHilT+Jt7FjQMyg5Zd042G/UT1f0ZT/dWLvU0De2AAFetxSAHO4Z7YhE8GDLCulvAxqHUqlMgM791ZnzndLfWg/JDuB/XIaNVytJa7UOVIbGLDQyXbKZBXaqYsQbssY1L4ISiggPwv4VaLK1dGSLdrVOS7Q3/fcTpluz0i0hBbPB3vsIWUCf9qGLNPQ== 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=tgqmVdwdZAifF11npalmZJrYcTGae1XvP8Kmm708LHY=; b=OR4le9XVBhNl8Tzl9lajOcQFV/qxK44shROjFczyiiuGMg5sGVZffX3al/wmz0peH6dudUbJBN+4j5cAOSWp8aKmcUO9hSJbBwI3kC0MH5KJwTa964wzDv7WKiZ8rWWsZTgJUEfh5UzJi2ek8CC0GRLzsf9+n0rp9Boiy9bow04Wp0xCz/lf9kipUC5+3ItgD3uX+V8dARjwYLiyV/yZ02tLcSfQCf2P/VcZyUx1066Gqn3+ga5zPCKATyqr0BiztUO8W+mQAc3jNPX8Ow++N4pBhjmsSXbSqt7jYDzKrSftR0dxd4no+5vaQTzf3A2L5XTib0tQREqjpsYkudaa3A== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB6PR0101MB2230.eurprd01.prod.exchangelabs.com (2603:10a6:4:44::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.30; Tue, 12 Apr 2022 19:25:30 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2%5]) with mapi id 15.20.5164.020; Tue, 12 Apr 2022 19:25:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 21:25:19 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [BOhEpRzP4y2teFnFwOZKBgKuZdypP9cD] X-ClientProxiedBy: ZR0P278CA0174.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::20) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220412192521.750751-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8fc22648-23aa-40a7-1d3a-08da1cba34f0 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXy+SskBdSUJJywJ6Eqf0+mn5rTub8p+UDbc5WomU4swDJXsp/ViG1Rgx0cVUMhsD2FlmWghEElM+nYrBVVKEotPE24p+jPfNI/weP2pwuI0UMw/gaNeIQVGV7HRZdHTQE4+D91351F9Nlo62OJYBRhxLzT+aM9uX+SM/XVOYlxYsCJdGHtriczazGnhrREFLUMstwi+SXXjoyZv+ZSlz6wPf1TJwMV/9TxhkPrm3pkDaJMGoMMZujboj4LEI/EW3gjwjFPWvU61PQ9HolGKMoOD9t6f5r7R3RKH+EJDrnEJuKn7g+MiCAfte0RI4+KNVAAE2PBEV4QiQryd9SiyC9GqotbC6c09/sGicklZZZZXA+q34dWTfBh3/CgmKc7mGaAu+3/eWfi+5/mh+olGt1RYbVk+RWBQo9c9uz8mXeR2zofMYLqL3tPtA/qlgswTbijJMSoSPfCxn6yIowF312je3AvzxdZX6TvsFLfvhxUgdpzfYquNVtBZYXS9gpy4AgA6keFvyKV6rq81MzoE4/+49l25CCITgAig0YzR+oQO2VvIcFTGXa2/ktVQ9K+LldIXwPqssJ+l5MbzzlGbNtWyHznMKvR6Dxeh46Um+b4CguPr3TvYbevL5hJxlK6zaUbiD8S/qc9hbwTDeRmWvb0ckakbVZgokCn8CokBuv+ymDw2fJivldGoM8jSP2rsrwzrkZj/MDbgb7aXgm2otIhG8sIRMLIcDM= X-MS-TrafficTypeDiagnostic: DB6PR0101MB2230:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BId71qFBUCRk7U37Z1/t8nZBgrj74haMzujanw36cTWndBiMHz0PuPUqpwHBfesY4VyfmUjBaBD3/wQbTjKVSh6ao10815xNeLwpIlu7I1pLUNfB/2tpuv/IQXOxbZZU+n9aBnw7CVZ32Jrh2OSTB2EGdboF0pPhbI5GoAPAibwMigsbil5Vav1G5v4ttDfPSQFTGwaUaMWyzZ5zI1XVLp7HAGlOZTX5n1QDDA5cf/9rbuDscbKomxZE1foIF8YCamKce3l/z6OjN5rJKIEYPJQlFv9xO9x56kX4iM77Ggg9HJU+cDCBZOLpR79wqctGiKZRQHlfODgdpygAgYxNfUFcZer7qzJ79ovOY6KmZCJT4XWmQPXC3IHSpZQt41kk63l6RUo0/4id4qvhBk0iXT7Tx0XTFTmNG88FU9LGMpqWmWSb/xbPzsX/YwoQTeW4vHCZKzej74u6oe8cm0kQR5hOow7uJlIg64BHJ3SdJRN1xpcstIl/H9gSPM7/anRC+cqDX/rKccsrvfIS/Cc/y7DOf2gHG6JiPH33F+OPegfGSET5n2dth6JPpFKy6R39FWSVLvqS1Cl+ZNcLegn78g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: neX56JMhg8wOeaMiqpDwWn7eHZewPkO8yNMONFnWa67vU57vpFSNmLuO0rNckHWnjDFQPrsY0Dinc5EI+fWEmNGfwOcaIcnc9hPpAPsdqWbcVzf8zIM9Oq1QQ4x5/r01bJW8M/CdCYX3hSAnG3h2Ev2yjwaISfI9ZETDuPcZeDupVOwtHO58o8zMl0QCjie/mSExJkPj7/Di9qWmNt/+PAqbZJhMtms+s6hTkgkooC1a1S9JkT2UcHp/zrcltxJd2qkZ2n5pC0xmJublwTRcJKJpHleZsglV0xDw6EITGSRZsimhkJxkGbP4SYqWA8kB9zbCuADCGRnUJFwRiLR6ErklkJE3X+UnoINh9p2pa5NJVABZaR2e6JsjqhKrUeSprf+A2yfijJCg/Te8JzXTQHKZCVrvGgj8LRkQXdCplL3Bk2YodqqaRf7hlu+vzaQ36Bc6Cu0TNBT8h7mqYvfEbugzV2exPXSAmIA+F0zPSnkhoHef9Z26e8pF2hazFIgbcgaLUwYHK5gR6p4/P5ZtsoJWC3vNJ0tlrQ3NU26kXv4cviZgEKdbLfIt4Eq4Bz0sxc9ifCdq0ytVNWRo0wXqjTpK+qvXeCQNXAuat3xHNRdrcwq8BMlMb3CwXpBBIuKEZvYvh4oi39jZsDt1BBA4OfTVceq112/oylGtRLPg0NZQOCUddqbK6cuyCTv9tf2kMl1t/dq7HEzMSo+iLwFWZqLFjPjB0pthFeRp3Q2nGLrFwIsPqawTUj3RlxujhZ9/AR01OSeeFx6Hfv06p9V5dPfCYPH8WEqDAtkyCQv53wuOdqCz3qV9PO02BEia5xK8Jt9ozQoicwr8gt6gZYlCxocM0AXO2PbfQW2dOe9RICLzTJTCEAlmmBgvkxepDrX92jLsng3f11nCObT2zbEVLe4lKcp3Ayoj0sBBIpzQUKE7KQMkBo5sW/lb7xLAcZhZx7Of7puZ9ZtvdD3LQPsxoOdUSye734Z9qxu2QDNG1zCnFXa7RwW1o42X6sKoUVCrHH/3XcZRx9kZl+HachGm6hBejLB+1LRg2uj8RF59iC35I9hSVBJbFR0Jp/2MGWsetRrUspd7b2bFVIy60gv0z1qupRbxuRaaiX/Ow4estqHXEvDwXbqqjUs0XdvrTk7bXMeHpbCK+Xbzbmm6cmuy33VUovJwnCVcL1zVGijPV6xoCv+wY2+TtFeZ+Y6nTVf28MYwfmT1N1DrSaD8fTYW/hDaFn9JDNEmRbtmWHDbZ4IW/9kiw3QlV3HB9uJKrNQLpdPSVqq6anKM5dh79OSAAjNll5T8/0jQ6bTfeE6zqfPaQkGo5IizoAjIZaoOrxlzgWZyWCGdY4yauaLmV5ufmi6vftsdj9/dsZxJDEEvjTdk1r0anHbsqtQ+2sq20yohD5EbkkWO/TLjUSTiS9IeHc+jnZzccr587a3w28rjIQH2ELveezHMnwqSQbwzm3c4 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8fc22648-23aa-40a7-1d3a-08da1cba34f0 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2022 19:25:30.6648 (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: DB6PR0101MB2230 Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/vbn(dec|enc): Avoid always-false checks 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: uB1xV2KkFj5s Do this by switching to bytestream2_(get|put)_le32u() from bytestream2_(get|put)_le32(); it has after all already been checked that the packet contains at least a full header, making all the implicit checks in bytestream2_(get|put)_le32() dead code. Signed-off-by: Andreas Rheinhardt --- libavcodec/vbndec.c | 20 ++++++++++---------- libavcodec/vbnenc.c | 22 +++++++++++----------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/libavcodec/vbndec.c b/libavcodec/vbndec.c index 56bfb1d544..a6046c766a 100644 --- a/libavcodec/vbndec.c +++ b/libavcodec/vbndec.c @@ -71,20 +71,20 @@ static int vbn_decode_frame(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } - if (bytestream2_get_le32(gb) != VBN_MAGIC || - bytestream2_get_le32(gb) != VBN_MAJOR || - bytestream2_get_le32(gb) != VBN_MINOR) { + if (bytestream2_get_le32u(gb) != VBN_MAGIC || + bytestream2_get_le32u(gb) != VBN_MAJOR || + bytestream2_get_le32u(gb) != VBN_MINOR) { av_log(avctx, AV_LOG_ERROR, "Invalid VBN header\n"); return AVERROR_INVALIDDATA; } - width = bytestream2_get_le32(gb); - height = bytestream2_get_le32(gb); - components = bytestream2_get_le32(gb); - format = bytestream2_get_le32(gb); - pix_fmt = bytestream2_get_le32(gb); - bytestream2_get_le32(gb); // mipmaps - data_size = bytestream2_get_le32(gb); + width = bytestream2_get_le32u(gb); + height = bytestream2_get_le32u(gb); + components = bytestream2_get_le32u(gb); + format = bytestream2_get_le32u(gb); + pix_fmt = bytestream2_get_le32u(gb); + bytestream2_get_le32u(gb); // mipmaps + data_size = bytestream2_get_le32u(gb); bytestream2_seek(gb, VBN_HEADER_SIZE, SEEK_SET); compression = format & 0xffffff00; diff --git a/libavcodec/vbnenc.c b/libavcodec/vbnenc.c index 03d36ccc86..ec04566a32 100644 --- a/libavcodec/vbnenc.c +++ b/libavcodec/vbnenc.c @@ -97,18 +97,18 @@ static int vbn_encode(AVCodecContext *avctx, AVPacket *pkt, memset(pkt->data, 0, VBN_HEADER_SIZE); bytestream2_init_writer(pb, pkt->data, pkt_size); - bytestream2_put_le32(pb, VBN_MAGIC); - bytestream2_put_le32(pb, VBN_MAJOR); - bytestream2_put_le32(pb, VBN_MINOR); - bytestream2_put_le32(pb, frame->width); - bytestream2_put_le32(pb, frame->height); - bytestream2_put_le32(pb, frame->format == AV_PIX_FMT_RGBA ? 4 : 3); - bytestream2_put_le32(pb, ctx->format); - bytestream2_put_le32(pb, frame->format == AV_PIX_FMT_RGBA ? VBN_PIX_RGBA : VBN_PIX_RGB); - bytestream2_put_le32(pb, 0); // mipmaps - bytestream2_put_le32(pb, pkt_size - VBN_HEADER_SIZE); + bytestream2_put_le32u(pb, VBN_MAGIC); + bytestream2_put_le32u(pb, VBN_MAJOR); + bytestream2_put_le32u(pb, VBN_MINOR); + bytestream2_put_le32u(pb, frame->width); + bytestream2_put_le32u(pb, frame->height); + bytestream2_put_le32u(pb, frame->format == AV_PIX_FMT_RGBA ? 4 : 3); + bytestream2_put_le32u(pb, ctx->format); + bytestream2_put_le32u(pb, frame->format == AV_PIX_FMT_RGBA ? VBN_PIX_RGBA : VBN_PIX_RGB); + bytestream2_put_le32u(pb, 0); // mipmaps + bytestream2_put_le32u(pb, pkt_size - VBN_HEADER_SIZE); bytestream2_seek_p(pb, 64, SEEK_SET); - bytestream2_put_le32(pb, pkt_size - VBN_HEADER_SIZE); + bytestream2_put_le32u(pb, pkt_size - VBN_HEADER_SIZE); if (ctx->format == VBN_FORMAT_DXT1 || ctx->format == VBN_FORMAT_DXT5) { ctx->enc.frame_data.in = (frame->height - 1) * frame->linesize[0] + frame->data[0]; From patchwork Tue Apr 12 19:25:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35295 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1750640pzh; Tue, 12 Apr 2022 12:25:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy08S4puBaYdohwunLva/pP9X4GcEGGC7sR1DjrxOVLz2E7xmr7lHF1kPwfGgTgkW/1su+B X-Received: by 2002:a17:906:f85:b0:6d6:e97b:d276 with SMTP id q5-20020a1709060f8500b006d6e97bd276mr35270157ejj.431.1649791558074; Tue, 12 Apr 2022 12:25:58 -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 en2-20020a170906a66200b006e862100d5bsi9281131ejb.396.2022.04.12.12.25.57; Tue, 12 Apr 2022 12:25:58 -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=JMr+D3t2; 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 11A5368B3DD; Tue, 12 Apr 2022 22:25:47 +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-oln040092070030.outbound.protection.outlook.com [40.92.70.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D297068B3CB for ; Tue, 12 Apr 2022 22:25:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CPH2doxT9EC4+oeh57r/Q6+PI58o92y9nAQZBcmfXvG4AJ0XwBzX5Olpz9QlSBmoRDutZ9h1OGqWRrLXrPZP0ykZHq6gGri94bFoKtBsSZWQTRpmQMrV7DIZWKQ2j97YkNB1T1Jm2ue8TUQI4sE3g5p0GvVxUdSQu8/njh/wSn1f6i1fhR93ykgDWCfpVM/J8oKRdQqXyZ3f74P/a8PTj7ncem75lLnlHbP4fbYClWV+goiWCW3ql5Pw8sEJOSrSpjpcAYQFi6ovNUT/zJJbxWOS89Ziu36lTWCdf3cpR/5RybOrM8Mc3LjSUWl7hF057P6eoAgZc3Dsy6XGqg3nnw== 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=GTnHG7ImUvAfR8Pr11y4LnE++HZ2q8+lEahfUbj3n2o=; b=KjqKvzhKkMwSbfBsjurXzW0DxwIpJ7VT2orgmENb4+1LHH7K92/dtn+9fe/2QVL6GuUhDlxgfSdUgu3OhVXR0vEwmlh/N4JgXyG526ZFl41e7S5glPb1HSQZk1FbUL5z1NgX6prErb7kSFRiBkCXJC1SKkD/7mTSumZSd2xt8NVXnj+sOiReUrL/MMKBrPnryCUVA4LhEbmPb8cfW3X28vNe8y/RwmflZuBcoF9fS7GeQNHnpQ4rZA18Kh8esWzB1hLEK5uHog06oJmw080yUpPJByJ1cuyKfylI10sfnEOSYAe8Fz9cAcFr1aiWo3Qh1rkrmbVGpsjWDCoYt8jCYw== 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=GTnHG7ImUvAfR8Pr11y4LnE++HZ2q8+lEahfUbj3n2o=; b=JMr+D3t2y4L++3vXL3HVPey7BgBDreMhHGQDdcfUWBJuDdnxkY+fO1dnTndMoGlGhTwfNoB0xEV7EUREU7dA6aPJqsQTjLb8dhCpfGOWTRr5XOKrHFhvExpHx34mi43008r8w8WUAqADPGQbMJ6r5SZb8M0KJed8d9u1exfMGElpPhadWqEZa9lrslMlkw/4581mWOIXBQRQG7F9apNS0qo5Ww5SedbRsrdiGGonWPcHuLirZ0/SdzezRk/NQKDOgBcKGmk92YCLaODFmTv3NBL/k3CGq0mBdM/TBFbL+F+t62H1VMNKD+rHV921+YGfP2opnOaelXHpomTshuCrqA== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB6PR0101MB2230.eurprd01.prod.exchangelabs.com (2603:10a6:4:44::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.30; Tue, 12 Apr 2022 19:25:31 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2%5]) with mapi id 15.20.5164.020; Tue, 12 Apr 2022 19:25:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 21:25:20 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [HAxmSUsY1uKo41kcuiG1vpDPef2ts9cD] X-ClientProxiedBy: ZR0P278CA0174.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::20) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220412192521.750751-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80b0e1f1-68c5-4706-da3d-08da1cba35a7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTONvFbsB6nRbYK9Q9ndC83aOMwr9h+e4zjbE8YjoFOpyWFNmKbalJ5oosTc4I5OGvLZiQYDWjqy2blG99q38XQHHjLRwAHkh/JH6FzeVzcxjDp7gJqO495E53rNRJ6aBrYEYH8jTQZoyvc4oCUxmo7B9JSsGRc+JEHa8+rykhuV+rcVHRG7/dhfMhCPOVhx5Qaf4m9mndog/r2AZu4CoXvkJq0U6YZkquwJEcyLzym+v1SS3qT2ssXiFUMKm9d1Ha5VHEDg+u9B05LcpOUwndiqh2i0i/JHcRJnJBPBD9ZRB3ooC7HEWfon7JZTD0X+ToEgOcfT1YSSqRRBfyl0cncsJq9q0lTGROj06M6GiLBn3RkB3qJjDBFTENDK1w3ZuJvRSXnez9bnpuQtxDAxC7AQbP6WVG0/nvxqT2FfliM6kr+ye12m5NgZSvLijsN+UVrZYXCHghus39bhvlSvttH+vGUCl/P/qOGFB31IP4Qh0XMn1X8XDktlLmpiEM0Fp+b2k2s7mPQr1S19a0ybOLkK/IwlhkldeEacQgIrjP0w9gPIDq6jAUqR68iLOJ5BMzB+CM3xvndAzPrIbyXsp268V6IfvPDx+Fr1eMSHbiRs/q7s/dZo6Zl8tT1/fM+5qhXfqwSd4pB+RpgmMwjV1OuGtCwK98RzDz275XjJj0Gx3mUqplcTVghenOyUMa5oSpV4tmtR8CktxkvmFWBvfg9Q/nL5iFfVeZfEBdzUCWAuzJKCOB3Cal0E2Oo+iZG+T4= X-MS-TrafficTypeDiagnostic: DB6PR0101MB2230:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vEw/7/7cIOAM+ShG6Bgp88CBAMv36e8P5hvZaj99c682p+oN/aAENuK3DAKSY6DZabzHO0848Y0PijHi/CQxm0Gmk68p+1nj5MpkHR97XtrK7v/28G0KotBR3or0pYqGiAxq4rtpy0HwXg2/4azHYy3OT4woeeiE6YubF9LOgnb5f3mL575x7qb4Hrv9H89OUeVywv2R4/gIKfZ55l5xLpRWuAyCBM/+06O7BU5f89ZZ8VWKLqwSgxiKx2OZ2oCSuARwsRAFKk8pzXPXBTJ9VQA5ARo8AWXrTbqvS521UE1hvd1d6LuczCgZTNFdP5C9X7uwgSuBMANDoeoSHsaPEUC8qG3YpGMC1u7a5I017tS5cnyvnVii5Aqi1LrYX1/2nPRkrasqRC7rBfq9z3JTgOZwUTO8+ai3C4Luh1puSKtrhQ6fDbfjogD3szu+xkoF9iz1l8PWDN35EyqHA89lc1z2KCMdj9svmMgw56URxXHZJjm7AbBtA8m5WV6cDY/38FJKqxX/gmhso2QjQ0e0F65BzOHBizhaDhHhpWijYM9jBS9vFskUGFeICA9wYJcQntuI0Y/40JJDHE6G6xdw7Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /TTBGa6qlj53/RFA3uyJ4DqxxXNhtmC9xNndSbcObFTid1F35UumsrPSRG4QnX6r9ct+gjHR8utrzSFWXmMHluAVIU1IFCc6AWOrezp9pr9/DH0LGF/7E9/bcrjeaPd4hh+O2txve9M+s7qtqSEzDG1AUjNiYHoTxuAFS7Ri6036PIV+fE3IAuq1wUWtEmCYtDBjiwISJ1dhQYjiahOZAr2cViNUXgpkQiVxmmhE/6SI0zZH7nEhYcxDrLhX9ut42rY5Qan8Q2L37nRWHOqbODLZkOy0EL0rZ4GAdi3GeRuGeZIBRnuN5j8+ji9eH2mqfqrjmh/8u9DtEc81kirGuGfvYIXd4dnR5muq0CQu65FzLQoGR+EHy9MVzw3H57WfhupmWqXeSKLSdOrs/Mnnuc6OmVqjRM2oaJMrYpa7iW1QanG5HuG9l3FaAE9d5ZMG5BZCoInC48pmgg0xJIvh7+yZ04MdQ1D8t7lQa8NGqQF9ldWrAKW2dehKFu4WdshPAf4zxJM+fO3BRD5Ie65+L+BOR0GIByhthxUhFcrCdMMUdosODmHLuCThQJ4rJLGf1jlJnfkmbakaYRkyIr/ifUi5YhUJHRxxxeQ6DNGLClvPfDnnz/FuAGM43Jl9t8yGtWlCe8m5uh2ZRWSubnH1w/nSFGIVzIC9//vzWQAAGQoWoM9PdB2VD1tl8Ra3q2XURelNzGhagd+nr2b+ThHxFmgfx0RbhtT7BqqVLuidXk2JGRI3pypFydutXTWZklybWTCXJWu2gfEQItCmso6qjlr/lGpFKo55NjsIFi8V9YEsMZLv8miSiOXw3yBZ83l4EyT0AHbMmG1iFO5DTrFNHh2/RE97AfpYWmXNXswGH1E3siVaz3HCzqZP5uZIIOW3rbK50vIaxpXkchkM7ar5hgSADOq8ectbMDDbi2OuKD7Q+WDkh7Zi85iFwjO3IBvuXlqzY4urmwQsvYFr37fWUWH5TKo+EZ67ihazagzmPTY5K2etxmkZ+tNUlvRveDsnVcjlVQ613Dpoebbp6IuLPr0Jmch01WDUyyXtC/YYBeAxyUH+DRnb17DxkxfbMnXYRzBaW//Qp8nbGOeBBBDLQosb92p4zjWNVK/SzdxjeWkhCDV+hr0LEzSJ/ACwSyBxKmKBGyi5c7MtHsfWMytGpXZNFTtW/QrVE5LLK2ncci3ArlRT04HgdrMPWCTtbTBxGUK+a0UU/CahbOBzjtxFzxsRBpEqBfbg8eU+hSUbcfEqdQgjia86WLUin3li6n4fLNs4/Ohj4LxoZAbDrZMIOlw9QV56KD3BDTXFtRcN74FdojvDVnpKtZcmm/kDt7rs0mwYH7nW1g92XX50HtDQqHcgcSEF1GIFJzU7hVIndhW/IWBwUVqVBa+2NkSlkNmL9+r207AONwhwrFLvtNTovDgW08H3Lwpkx/wmfuc9qopbnrVefwqxZlLcivyy2ef1 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80b0e1f1-68c5-4706-da3d-08da1cba35a7 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2022 19:25:31.8378 (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: DB6PR0101MB2230 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/vbnenc: Add AV_CODEC_CAP_DR1 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: nhU6E5i0EUN0 This encoder uses ff_get_encode_buffer(). Signed-off-by: Andreas Rheinhardt --- libavcodec/vbnenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vbnenc.c b/libavcodec/vbnenc.c index ec04566a32..de35a44d3f 100644 --- a/libavcodec/vbnenc.c +++ b/libavcodec/vbnenc.c @@ -153,7 +153,7 @@ const FFCodec ff_vbn_encoder = { .p.long_name = NULL_IF_CONFIG_SMALL("Vizrt Binary Image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_VBN, - .p.capabilities = AV_CODEC_CAP_SLICE_THREADS, + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, .p.priv_class = &vbnenc_class, .init = vbn_init, FF_CODEC_ENCODE_CB(vbn_encode), From patchwork Tue Apr 12 19:25:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35296 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1750710pzh; Tue, 12 Apr 2022 12:26:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1doSywplIWIJaT8H4Sg9MKUFr1DqF55gD2mN9QfdqMzSANbfgF5hDj6jFSxkrkQqtBM4v X-Received: by 2002:a17:906:dc89:b0:6db:a789:7563 with SMTP id cs9-20020a170906dc8900b006dba7897563mr35220054ejc.471.1649791568543; Tue, 12 Apr 2022 12:26:08 -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 u19-20020a1709060b1300b006e89c09aeb7si3785180ejg.539.2022.04.12.12.26.06; Tue, 12 Apr 2022 12:26:08 -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="fX/lxv3/"; 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 2B31768B3EC; Tue, 12 Apr 2022 22:25:53 +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-oln040092070030.outbound.protection.outlook.com [40.92.70.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F142668B3D6 for ; Tue, 12 Apr 2022 22:25:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MiF+RqV3dD4zjDZRULkv0erjM+/T+6PDYzFiMXEbYSUw9pIYxDI3SKYgWD8rV2LM16LNqwmNrKK/XRyrIAxBuiuXtudovwTvTc0hTu6mAVoTdb9ebM0eqIcAbdrNZzxViPhjRoLyGDbLf1oh6agJPXNuHzMZ2OUjKx+LvXEeArJlYFHAKeN23zH1fo70BpaVnUVj1b7VMMKzo6ySo04vwIxYj9VPtZ1cGsaj7nsoT4348+Q5A+IjUoSaFc29Ybu/ccwiVsQHrmIoddmaaAZz8K4yEEJpqvp6OwSOD0nONVHZWOo+YUIEfotrkjouBYFVPA5lRuhncgo3I0K/o+AWgQ== 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=XATwSpbzYJqrVhb1betFbnCeZ+VOBr7pyrzagoyuzr8=; b=DVFmQc9c2qk1uXAN0cnthmr6m6ekppNv5nNSXN3ORaCTM8EUOlcr7yW0gRl4744Cp5gZzfpMOFUAhUq1TilHQegV+URvbDZu7O9zR3d7zuiHAQna842I4xGRwNjNkpMCVnnJivagPT2oMd89TPujFFQrUbgHamdgDNHPu0mbOPWtOu0dnNhViJM2zIz8kaVDKHrYG7xSg+ymgNB56ElSHn9WRRPM4y2UrDI/VksMA98kqC13pAEvq3fDF8Lj0kPdAwV5tROMaA/Byh6/4I4VRpAFZh1vVMv09BPCEKv5CXm431MwCgDRu2ugZcuRnuSXx/hzAfI5/Ofv+lZGw6GVTw== 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=XATwSpbzYJqrVhb1betFbnCeZ+VOBr7pyrzagoyuzr8=; b=fX/lxv3/ohYcHLdmBFcZdpEis510iTVm/6F+89iu2BP8exaFt1T6iZJyHEZ/e3bMLYRswaFjr49fOvbd83uiTvOd+fFjXLxUjiT30eC4AWRZCczEckDuXeaB6OIPWe+TooGB/Dwrx0kDVCrsIpo7D9hLRJE8P6MAf2uAMlNMG2MP0JY6DRMCkRAFM6YLphiU0M5fn3FlNAEpTN5RRqJaRXNrJq4RIEuB9Dmd2vI3UX6e4HR2Xq/vUohuVbprW4gjV70fzHjzSLECxdXNPeNhvj7ISbtLlv51T6MFHXElL96v08moN9+6YBJkEfKko72QpB72LTl5VpfjHrjl3BGchw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB6PR0101MB2230.eurprd01.prod.exchangelabs.com (2603:10a6:4:44::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.30; Tue, 12 Apr 2022 19:25:33 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2%5]) with mapi id 15.20.5164.020; Tue, 12 Apr 2022 19:25:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 21:25:21 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [sCwNI8Qg9VMoI5VkulNn7kVgTCCX0z8S] X-ClientProxiedBy: ZR0P278CA0174.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::20) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220412192521.750751-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 009dc258-23c3-4314-8d2f-08da1cba3666 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTONvFbsB6nRbYK9Q9ndC83AKWffs5+n+Jf7V3v0KXsXjeFkYyrGb2MQofmuEBXemlCsr+d4j2ymjH2HmJ0WTJPMCKBfOE5RJvgHKXRsKwatdrJCftyVZS2Av0y9MPuGuSi/sqZj43Q9SHMtmD/710CrwC3cXAfOFH+mgeGbhQnw2jCnQw5BOF/NTs8W6bmyqeQmNQ/m7nsKXSaywrZctq9lTAL+WQxOtRk/hDktxrE6WoEkXWCT/Xdx1x3hvdV1onCNZt3DElLiVj09/NUWei8Ihd4COirASVga+fcZCvjWPLMOI5QwTzyYTTXiw5Hnf7B8YRfzgxgNyyQ2jYvmghRr9SXl3eRc0hDdfKamq7Els/+fBrTdmChSaFmQ52ZgQ36f5XPIOg+s+w/kcsNWJEeJ1SegjVDyU1LPIYFR6Jpn4I4irshjGaX8ySePurS6ogNcuuBGeiJ931X6e6YtjdAH8fcxVeABpQQpAztDcq6CcdarZUCdGV2bCFrKsZu2lkC9uaaeP8kODlUf7WyeMZvWrWsR3TCB7hdGHYkuc9TlOjEgn4MfVIeZ9HhAz7nKgt42TJ7ldFJt1kR0/SxaNUPTZaFiPaJ8LWKPdCgFUGBOS3XSQt73xguNwtkesU6al+Zj+hbb1iBKHgpZmfdwxeL1xeFCWwvgmv+x8+yadEjpDNUnWgVbUo2y1Mt71rrSdTOmAKZBpfO6kJSPi/OMJOCxuXP4xV2yOc3wpQ3WX3P6G1rZIZfQblx1vk+f0JCXxw= X-MS-TrafficTypeDiagnostic: DB6PR0101MB2230:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tnOVJDeAw9PYTY7GZqX8gAmdmM/13Pj6o5G0aWoOX4RtSGN908elrvDOoL5SHN8bHux9g0jl6x4hkbhklun0KtPMZ75PEUfNS+bDH/SPTIocfy2CmcGN6OPjRsDJ8VPexriztKRDSx7v6KX17v8VdAhLsE+wSQljjpdpeDcw4rk/JJ+LejVE3DJuhpcDvYhjAhRZ4bXXIDnQrI+oB90QwAWjbEO8hZWBi3+Hji4lDylv84j8nlwHZwY48iBC4w6gdjqaUC7A2/4yRnWE1sYGIZSp0BoDq1jVkQD/JPluS/OChUBslZzN4XfvIcLEUyW1dUiDbB734I6AgENzHz0ciXTCikY+RlwyjLJXRl+KtO4hzu9EXItCMxEKbmdTt//bHvtNC6jYUfSfqYYQQ71ZkCe5gBWCdAdJH8jIjUeSAsL5JuzICDCZbk30dRckND3rvsj3AxXl1R0asHbh9PrigVd/VnXKf/hgoK280lRwzFtuDBCJS+52SPsBc9ttlmtyw6sylxTIKNu1yhKUWmjngBOtwA0lOjDvNDBx8N7KJh84zMZHNe38hl2nNgMRRN8OsXqLlqueLi1eZjoFqgr+mQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bVTC8ITO3lw2ii09wJDs4x0MkxuRwN9EXpSWVpMiyFzcNEECUcbklVHUWgfs1WuSmtf/XGuIeXIqZPTEZZXn9ziwaSQOzjXU0MsXhkSrWJTyxM6u+ZQ41/YMNgMgnGksXHAf6gSYKW6+oXjrwC3Mdw02Y/Dh3O0APjIYdCatzS2SPR5gm0CEUigky0Lr4w1auOHGVU7x+vXgksmK9XXG8m8CX86VJoWoKtAox5USs4qDQWYF39ydwj9f3zB6Wb7dToqxvZJpqqg0/f4mikpTTZ6p5lcNf6qhSfJhhgCt5LhTNLvZTVineZ3ROddidxD6XLeaFmQiNOT1rMP+z0CloUaTmD8oB170L0sUAxKdiYma6jt+ymJIKyCe1IOMOVfHqyN3gkQNjVi2iExiVpLnL8Mkv3lGUuAKrO+k/KpjlGaW0ekSwqIARzsYU8BbEXm6CtZFA/OeO7TNjNaDevq6knDMDCS3gSxgWRy8Mwso9cechvTFHvbO4zBgW1wZq7+IGseaENZni7i0tN2mxStoi/kTXtkqP1c5nWSppitKyIIk6sKzeC01I14E3YM13tB/dmY6l6KaeTwwiLLRwYUrEoatczSEdXe6eUZNHH8KbHb+nXNe1tjzboF/txDQ2efnwrF3KVI/HUoJGZbVOP1xY8ppBKaE7DBkLzLWRVwqRnQA6Be5GAIAK1tmy096K9iFaKD6544SwlRhBkV0CFcOVxk29Ar8ysF6qeFl3cXC3zQ+yOgJuCNDMHd2e/yfTRy2MXvUqK4SL8iNbT9cXHlWXgOahzhZHqObY2QO61DaYlKYw71XTwWfQ8nJJykRqjM5jaR+wSqSt1yCa7tSG5zK0nOatGD2LHU2f12zW/5p2df9/oGSzTqSQw0EPhfHEP7kLRxrO9GNYRr5vX6SEj4RKc9zSJAv4QQqsFfbhCcgSEUYMgcrV7S4kaVJ7kyUTndyHPNou0jOkF2Gw8V18ZJ7AOrnP+5AOoiHyCsDhlpetTjFVbtUhrf2YwCc+3ivCB6C3hYflTmmKHhJXdYM/eO2jUQ0BYulceQP5X2cgUoFJjbEvs4W8eucJIVDawrtFdNjoSuihc1rfxkeruL2RYregNmr1KM1+C96DN2LL5fXa/IhQSWY2beErMJFIhS6Hqass/JQ01SnvMa4rmD/9Pba9YvN4HM+LntN1OxF9PJLPowbHSNoVJdCqcOyYQZmvp96xa7wDmBKaA/COGepGNGUpgvOiLwrNpLuyiz+DnR8bCcJiLeKR9UQX4bSl3DMdieyOf/wQIhZBNeGhs7ddfcZGsmR9eOEuN6ICKaWASFd/tcoNU8/EpmdAWvRfknJzFrTKyFXbVxzsMrqFiERQI5QbKu/aFr2+RA/c6LaUgMcQFzjgcYgsVgWr9CclnGRroH6IWxXTMqbJmAaITNPPNnJ/tZDe6mN8TWpAI3L+iJb1UGL6x3xRo/9YOahie1hZ1+Z X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 009dc258-23c3-4314-8d2f-08da1cba3666 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2022 19:25:33.0718 (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: DB6PR0101MB2230 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/mss12: Constify slice context->parent context pointer 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: Bqoy394ScabQ Signed-off-by: Andreas Rheinhardt --- libavcodec/mss12.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mss12.h b/libavcodec/mss12.h index 6f68fc3db6..27aa2d56b1 100644 --- a/libavcodec/mss12.h +++ b/libavcodec/mss12.h @@ -68,7 +68,7 @@ typedef struct PixContext { struct MSS12Context; typedef struct SliceContext { - struct MSS12Context *c; + const struct MSS12Context *c; Model intra_region, inter_region; Model pivot, edge_mode, split_mode; PixContext intra_pix_ctx, inter_pix_ctx;