From patchwork Thu Sep 7 01:05:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43624 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp297914pzh; Wed, 6 Sep 2023 18:07:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPIlsuCyXJD7iILN9mz/E8kEUcpf1XbsnzJWhoeIIHp6wzZYFFY5woJhuxMt2ASf0Agw6+ X-Received: by 2002:adf:e5ca:0:b0:313:f45f:74a1 with SMTP id a10-20020adfe5ca000000b00313f45f74a1mr3712190wrn.51.1694048835865; Wed, 06 Sep 2023 18:07:15 -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 r24-20020a056402035800b0052bd48275d1si9949299edw.668.2023.09.06.18.07.15; Wed, 06 Sep 2023 18:07:15 -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=ht3GJGOR; 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 7C76268C8BC; Thu, 7 Sep 2023 04:06:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2049.outbound.protection.outlook.com [40.92.75.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96F9868C809 for ; Thu, 7 Sep 2023 04:06:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I7e6gAb1ABKii8iZ5Vgo49AGmCtYMVLZd81tlSbEcM9jAemxXwvwsgbjHenWzH92XfGLSqGDdRZ+rqtWvXah3ZU2qRF3tyU8ectP246jgdG/bxANauFdlROJUmCrr2S+I4nAtgjAqSheBegoqXJxi+0jwJgxdLl7Mp8HCQ9GEJBdB5GG6GoFP9uyWFOC+hVA2xzU7fVGaBcMN8VfX9L3ZxxsYQDwnDYpt42O0ABNFr1+vGCiQgvdXyKGRsBUKCQmnOwKIz5Xw2Q1tqyOqCO74hHSkFTWpIWlN0wVnbyzvdudc799GlYbS4nwCIwLET7tFunXn3NCxAymFrKPhUff/w== 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=OTCVSryP5QpvNVkEzftOyyPNT3PGCjOJsm+CajePEy8=; b=kXuJDHUncPub07G7m4rWYs4CW/702dGXABOiFAaQ3lnrKwO6bDdpv0MVRn9wnZ/SOi9Nlp64P74gVE9gFhX8KVp2s1FQGj0V/LTqlJN87I7qGWOYTSPIykvqxbF2z79so0PZ70xa8FFH6ueJpvtRW1o5dNahVHvh6zE1XT6EraQz2iYHMcr54RrYxQXBwAS2lRDLYZ6pkCXoBS15rH/q89yTOrAazrH2+EMBL9OTt58s9sK09a9yiMtPcChXNhhuTYqLMV2pmieM/2b+UobtWLzEodTDfN9tjA3GEhqOewGwTXEgpS64CsGBuvmEUhbNEAI+V0oKkLwjKgePTP5ayQ== 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=OTCVSryP5QpvNVkEzftOyyPNT3PGCjOJsm+CajePEy8=; b=ht3GJGORkrxP7ylemSAjS/wkCdKiM4yoF2XwH6ld6WchzeJiI8269wRkRlXIq8YyMj8Vs5+dXQZ1RK9FvAC7iDCRJ4UkVltdrVCf9LjjsRZ/KR0ndNqckBQ5ku9uyFFp2ns9hqEPHERcPbsXDdDeM5V3ZCYXNDF1ly9cUZJ5D1Xh0CwUWgRSX/NSX6ErSeNYNxYN9+9ddMsaf2z2/umS3MyN4Zb2/gn40iNP7kY/9fMl/9YI06+kE2RASqyNeQaByG5FnT1NKuLIRddH1+Xm/adpm7DMfa3+2j/882rjkq8tugSNkMfcfrxIxtr6QOG17F+leq6xAKQvc+2yc+qsiA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0336.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Thu, 7 Sep 2023 01:06:05 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.034; Thu, 7 Sep 2023 01:06:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 03:05:33 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [IMCB3HBYLIK0T/DE3Ff1RLv3VxgSi5sW] X-ClientProxiedBy: ZR0P278CA0096.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230907010538.488975-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0336:EE_ X-MS-Office365-Filtering-Correlation-Id: 375441b3-368c-4e99-92ec-08dbaf3e9ca3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VpXkY41fYKVaVz9cC/1+5Mi2/J7h1z1fXX8KpqWED+Plq3x9HxzeidIT6GzpjJ6EebeuYSNJm8qQc61zYpGBVDinwO8DAwuR5FTPyjYdo9DkYOSlLPVD1iAsDlGfzdw74F+to0EYuUcKJ8oASUvk0O5iI1sHzYbe9gAPCvTYD8opQ559vz0cAP2WsDvdq5OxFsFVICAnCQx4u1sJRtcYdv9ppzvhqWyRmmfvguB/UZULYKaJRwa953E+ZMmuLoYP/dS9HDwGIEiOrlUN799AZaOECsZ3UT994g1NWDbanQtmjvh03NBmSK2yqNd1KN9aR7sWjPGnNdKWHI7VI5AcPBLd9Zgj+ITVC7wQhpmx6kG598M81pUPAleQXdRajJkLePeyHXlLmemc2y4yyRKGE4wm0eXcHqe7B5qwpCZFRD2i+muuhbUBsxfMiNeLyaqKwZl51kq2DSt6q1FXXwz3MlN6DlAZJl2bqBg4zzg6N+PBFITgLlV7OOeJCKOQt8T32+ga57Bpa9h+QdL1QJ28FLY1qFLgJsHQrjTiVVSpVecHdL4ziHOkIsQ5/u5RGPrV+9VS9a7vLBNxP3zggrbW/iMEb3AUhbrChE8n6LUE6qU= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JnlCkN1QA+T8pCZCBU4V1GWVDndbvr5Kq0qXxAXCI7Gl598/4HI86FzruH7vfJAa7uPqVf7M6SCZ9kc5Xufbcei5q5gA6l0CQkqYzVaizmAmhlMWEB+BO3z9nwDjv+Hd0CupLTuAE369fCLgBAnKzKqUMfjGUZ2zqFbv5ViBIPOf+XjLfB0BUopQkOGfPXXWI+yzB1VAtKpPfW+9ZcHoStM+OaGa9QEKi4uDxykreuaxFb9mZY2+KV33esOkKkLEUuZAM6n+kSesHxll3hG7DlZr5X7v0AyA878l8XSK7cokEzy+5nKtmffenZnUNAcxmWbLzxcqohkTNxw4YNYAdFmS75/CynhWTkhTkmKQncVsp96fLPspI3D3gfuMmQJD9YIV9i7NqmmdpvXmUXQzddi0sk0Gys2pzPQ2nsBoD0ErK4UaUYcvjh3EX527xU1wiSLxApQOAqqLkhB6fsnPHCKyaSkih4etF9BGpOkEurqD09cJVRrcI4hamCNTGVqvzLZDQ8nbi7qOyuv5GUHmYJFoB5x8xt9tJFgnul9jUi/+58MwcFhiDlg6HE/3H9j/vnLN4/UuFJ4yHNOuX12kEhcO45WcfRVlyl8GgXSM2ZYDk1qS6PMPr5N4/i37ySIzzKIZ4MUb38GP8kARAknakv3Lr1XlZDpbRadrgOSjArnR5c4DsvR4GYgdt904KHhaCRF1YgnTEdXksiBuCfyb9/mAgTXDo2J/ffe2LajE6GhNjKaqphgo9RYOT8guBJTOVUXfA68jQIw0mcUNPj3T1QMZmBqMS7MbYHzYiN1EIZgXM7w6o6AkSjJmrKC2c8iDPmRWZxgCmER7T/4uQfRZrI7kBtlzS5b4yzWNOgKFlcct22vpK5pt0+1bKoTYcVlVZF4Jb7zWIRtST9FYh5ioYAlyKXJWbKMEPdTo3DzDHI0b+JllyveeeuT6uw36jZp20HKQgNm0L9rMcXIqfWKh1v1hS2cNoi0bMryMeSrQp/5rvhnvJz+X3wZKwdSbZz1aNw8j4cRlyZzaU+NVgd+vQFBxLaLraJt+YhDRTJRem9o9rhJ1WAtSpOuGee2KUnVUs9LxFxsaWlB8NZ3eUjzW7mCqtdqhNgDBNjj6+jCKu0TfqAX3YwH7bvmqUmGm8y4LS/o/+Ec1mJuHfQR1ki9rqhw4cUlf3XgoQqsIk79lDgm2hSGzc3QXGDHbrA6QlhWTkcTf+PF6lnH3GmGJputnRwImXF12EulncIVsuwlTaKq1fNerlXwDqMLTayKUE6Li X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 375441b3-368c-4e99-92ec-08dbaf3e9ca3 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2023 01:06:05.5884 (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: DU2P250MB0336 Subject: [FFmpeg-devel] [PATCH v2 17/22] avutil/samplefmt: Constify some pointees 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: kwjFbTCUeVW7 This is the samplefmt analogon of the imgutils changes from the preceding commit. Signed-off-by: Andreas Rheinhardt --- doc/APIchanges | 3 +++ libavutil/samplefmt.c | 4 ++-- libavutil/samplefmt.h | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 048232b2eb..c9f7a61e4d 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-09-07 - xxxxxxxxxx - lavu 58.xx.100 - samplefmt.h + Constify some pointees in av_samples_copy() and av_samples_set_silence(). + 2023-09-07 - xxxxxxxxxx - lavu 58.xx.100 - imgutils.h Constify some pointees in av_image_copy(), av_image_copy_uc_from() and av_image_fill_black(). diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index 6d3ec34dab..e1be5f0547 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -219,7 +219,7 @@ int av_samples_alloc_array_and_samples(uint8_t ***audio_data, int *linesize, int return ret; } -int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset, +int av_samples_copy(uint8_t * const *dst, uint8_t * const *src, int dst_offset, int src_offset, int nb_samples, int nb_channels, enum AVSampleFormat sample_fmt) { @@ -243,7 +243,7 @@ int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset, return 0; } -int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples, +int av_samples_set_silence(uint8_t * const *audio_data, int offset, int nb_samples, int nb_channels, enum AVSampleFormat sample_fmt) { int planar = av_sample_fmt_is_planar(sample_fmt); diff --git a/libavutil/samplefmt.h b/libavutil/samplefmt.h index 6bad0e254a..43a57a422c 100644 --- a/libavutil/samplefmt.h +++ b/libavutil/samplefmt.h @@ -246,7 +246,7 @@ int av_samples_alloc_array_and_samples(uint8_t ***audio_data, int *linesize, int * @param nb_channels number of audio channels * @param sample_fmt audio sample format */ -int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset, +int av_samples_copy(uint8_t * const *dst, uint8_t * const *src, int dst_offset, int src_offset, int nb_samples, int nb_channels, enum AVSampleFormat sample_fmt); @@ -259,7 +259,7 @@ int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset, * @param nb_channels number of audio channels * @param sample_fmt audio sample format */ -int av_samples_set_silence(uint8_t **audio_data, int offset, int nb_samples, +int av_samples_set_silence(uint8_t * const *audio_data, int offset, int nb_samples, int nb_channels, enum AVSampleFormat sample_fmt); /**