From patchwork Thu Mar 28 23:10: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: 47614 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1667212pzb; Thu, 28 Mar 2024 16:11:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVQx4AC4UHKSHhFpY04xetiITXx6TZXkdCLqjvZR31baZfH+66f3FekzrwKFsNW3dRSTwjDi4BkGQ+SyU1IFP9z77uIXa7h876Qdw== X-Google-Smtp-Source: AGHT+IHo9fuG7+V87CzvWku0ZDZqFgafF6V5x8SlnD7OXGBXecp319skkKNT6TiOaySQ/kNaBixN X-Received: by 2002:a17:906:f196:b0:a4e:c11:4e28 with SMTP id gs22-20020a170906f19600b00a4e0c114e28mr355438ejb.1.1711667475192; Thu, 28 Mar 2024 16:11: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 y17-20020a17090629d100b00a4e0a824b8esi1122806eje.49.2024.03.28.16.11.08; Thu, 28 Mar 2024 16:11: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=hyKSfutw; 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 DD24868D1E0; Fri, 29 Mar 2024 01:11:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2024.outbound.protection.outlook.com [40.92.75.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 996AC68D1E0 for ; Fri, 29 Mar 2024 01:10:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fx6j8lPYOPCuDziAqYbwg2C1lO1g5Ae2jo6qwK/PFwOgGRp4dWzaiszBkSBzbI/raOjvFpi6HAdFCFgA6H2IAho+pVXuX9VCr2t448jhca9huDTYVB8CygA9jrWPiPdb+ghIWfQ14hnwVheUrBj+rylUZVYfx4VkoYNH9ApfIfx5Z64AR3KiNAD8TOo4YRzDudaLtuKHFP5e+bfOUdAoaJxRhrJzm8rqUCw7BRTRSVEstLK9FT97q8QZ1u7cLAGa7P3kJpw7KeErtDbAkuFE9hoofsh3GqKhvhkpXcUKTm0dCVXePxYA4VhXMlVnYJSBcbEfJsuvAt42ukH3iWx+ZA== 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=5ddmSE11EhocvQ3wsjtTziw386wHe50QHBoXZsZj5/I=; b=GxBwaG9tOHq/+CpVKLBFUOD84XPA4HXjITQZhiqd868bo/EJnWBGYQaM6S5FFom8DYYb8f7Fywad2p2Up3pfa7eG/RUEYjC3scWcT8y1Wtj7ugNir5JT4GNbX+XL2JLsWLvqbVVT1uzIST1Sc/lBcSADko7KIq3vUxvsX0A3kmfkuhbdP9H8tk8aY6thJEdQzcHqF5CAiAXpgMmkgoyoGwOs0Mx1JokPz5AAJVDiye4oXVpNxcvcE5hwx9NEvghuSpQlvM40Nvm6NRPC+uXhV5BAfd6seCJaPEatby8+I5RO3nxsw4oqzoT7vUOzDamUxE9kgrCluXdZXcHzTHPyMg== 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=5ddmSE11EhocvQ3wsjtTziw386wHe50QHBoXZsZj5/I=; b=hyKSfutwPekYJGhVVI+263cRkVMffdKxeRSPgE2D30hm98euukF5PTg7dBcrCckf5h2J1tpI5y3wQ456dGKSIPlwa9dLHGK0l26Ytlz8pJatDTr4MJXbf5OBRqRjRXb3Y7t0DUEYlqhPVlBwiSsomH0SjFNL8aWz4yBDHssfEcjZLAuRTRUp+5Nd+41b98kiOcXM/tEUNuDgwSHUiNtvSEpTKakYI2nbaX7M8b5ZROaNdB27dZnLrSPmJuB+omAZDK2yO1nVWapJypoJlOgBd2r4iAog6bcGpabJqOidcuT2GcsAn5gDUI8bZDWRI+4B84FHZlJfG6WxVNch7pQHTA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0553.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Thu, 28 Mar 2024 23:10:57 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7409.039; Thu, 28 Mar 2024 23:10:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 00:10:31 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [9pdBkfictqvozk1M9lwKPae0xam1FX0Lf9Z+XOpu7As=] X-ClientProxiedBy: ZR0P278CA0093.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240328231047.2202386-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0553:EE_ X-MS-Office365-Filtering-Correlation-Id: e963a56b-81eb-4f33-f26e-08dc4f7c52ef X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OBfK1S8aA/zyJOJdvkwcF3MiGUa1aoAZzEHqb6oYgRLbqmuZwvtuCqFPDAKUJKrw3gicFY2Nou5h6tsrpYd3PuZrqU5wjaCEgTeqFC+sD4vuON1/ECJSruKOvtWoqTQFLrZ8jf/fBNkaDR4vowkbz5bQ2cvL8zpGrAgzE1DJCw9YmEBG2HPD7akekUxX0Bcao2kgqOA1EMJJZ2w81AFyu1kWwD20ICKOpzP/dUv6rZF65DE0qJR+WWJ1XKzCDsi51v1NV8jhN6mbudPhWnvdGQln3jZ0E+Zdl8KJMDRVLoMNpO/b3B0JN97DaI8WULjgmUda68gkThTxkStfU6DturOeW5iSfu8X3RRqdYLZToVrngfFMgK6rGKZZQbAyWT5D5wDql5pG/ahWCAC4En3iDSTlhJ4Bd0GF4cSqkynCk36Ym/1kaDBnzHnBrlhrkBgInipyjwklCiMdW9X0XB2r8bFr7NUJ8OG1pe1LpP19xMEcUMJOdNkxfaj2M1YW4aHlg+yap9xQkkr8gT/FZ4yhWkofuvFKmUHixO0LgufpvFIIzF0NIE+Oi4D0xnr75b0oMwNw286i5dBNBmiplWW3a550R9IrFrBUODdZVb41kR47GrE2KejGKN98sZi7hHO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: H1dPk/B0rqAdRNe/IbGSkqZKxr7kobs+5UIoR0QjqRq1mDR0yECPXMQP/pq10FAy3XrR5orf7duwkFuiSdkBqk2dUlZzDLM9JNYLq63MsliqRSz8+cAHBTTRaJT2kg9QBoXDH1BBBeLAcUuEPpJERk2TUtbILT9IfR8pVCMk5eIzLHMpkat4CJ1VVD5VaqU5T+JgP1i1kdBgHT6O2DY9dsoDqB9EcJE0fdnYInMG5YypZeBtHDYuPy1bMBZ3HB2eR6E5aQrPCB8C/JPSUpXN2XAb+HMw3iRhWt3V5aB1kL/s5+z8H4+qcbNgLddAO5BwOXfVRnh8YmGzAR2Nw7ho1KUETFAyMKIr/iGPMHMX/nDIu2BL1J/yCBOzOZEYfGJ1NUMDJV/N/Ceab/3ko62vzpcgNn0Z3oeZEex5NBGwmgR2ys5nd+9fJ4+hSMDjoW258XuaTMVxhOGooWquAht2ri+TSCCpG0kLW2pkhIFcaOnYq5oSIl2aXs3uErhvV8e74wVX5zUadgquWIpJJIgAGfV9dx3HXVObXPIgYDG5Jrka/hwTPgQJozVv3D75H+pxMl1mli2t2aMpCHpF0/mlYUhHY0PDrGNKtzr9ojIQd1860B5K+hbmHZXAbHGauckMl2BuANDr7Cll3MEatwihpME1R99BJIuISGFhep3Psx5rG1z1rqkY2GHr9XzDedt9yFO5a7swFeCzWdoV/7Ith5vkTSdg+cWV3hGvhWEoxF2zfrxNFJiaY8BPa4YnTEW84rlmIAUlJ9S1lEfLnOGkQIM66ZKN3Zbd8u5TaV/BZqhaCYsDSIC7EY0Cl+iisTI50KZPJq5EgdmkyOcN28tdCMLdrV6n+jSn9ZJnCGtnOzo4QgOIbK+i6W3SxX+LAmv118rnlcOmMnSCqQk4C72FqUmusD13M2NvYzF6+9lmDqZb1b2+rfNpKPaM3PsucyY0G/jOGoi1J+AyMc+E9Lht4IF8X1tALY2so+2DzD+yVbnsig1X6J7pcG0uFBY5/LfCef0hTw2lkoMimFpLHiPIhzuCQ3zQf4SjYc+2EzhAUBKhVzPS4h1hbeNCqxMMxz+A8ISwZMKlOexOSqLgej81xyHp5uA0zx+FaQHES0V2jkwYasdEQ6AIgNmbPInFoiWXy7ay+xDnBlMQKhthHGP/ZbK2p5hvP4OPDPXBqQmOpuXH7rmx1IKbsUusEceoty3YRHpH1GEx3g7WZj1Z9jSCxlk9hLs7+4sGPYdpP+wHphlk3/a5xme9BCfDp7aovfXlxim77/shdbPJO6xygsQ1PQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e963a56b-81eb-4f33-f26e-08dc4f7c52ef X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2024 23:10:56.7898 (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: AS1P250MB0553 Subject: [FFmpeg-devel] [PATCH 02/18] avcodec/pcm-bluray/dvd: Use correct pointer types on BE 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: vM+QiFKvN+Ep Signed-off-by: Andreas Rheinhardt --- libavcodec/pcm-bluray.c | 5 +++-- libavcodec/pcm-dvd.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c index f65609514a..235020d78f 100644 --- a/libavcodec/pcm-bluray.c +++ b/libavcodec/pcm-bluray.c @@ -167,7 +167,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, samples *= num_source_channels; if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, buf_size); + bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size); #else do { *dst16++ = bytestream2_get_be16u(&gb); @@ -187,7 +187,8 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { do { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, avctx->ch_layout.nb_channels * 2); + bytestream2_get_buffer(&gb, (uint8_t*)dst16, + avctx->ch_layout.nb_channels * 2); dst16 += avctx->ch_layout.nb_channels; #else channel = avctx->ch_layout.nb_channels; diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c index 419b2a138f..319746c62e 100644 --- a/libavcodec/pcm-dvd.c +++ b/libavcodec/pcm-dvd.c @@ -157,7 +157,7 @@ static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src, switch (avctx->bits_per_coded_sample) { case 16: { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, blocks * s->block_size); + bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size); dst16 += blocks * s->block_size / 2; #else int samples = blocks * avctx->ch_layout.nb_channels;