From patchwork Wed Feb 28 19:07:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46631 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp130379pzb; Wed, 28 Feb 2024 11:06:18 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX8ibOFWXUDsHTOiZS55aaFRFSzTa9UN7Hc2aJc82h65ZIfHSFb96EEZRcfs1sEEYOrymvw594+dLDMHEGzmB2qFjesorUazFoGuw== X-Google-Smtp-Source: AGHT+IFuMYIBWYHM6lHMQQs3OkWJC1kDXmoMYNbOvkc6/Qk1EMc8is3ehGtVBByYKsY/Ccy4Xu+a X-Received: by 2002:aa7:de11:0:b0:566:4e7a:fa23 with SMTP id h17-20020aa7de11000000b005664e7afa23mr202848edv.22.1709147177857; Wed, 28 Feb 2024 11:06:17 -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 m27-20020a50999b000000b005665d76147bsi1041445edb.333.2024.02.28.11.06.06; Wed, 28 Feb 2024 11:06:17 -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=jU+j0GQZ; 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 B1B3568CEE9; Wed, 28 Feb 2024 21:05:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2024.outbound.protection.outlook.com [40.92.58.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3982468CE3D for ; Wed, 28 Feb 2024 21:05:51 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YtFoLxzv47mZo9Ht+3YdH/brjEknYhP0fCIQty+OM3VcmUxrVY8K6JSjlsbEnE0FouC34bwDj8g+6QCTBeR7ZfJKd5sEXPhAooCjuVnD2kuM5GyTTp/nbzUY/ldRLU+VB3mb3v1F5qsadmndUiZlsvRicbg/EI88x5ehx4iybiKl7TMfa0kfwDcAkqh7BAjFYDvC5ULYM2zMf5RpdZe2OXEaJWiXQJXaB91oy6fESQ6pU1CTr69I6XfqbZUlEhvCwwh16uW4BXLsYjaEy9t+YMwIE2T3W0WVSqRaxl7s9dMt7Z5ENPd7oWzSZbIN8yG+NC18okZrGDBoWyiWM8U9lQ== 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=S4ZDoDejvkXTJVrzyvyLQYoL4hZ33ILfXqqgL6ETKn4=; b=C7RB2XVbMFzqy9d6Hk3Xl3M/P36Uz/l89KR6ZFOwNLk2IZcBP55kxxlM3pKb3tAi05HZW1Q7yI2VgfoRumMHQ7HAvgtwuIXIEF72kNZKFz/rPF9fCnw5oOW9gXvw1JEVZK0sEcKPtAiRgKIacDQujV8hLSrY9N8ELtaw0OIKQXupi3sPdHJ1SEOznRKIMIrQ2H7Uwjrhxfoq6ERTg/Uzh8+4iP4zUKtJP+p502VHSXXM4X+U6eyk+45SjCVjFUNY7jMIpudvP+owqIXcAhiqceumDXq1dPjFgKNUL+LIuNW5UfyVsH1xeWA++NU8197w0IMAGju91pJksMn/NcdmyQ== 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=S4ZDoDejvkXTJVrzyvyLQYoL4hZ33ILfXqqgL6ETKn4=; b=jU+j0GQZgesgpR0hVGCWkxF0Yyv4i+yHfaMgVEKuJVyMnLeYy5S1hhYvUDxvUZkDnUkjeGXOzu14cx5HwkoqcJGLASE1adFGMhOyVuyA1H9q3oIB6NeykZWXHWYHfN1mAPbwV8B8EpBQ4EvomZ9gp5ERyc4GG/2WlT0zQz+fTr+6U5kE2ynI7/XQV/0qN38Pwo/2WHVFdaQ30Y5dz4Ppxfdc1fjXhXDGGoElpPr58TIo99p7Qah52pPJV+yUBC85TLqDsl9f2LJsyqXw0Lb6IfETvB8rW8jSF/AVhkoeS/aEq3B2YGMD+H5vOE3Onu8BaAYewixwINuy29W4rzkZyA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0563.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:298::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.39; Wed, 28 Feb 2024 19:05:41 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Wed, 28 Feb 2024 19:05:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Feb 2024 20:07:31 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [s8qt3MBZbAUE0Cd2ZqMxuE3Tu2t4HRllAvtwf4inoeQ=] X-ClientProxiedBy: ZR0P278CA0152.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::10) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240228190731.2210822-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0563:EE_ X-MS-Office365-Filtering-Correlation-Id: 5648c3f3-09b7-4ad9-41dd-08dc389041e7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +8r+HuKq9RH/9Q3H8Wt6mpeStaHxxdvYtrhGRNs12nS3I4UOB8vQqCbxsh1j/KOQ0h3gvHYCeyj5E8gFdYf7SrbgnO22n8NkE6e7YfI3nbaXjWTpERzUdg/bLDqgKV96zFspnkqZRFOCwrz59WsSlu9LGgiNCgSQYwxnXGuYnofeLz0y9/ZFtwk4LkDQ37V/mGRaPRDOt/EfVQUWfG+6/eooiDQEBw+fokRPljYAPaffx+0d48oH71ap3IFHlCCE2jYqx4GJiYfm7LaSEbFf0pGGsxrDriTJ3LqapnTGdje80t8u9ByHlincoMZQvMEnpAVaIkhPZQZyHNfGkgbDeaegxpO+mnVkpcYT/zkltHLvh/FR6K/pIJLYOAp7mcnPzsV8bOZz3dhPfXJ5uhYMx8RwkIFfelYnp5omivtiV6iBV2Cg4mSjTMHfFW25tuJ5WtGtzDy+snwasSaS6/euuER7ouJuRqHxGDokXh0NW3XZ66gzaO4cTuPrhcHHofNRFvcPerL3jsnFxEqG4/Pq79o2QKV7HPuGcUJiMgA+TTNdXvVK1Jl9vzOzmrH2MQUH6qn33MzcwFTcFQrve9R9iHGt7m3SWBCIX6hM4JYPXGqfIkp+sk8leY5rsVxOefNu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kM/134XK9RCTjaklKqLRmWE7eJRP8KuA+4j1+DTsnkes23POdXTwDNac6/CLg9fxTfKxMCWdEgQeJ4n8Hiq8MrV4rmwChJIAEIHjt7+UhM7AGBCp1WAh5krMgwQ1OIY/5+Ejg88B3drVPr3Ayyn5Ee9wCha7johJi9jey7lXrzrbdGi54+6jqz1vy+xp0vYkHLmWhOjvj3rnBNNmO9vqkFPY/pK58XyhGIJD1dttyD/h7Kxl13c2vHsX1psoXvpD7HlEqwdQ7FMiycvGjZQibCgkpbjfO4gCSUs3ctHdZMQtMMmDMpZ+gkvy22pP9gQ0amRsNWpaBGMoEG/Ixbhq6MionDdE7vuuyfDlOT08rX0ByC9+3hUIp3UvsD09s3LA9mQWa1QpxLYdB/AHfHzQCDpMPOw6X8vh20Q9VQi91UZv0p+nVDLQAwQSm8o+iajBSi9AOhh9B3NAFykHa+TrKxOZ7zhoMnDpWQIYJA4ssnqe4PD4pvZ2JKHrVBitAeQGj9SM1YgIg+ZC90tbcqSoLbP6tFLL0hZ+t0ciHlYaVfocxqMeyv4Mj+mp6VuPIpuA9NQ7ZiU6Gef/zMn9aKD7yjhotEHE/1wvfnB/RWajoE5bRIEANLykxr/bjqr/9147XPV5yFSHeX0+btcFeihLLpr590ir6RK5Z5UkSdjCzAyDqaH7OWBDoKBTJahVgqqJC5gun/rB1AfBfp6ZTVKWOubWbk2SegRze0bQEWvhKDoYS4Nh5ZyPQHmZXTO2vRBWijVkBTzXZjUYeEdMgZPRpMsae6czG+3l8fTsA77z1OCxHWKSxFXA8+pXZyKszn5rPnK3FPTLxIdpzZZvP/gLV0Iqih62lb903mF2H9+sZ+BBA3HiVhP9kuc8dkWoU39JIkrLc87cObuSDswwqWhQglKv1zMURhvWt/jP2CBYK8LVF+nhXK6d47290FZG4VsuBDr0jCa5tP5OR4Stx5b+g4dNsNeuJXGuokz+0t+g/g/fK8A/n9qmBalSBdzOeBAVWO/V/K5dB8cv3TiW/p6MCiamiRQzSk14L/rdgzt9SlOi4SvVmuAvdMv2bQJfeP9P3bNJjc8eXybNxYMZHTo+AYwL3j+UOBb9hv3zz1wkYF2Zl7wdCqd+cFCV8pLIu9Ar6UzNk5Wuzj8HsNqGQIfh3wupCYGvqTm5R+VRj6Jf8JtBy2O6EwKKfnU+EXumYN+04XKg0SvF4lG3m4LmZrvaVv09T1eaA2UxtszlNguK/e/ZUxWRH474bpETq0gjlCTwj6ejwaca//ylv52G4vv43A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5648c3f3-09b7-4ad9-41dd-08dc389041e7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2024 19:05:41.6779 (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: PRAP250MB0563 Subject: [FFmpeg-devel] [PATCH 4/4] fftools/ffmpeg_demux, sync_queue: Constify a bit 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: Um+8G4+oP3nO Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_demux.c | 2 +- fftools/sync_queue.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index d5a3dbc1d2..29f4a26224 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -161,7 +161,7 @@ InputStream *ist_find_unused(enum AVMediaType type) static void report_new_stream(Demuxer *d, const AVPacket *pkt) { - AVStream *st = d->f.ctx->streams[pkt->stream_index]; + const AVStream *st = d->f.ctx->streams[pkt->stream_index]; if (pkt->stream_index < d->nb_streams_warn) return; diff --git a/fftools/sync_queue.c b/fftools/sync_queue.c index bc107ba4fe..0e35b5b1cb 100644 --- a/fftools/sync_queue.c +++ b/fftools/sync_queue.c @@ -319,7 +319,7 @@ static int overflow_heartbeat(SyncQueue *sq, int stream_idx) /* signal a fake timestamp for all streams that prevent tail_ts from being output */ tail_ts++; for (unsigned int i = 0; i < sq->nb_streams; i++) { - SyncQueueStream *st1 = &sq->streams[i]; + const SyncQueueStream *st1 = &sq->streams[i]; int64_t ts; if (st == st1 || st1->finished || @@ -524,8 +524,8 @@ fail: static int receive_for_stream(SyncQueue *sq, unsigned int stream_idx, SyncQueueFrame frame) { - SyncQueueStream *st_head = sq->head_stream >= 0 ? - &sq->streams[sq->head_stream] : NULL; + const SyncQueueStream *st_head = sq->head_stream >= 0 ? + &sq->streams[sq->head_stream] : NULL; SyncQueueStream *st; av_assert0(stream_idx < sq->nb_streams);