From patchwork Tue May 28 02:49:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49306 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:142:b0:460:55fa:d5ed with SMTP id h2csp141224vqi; Mon, 27 May 2024 19:49:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWFqb5K3QNqLAlwyDqskY6DRregEZMWTTJDSqqWFLsIx/pqcJ8OK+QPT1DkdqWMw5ntNK8zi5mFc1Xu9nU170varw/rWezI0M49SQ== X-Google-Smtp-Source: AGHT+IGecuEu0u4ZNDg52JRc73jBC4yvOJNZWseJXEvDK7rDhohc9u5lGRkiVsOtwvp3GrCF5rDV X-Received: by 2002:a17:906:13c4:b0:a59:c39b:6bc3 with SMTP id a640c23a62f3a-a6264f0e4d6mr727751966b.49.1716864569611; Mon, 27 May 2024 19:49:29 -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 a640c23a62f3a-a633c397c9asi34224066b.543.2024.05.27.19.49.29; Mon, 27 May 2024 19:49:29 -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=aVfJeowE; 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 3615168D4A3; Tue, 28 May 2024 05:49:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2070.outbound.protection.outlook.com [40.92.64.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A843468CFAB for ; Tue, 28 May 2024 05:49:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GhlqlQOo/EeWkkYrYGRn+txd4FZxJchY5sghjB5X6JfGm3eedafif7O+nfse2X5FLCf/el2o+nw7KRKkCB6xu068GgOtpdlvT7K+7rAHGTLvIxV48C7tD+QPhKEgIHHCTKF5H/khqxweNPlvlxEOJBPSzgYDyZQbT5V1cqbz87gHpL4Bjysg2bXl00w5iUNr3KE97FzCpW4ldLn4y4yCzAldv4OR36am9Ep/qYFiUkOZxC+4A9e2+uR85i4TmfLKKFavfmj3Otz0CQ5s69ggxGbSDLp0hGWKkZEOr1qWjTzTh+EfD+rNKiwG7BF5S80kHLXdY42pfvvIAKziY5Hnag== 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=LnWI9cyz5bxIUfKOzuRftWlcW7h7ghIcAE1pLlEgAAs=; b=bSBDiv73hjzYFNXrrq8beGiTRtn1zDmlv84Fs/pF8sb9G53ah6NX/YFuC2WeQIMBirpiBVp3PxbxFEB59e1Vk85a7lMEN6e+fEvpkJ1rZIDbWrXbj7bLmqcc1qRQ31lcocHhdP9Ng2Sj3ZG/pdadMY19En32xHZWtz2yNGDJFiuQZxbSB01VrsUt1SR5J3BGsjyKpvjuX/mlMoEUU3R15Co5C4YUx2t67eyWzmXNZ0zUKPLVpqdpP19QPif3ttzrStipdUNtdEv7REHmQRNEKxacIxWq3Q5l0qYd8kbDAyC2Z5ix5VigbHOQh+QQjG6l1rgxtcnhd1UX41ytfxk39Q== 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=LnWI9cyz5bxIUfKOzuRftWlcW7h7ghIcAE1pLlEgAAs=; b=aVfJeowEVvJFZOXxZZGhFzxLm0ajdB6HF1NvNznv7eLQ+8VyiHC5dRqFSHu6P8ZGGTLfZtRptkXRfaZndFaigcxpP2HMY3P5vw/GyLzcGWtk9El+bOvQwvd2UAsUvNdS2mRcvgO5cqTOPlKmQ3JZbGTtrriI7KtjP7Vu5S11V7IriItpUEf5nVx+aAr0MbJOS/Pn5/wbCYAN4F+elB7alIH1QvH9VK1GQ2UsCf5NwIkSRZvP4T0+ux75delMOBC+EOcZ580r4VvPekG54Ud2HTzubviypXVlXV1B6IlBkcerbX8AmOUmQYPB2LRAx/EbYcn17i10nFUaXkose82P7w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0183.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.30; Tue, 28 May 2024 02:49:19 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Tue, 28 May 2024 02:49:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2024 04:49:07 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [dgGe39zRuL7rfayUP6iRBdRSINCrmfW6xlYEizk4/+s=] X-ClientProxiedBy: ZR0P278CA0161.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240528024912.3310372-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0183:EE_ X-MS-Office365-Filtering-Correlation-Id: d6a965c0-c683-49c3-826b-08dc7ec0c545 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: OLBWAdM7zY7XzKbQB8an0NwvtSTVKctPSmz0dkyHnaiU6o/abJYsiaduc7gTcCJ31DHSx4FXqj7DK/jEACrWyja84wYRfNnpJWwMO2w0VmZdK7CgXMTd0DncxEIYM92/f+E/yMag9K3f1rcO7qUujNpwEB+Uv+03f74ouq4yd76ZKRZqV5QruyAXoakTCWxl0KNTYYiAi/YG0jYpjeH3uCZE3lLBJe7OYqbXuYL2BRw/ANpkGj2luxx9rJ9rvgXvyQRmWoRGQ1H3lJj+m1vQ0JKaZ78irI0weVo+arhYwc70asEbDaIRsNlrCizKhErpE/jaRfdWcPW5fRGrLO5l06IIMCUYThuwhCp6KLCsctEVWZDdWD69Pmw2YWKE9+Y9nN7vSVGTDJDMSPioIOdSytwFPrc8lguGqcVQlbVwZtbGuYEojY3giZJ/+tAmw8zzdfP1VzhSMoeieEDQ8YhBa/Hw/N7KPUyfvbyU+CUqkgivlBQfmHgEMCLz1wxQavXjk7leqHCvQPSEZ3LIwTD6H29VQTPcZ+wbmpLHc2I8RCgQGMhnljaijD4VeoNV4c/mmHI/R2w2a96o9+84KUGZlJqFmnXnH5dqZ59injdHLSQhbgBFSWnuAZC9oc0UKfAj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /8lKzRypNFY9NSCCUt7xmw61oKPW9BDPvob1sP4/q4wIrqc4Fdo9As+AQtOV3A3n/tnct0EPQlrYvWYZz5iUxLIrjkqUmquUj44cMXlKJsDrlAGd9VJeAf6NGFf5xtYpJ4E1htQspm6kYDUlNFsuSbSOZzi4zV2LZoNrRoylGUkX/BO8r1hk7DUCkUnCNdWQ+ga1DvIfw3lVPMcQlqz2a2IuA65rvATI098hNDQayg1P8Pj6K7GU10byBoLj3sbJWStlxZiQZaBaDR+cKIzEk3IvYi7J8jxZO4QWg/u+sZDRr6/hIo/jw8ffGe2zoxMT+RqrkPL4eo/bL6/cLBR32qwnX+6vprQk2bZrQ4Bnp5rCNgG0nHi59K5QoCNXJcntgT6LniKSOCg21eTXJGmDM5EMq/7iYNNQeLy/q+uOP7GyfBKYeaMtPDaJIMHEKTpq/1E7xpzUs2eiLpqC0oX5XpX/AvTAvtKg94C9enyYt5GW5CRODf31y5LyJiOoI36IRA3PWIPgliXTQ+b8I2p++31ChkIBcMj/x7V/wEkBEuNFyjZQvEmjLsKB6a0DwGBKEjQCJrFplS/l6OBbo95lBP3LJTh7xGhkCc0dZLUkC7Je+vrmZbuBATPlKITNRX5j8w/AztK7jkiyJzNbPQqC3HSeIPrhH5opW5Tjhq6I51lc+LEf43YN3yDgPD5GSUZKaomj0MgUwrAIsxyXisBRuwEejl+ZQWpqTopiSygnpDDhDfpeJVJk7r2JxKFARay/sDTiGOp7al99YwS6TNCNfXmT2L/M6R3C9SBhUQxGckzagMggq1gWhZDg+TPRMvKowNRE4Ba+r4ZH23haRvM1zxgcaAAo3vaZ/HMTmlMV8Xs/01TmxWO6BPOcwrvf9Pe8BVuyNitBYZJYb6+xNPXaN7uDcdShpgK404A2kb8KYEUtREyNCBwJj5MBW7CQkexS2hF+eQPkTO8xRY92YYI3CxeQOze8pES5alWES8r6NbUq2dlrj1xMt1xzfhokYVd6zAzQ73aiSobMkJAvVL3G31O7EFq0sbycLUhNXj5n7RKvIx8EbP2VLWCcH/HqhvpbcQM9MLvCpnivbi+NYqtv8y9M593gB4A5/BYVRiS1He8s/xbGY/wsOmPF4gWkMCl6vPMMi9iuGRJ9eNqJYMbf50KvpqHePmfWpGCj3H+OdsOBXQBQbfiLK3J8Av0duhLU/W5tgzdOdq8Otk0+kCau/3NU9i65eSpHDxvmPsM994/qOkhZIFMymldHYfLLmT5eXOQKZ5tNdUhD2pp5OhWTcg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6a965c0-c683-49c3-826b-08dc7ec0c545 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 02:49:18.9687 (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: AM8P250MB0183 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/vc2enc: Constify slices->main context pointers 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: 0mBhs/8Mi6QK Signed-off-by: Andreas Rheinhardt --- libavcodec/vc2enc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index b496f67d3a..4dcf423ef1 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -106,7 +106,7 @@ typedef struct Plane { typedef struct SliceArgs { PutBitContext pb; int cache[DIRAC_MAX_QUANT_INDEX]; - struct VC2EncContext *ctx; + const struct VC2EncContext *ctx; int x; int y; int quant_idx; @@ -116,7 +116,7 @@ typedef struct SliceArgs { } SliceArgs; typedef struct TransformArgs { - struct VC2EncContext *ctx; + const struct VC2EncContext *ctx; Plane *plane; const void *idata; ptrdiff_t istride; @@ -527,8 +527,8 @@ static void encode_picture_start(VC2EncContext *s) #define QUANT(c, mul, add, shift) (((mul) * (c) + (add)) >> (shift)) /* VC-2 13.5.5.2 - slice_band() */ -static void encode_subband(VC2EncContext *s, PutBitContext *pb, int sx, int sy, - SubBand *b, int quant) +static void encode_subband(const VC2EncContext *s, PutBitContext *pb, + int sx, int sy, const SubBand *b, int quant) { int x, y; @@ -558,7 +558,7 @@ static int count_hq_slice(SliceArgs *slice, int quant_idx) int x, y; uint8_t quants[MAX_DWT_LEVELS][4]; int bits = 0, p, level, orientation; - VC2EncContext *s = slice->ctx; + const VC2EncContext *s = slice->ctx; if (slice->cache[quant_idx]) return slice->cache[quant_idx]; @@ -576,7 +576,7 @@ static int count_hq_slice(SliceArgs *slice, int quant_idx) bits += 8; for (level = 0; level < s->wavelet_depth; level++) { for (orientation = !!level; orientation < 4; orientation++) { - SubBand *b = &s->plane[p].band[level][orientation]; + const SubBand *b = &s->plane[p].band[level][orientation]; const int q_idx = quants[level][orientation]; const uint64_t q_m = ((uint64_t)s->qmagic_lut[q_idx][0]) << 2; @@ -618,7 +618,7 @@ static int count_hq_slice(SliceArgs *slice, int quant_idx) static int rate_control(AVCodecContext *avctx, void *arg) { SliceArgs *slice_dat = arg; - VC2EncContext *s = slice_dat->ctx; + const VC2EncContext *s = slice_dat->ctx; const int top = slice_dat->bits_ceil; const int bottom = slice_dat->bits_floor; int quant_buf[2] = {-1, -1}; @@ -724,7 +724,7 @@ static int calc_slice_sizes(VC2EncContext *s) static int encode_hq_slice(AVCodecContext *avctx, void *arg) { SliceArgs *slice_dat = arg; - VC2EncContext *s = slice_dat->ctx; + const VC2EncContext *s = slice_dat->ctx; PutBitContext *pb = &slice_dat->pb; const int slice_x = slice_dat->x; const int slice_y = slice_dat->y; @@ -839,7 +839,7 @@ static int encode_slices(VC2EncContext *s) static int dwt_plane(AVCodecContext *avctx, void *arg) { TransformArgs *transform_dat = arg; - VC2EncContext *s = transform_dat->ctx; + const VC2EncContext *s = transform_dat->ctx; const void *frame_data = transform_dat->idata; const ptrdiff_t linesize = transform_dat->istride; const int field = transform_dat->field;