From patchwork Mon Jul 4 11:02:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36648 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2743173pzh; Mon, 4 Jul 2022 04:03:02 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vtWzwn186p6Lmgud6K7hDSgE1X1AnMeMuELl1qkpmDzg1l/ty3JfKs2r6GTsTGCuB4Jz1/ X-Received: by 2002:a05:6402:1e90:b0:437:ba7f:da20 with SMTP id f16-20020a0564021e9000b00437ba7fda20mr37864719edf.313.1656932582501; Mon, 04 Jul 2022 04:03:02 -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 d38-20020a056402402600b00437df0e988csi16774699eda.222.2022.07.04.04.03.02; Mon, 04 Jul 2022 04:03:02 -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=WHQz6yU7; 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 5F7F668B994; Mon, 4 Jul 2022 14:02:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065108.outbound.protection.outlook.com [40.92.65.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2D5668B8E8 for ; Mon, 4 Jul 2022 14:02:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nt+junh5jxAWKS0YENxZIDu/H+gWwGf4RB32/fs3gFE+DEXbsROAPRUcqNVYFzc3B9fPsrUiaCUJtZueuzMJbTbc5oCZf0VpV1YngpaXRKnxRjH0YUlm8r7MhzvqphbHlT4V4VpeHX6xQxVfBQHI3/27a/haZD4vFdR+GqZGeuYDNUnLTE4CqkFq43XCqIxFlPTjAulMi4HnR+dlC1NVzdmRK2TEwSlD/+xUtqk7DBc35kJ377qjcFtV34sdJbg7XnQMHFqzJT1Cvi/H3vvwoNT8vaITjPe93Ab544Bbr+cz7m3VhqTR00uY1O2AYJpUtjabDEG1oMPRLR4Og7xn3Q== 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=ai72euYwyCE+XR1cwK7gkuyBcGqLhwticOSwrmjtY5A=; b=M9D1XOcjb7Eh8fhKLp3zJGkFKYZFb8sgYo0m/Ur4m+5x2vT7Jw68GA5gNgdDE6jAfqnioSdjk8mj79pT5h0izbTMVXwGGNPtp2VdEQoqhAST5mm1mOosj7cXloGafyhmg5bn6n1o0JWA3ASBn5wmCB4R5ZIQ7P2gq20F1WcKK0wsAWBr6xysYzrPZqX2RZmVVGr47bv8G5xujeYb6JD3bymsUdUsWsvNPi2Mz+/F88LqypzE7jjaMLvGzWL1ulbQL7+F9JKjZacPxohZOec6HCqeNqOS/7usbfXoTaJBETQQnihoh/yGVJNWepkkurNODXGbRXoAt0gHi0vBi8U6Sg== 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=ai72euYwyCE+XR1cwK7gkuyBcGqLhwticOSwrmjtY5A=; b=WHQz6yU7c/mBxjHgXTpVcwZtZESm1uGhCcKRrJruMRjarsPglQ38EldgwB0j/Su7idJTohqKE6GF/vRQKKxr+vkVT3fQ5Snu23mXAaPhxf4H/+6QOsRM9IVuSNLe0AHs7O6A8K+L4E5nCPJLemnudyT6lj8W5DF4sJEj2BKE0Hg3efF8yNR3grTRFLLdjsTdW2Uv4pXSQPMMXQoTm03zcvadsGqe/J1DVUlv0chtvsyHi42gM45JbXwW3dbHBuNwgOwI8bX2S9NNBM857dWdk9L6uW86xcxUwert4rsyvdWYDfeN7egO+NxPiNGgvSTfhCFMcjQN8v3MDcBglvTHXA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB7PR01MB5048.eurprd01.prod.exchangelabs.com (2603:10a6:10:2a::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.15; Mon, 4 Jul 2022 11:02:50 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5395.020; Mon, 4 Jul 2022 11:02:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Jul 2022 13:02:41 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [z647ddwNcMrOYL+ajD4gwgS5Q7GfSXt6] X-ClientProxiedBy: AS9PR06CA0281.eurprd06.prod.outlook.com (2603:10a6:20b:45a::30) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220704110243.812264-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 69db7d0d-ed2e-49b8-d1d3-08da5dacbc81 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUxDAI+Tg+jRet2hczaTcPcVMeNcUUurseiKMyWoxDJ0B9B22Faw8dxfNYmQqjubd27fDLzmcJZ3Uu18bZhwy8LUoXOzUDmrgHuzSjadMdREIiiH39Cs3pAXvFS+CPrKRosPJgcBkVNArvFiCVv4GKBxdVnFejVZlk5G+8WCsyNRkw8hheTYf3Z+nw2WcwYD5kPgsj3Flj4q85P0kMhlbPsPJTvcC15BEQmDgP64SmIxIXFYYcwYGzj1R1xJo5upeE6odt93poqjB9IrjtnIBZW5k+4T6hNotzjepjmCruR9JVlcdCp2J+6PYVzlCifdQLjFNUhNmfbW/GQ1mirBM2N2XEKoNtN7EDzoZHkuHUKDVOrH8WEFB9UJwr2g7LIH9yGrxI7JEbXHqNUk3Mxhn7aY5I1odCQxjciDJH062v6daCIeg1/jtudGb0C/bAT0geTVIeO+j/GhFpUUg3cbsEpWsq8XQCZDO9Ejz9CiArsnRAT6StoCE+VCZOQWxMnpe1twsQ4kMTUduvt+8aD5jC+VDQSz9QOrctaaMzJcqfwGvzGZOwrMCRPzFMncLiGlEmLugkGwY4bRe/Nc3+dDrkuFxWUXFOj6CmrSbOs6jaJmCzW2/vaNoWMwfjonPqlmzo9qHtXn75W9wwZeCuHye0tgUy9kuWjvfWfitMctaDfm9HoRhA3eaf4hap9pnV1eKn55JmppkPSPsjLL9sh3W4kFAicUUwI/ZM= X-MS-TrafficTypeDiagnostic: DB7PR01MB5048:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9xxIx04RhwDCeafb/j53IEeDMpOxo8LPoMATR+RtdkNaakvMdNqentLwYXnFw5+B9BpRL217PTJxf0Lm6HwnR07MB9+cJch5iRY/wq+hPP7EK8ZPeqks2yDwnTX3xHlTEqe/4pzssv6wm5gyYKb9yHo5UNeqP09dn9jrv5hqy3oUW+oKZSLUR51g4kBzg/V4P2vaMLqUypVKJM5OdHY6HqSH5Tf0z0pmXUR5BGy+qdDM3ffvrA6x/G6SFQ6mt29rnzxqARIqo12CgBPDBgvI48iuCiOs7+7QgUZRKYvFrmjhqi7NnsCOuvFaKM6fFgJMH1MWskT276Xu7skSskKqwRhk5OZrTCHkvvMpTfm0wdzQ3uiNUfQIjFrm4lGjvxXYqk4Gvi9FimSgH62WAxwlOTtVFpyHZqosB7PCOiKzvc4L4HnCLsviDEBg5bjmb72Rf7a59k8awyXtLGEQTh2ryUPWaRUzzo8isJZKAFYBt6LAuKePnUWNdAD7B3rRlZX7AbUtzv+MuTTskzaErH1C8Y6j0eGjpMphx5Hu2uy1TKSMxXcLHyg/CaILJTXLPVkK9HuTjRFNHCfoMh2q3wHpCOSI6LtOTnIxqrHHr9wovqNtdI5zkiPhcgYnMugKSzhBBT35uqhvX5EttC3aZUxclA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: myspSbKBfgFe06V5IpAXBcHKwKpZ9P1nYIOHRIsfqGgr5Cui1t1LyA5siL+d8Zjh+Tdbh/SOKUPwrhePFfj7TNZjY6faTpVDbEGvrgNq7Jlgyi/4ueaBDC6cQHH2zDHo7E5KD33JFFBEUihlvQ2McmhUKIIWrYP2i22M3PWK1mbsBh9zOCvXreyeTbaZ629CAaTSgJmCP2DFrUztINGqGbTwkU5AH+0RoErxnpX6tY2sZitddRSI3teAngjgD/W+GKdGfajLauV89sRfia1V4CJwAwN6rebH7ydsLT5DYdPl+hkFfG3EMM+QJSag3jmJQtrVFtl4tYH08FU5OlTKeW5FlUNyHmtO9fy1Q+ay+VuZsQwDiLzrzIn8qHIDYxX3Lmi/vDw8oEkMM6WCPW6YtzhpvopSGbFl/HFEVvk08l7MfHIxM5/mnE5RXkQ19Kp6agIF0MG1YXP3dH/Jbn1Y5iuj8UJlexmsEqc/jKy9vwe1NYpJYEqUUroc7jHYFahQ80baYBLLX7XAYvC+udEbb+wXXwjFk5qBCKb2h7OIxCBTLCEY0ObaAZ0nCkGxu7j/EBH8NW/7fsLYek0Os/FcOheAdo4xnxCNkCDUDIxNQP5U79ZLzQQOG2u1S4UTbyeSnWgWf3VVm+Xc8OLKWvrMqkp/XbXoihIxgdu+A/+PfFIOhMFFuGQVsDD4uvC6G7pTFE4ZohPdBCCwUJ2LpLuY1eStOJ/4cTpMRNSuZzIsXZBZqdt6KzVv8ZlV33lTNmYUQgLwnDRHvfwaNByNYr4k5uBnfpkf2LgZGgjm0ohjEhoUHMnfcy7H41oxUW8D4DtNzUWopN5j2R1zEIfvIgKEQ+8Vq/sZsS2kMDq6eIYV5spJO0wzLEnx81fWvUlm2g3Woc2X7EqIO02bUEN1s0jGgppTpxVFWyNMEM6eX7D/IIeWCuL8+119BvJ8vfQ1KVT0wlM/xqP//c6j25aRw+rsPUytK39aJTIIhAl6hNdTUDQPLrZlOZGvOrgyl3A0qnR7ZoVp20HSdXbyHNKlJ2P6Zn97rrfo/NQ3ht4pMmvp3+H5pQtBd+zElPBh8H0sY3yHdKJha3rwYVvBGIWPHboxhyz+d/SmPIr/PC9Wy+pWPE5nCGZEKd4ZhVkGUTaK+QyoprO1kcQycg+k26DvDUULss9cORsMnWcYYXMM4vUH0hpxHwgvu5zrh5z9LajZCWzKrTnrlNhioBPEIzIUjTWuVAGz+GgpLOecBWrYfl0xqWAr9XfaUNKg9tuOC+dxcgB6lvj45IV64lfC0EWRFEQJ9LBD3xh0nV+0gr4N2PYcRrw= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69db7d0d-ed2e-49b8-d1d3-08da5dacbc81 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2022 11:02:50.7517 (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: DB7PR01MB5048 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/dcadec: Treat the input packet's data as const 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: 202wCTWQRo6i A decoder's input packet need not be writable, so we must not modify the data. Signed-off-by: Andreas Rheinhardt --- libavcodec/dca_core.c | 4 ++-- libavcodec/dca_core.h | 4 ++-- libavcodec/dca_lbr.c | 2 +- libavcodec/dca_lbr.h | 2 +- libavcodec/dca_xll.c | 10 +++++----- libavcodec/dca_xll.h | 2 +- libavcodec/dcadec.c | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c index 34b5b63159..2b19807ef4 100644 --- a/libavcodec/dca_core.c +++ b/libavcodec/dca_core.c @@ -1797,7 +1797,7 @@ static int parse_optional_info(DCACoreDecoder *s) return 0; } -int ff_dca_core_parse(DCACoreDecoder *s, uint8_t *data, int size) +int ff_dca_core_parse(DCACoreDecoder *s, const uint8_t *data, int size) { int ret; @@ -1830,7 +1830,7 @@ int ff_dca_core_parse(DCACoreDecoder *s, uint8_t *data, int size) return 0; } -int ff_dca_core_parse_exss(DCACoreDecoder *s, uint8_t *data, DCAExssAsset *asset) +int ff_dca_core_parse_exss(DCACoreDecoder *s, const uint8_t *data, DCAExssAsset *asset) { AVCodecContext *avctx = s->avctx; DCAContext *dca = avctx->priv_data; diff --git a/libavcodec/dca_core.h b/libavcodec/dca_core.h index cb8e38a94b..a01d642e77 100644 --- a/libavcodec/dca_core.h +++ b/libavcodec/dca_core.h @@ -245,8 +245,8 @@ static inline void ff_dca_core_dequantize(int32_t *output, const int32_t *input, } } -int ff_dca_core_parse(DCACoreDecoder *s, uint8_t *data, int size); -int ff_dca_core_parse_exss(DCACoreDecoder *s, uint8_t *data, DCAExssAsset *asset); +int ff_dca_core_parse(DCACoreDecoder *s, const uint8_t *data, int size); +int ff_dca_core_parse_exss(DCACoreDecoder *s, const uint8_t *data, DCAExssAsset *asset); int ff_dca_core_filter_fixed(DCACoreDecoder *s, int x96_synth); int ff_dca_core_filter_frame(DCACoreDecoder *s, AVFrame *frame); av_cold void ff_dca_core_flush(DCACoreDecoder *s); diff --git a/libavcodec/dca_lbr.c b/libavcodec/dca_lbr.c index 06c10b96f5..2b8594cd75 100644 --- a/libavcodec/dca_lbr.c +++ b/libavcodec/dca_lbr.c @@ -1156,7 +1156,7 @@ static int parse_decoder_init(DCALbrDecoder *s, GetByteContext *gb) return 0; } -int ff_dca_lbr_parse(DCALbrDecoder *s, uint8_t *data, DCAExssAsset *asset) +int ff_dca_lbr_parse(DCALbrDecoder *s, const uint8_t *data, DCAExssAsset *asset) { struct { LBRChunk lfe; diff --git a/libavcodec/dca_lbr.h b/libavcodec/dca_lbr.h index db7a676c31..9e1abec0b4 100644 --- a/libavcodec/dca_lbr.h +++ b/libavcodec/dca_lbr.h @@ -124,7 +124,7 @@ typedef struct DCALbrDecoder { DCADSPContext *dcadsp; } DCALbrDecoder; -int ff_dca_lbr_parse(DCALbrDecoder *s, uint8_t *data, DCAExssAsset *asset); +int ff_dca_lbr_parse(DCALbrDecoder *s, const uint8_t *data, DCAExssAsset *asset); int ff_dca_lbr_filter_frame(DCALbrDecoder *s, AVFrame *frame); av_cold void ff_dca_lbr_flush(DCALbrDecoder *s); av_cold void ff_dca_lbr_init_tables(void); diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c index aaccb7a43d..17626b3614 100644 --- a/libavcodec/dca_xll.c +++ b/libavcodec/dca_xll.c @@ -1040,7 +1040,7 @@ static int parse_band_data(DCAXllDecoder *s) return 0; } -static int parse_frame(DCAXllDecoder *s, uint8_t *data, int size, DCAExssAsset *asset) +static int parse_frame(DCAXllDecoder *s, const uint8_t *data, int size, DCAExssAsset *asset) { int ret; @@ -1067,7 +1067,7 @@ static void clear_pbr(DCAXllDecoder *s) s->pbr_delay = 0; } -static int copy_to_pbr(DCAXllDecoder *s, uint8_t *data, int size, int delay) +static int copy_to_pbr(DCAXllDecoder *s, const uint8_t *data, int size, int delay) { if (size > DCA_XLL_PBR_BUFFER_MAX) return AVERROR(ENOSPC); @@ -1081,7 +1081,7 @@ static int copy_to_pbr(DCAXllDecoder *s, uint8_t *data, int size, int delay) return 0; } -static int parse_frame_no_pbr(DCAXllDecoder *s, uint8_t *data, int size, DCAExssAsset *asset) +static int parse_frame_no_pbr(DCAXllDecoder *s, const uint8_t *data, int size, DCAExssAsset *asset) { int ret = parse_frame(s, data, size, asset); @@ -1119,7 +1119,7 @@ static int parse_frame_no_pbr(DCAXllDecoder *s, uint8_t *data, int size, DCAExss return 0; } -static int parse_frame_pbr(DCAXllDecoder *s, uint8_t *data, int size, DCAExssAsset *asset) +static int parse_frame_pbr(DCAXllDecoder *s, const uint8_t *data, int size, DCAExssAsset *asset) { int ret; @@ -1160,7 +1160,7 @@ fail: return ret; } -int ff_dca_xll_parse(DCAXllDecoder *s, uint8_t *data, DCAExssAsset *asset) +int ff_dca_xll_parse(DCAXllDecoder *s, const uint8_t *data, DCAExssAsset *asset) { int ret; diff --git a/libavcodec/dca_xll.h b/libavcodec/dca_xll.h index d223133019..d7c1a13ec8 100644 --- a/libavcodec/dca_xll.h +++ b/libavcodec/dca_xll.h @@ -139,7 +139,7 @@ typedef struct DCAXllDecoder { int32_t *output_samples[DCA_SPEAKER_COUNT]; } DCAXllDecoder; -int ff_dca_xll_parse(DCAXllDecoder *s, uint8_t *data, DCAExssAsset *asset); +int ff_dca_xll_parse(DCAXllDecoder *s, const uint8_t *data, DCAExssAsset *asset); int ff_dca_xll_filter_frame(DCAXllDecoder *s, AVFrame *frame); av_cold void ff_dca_xll_flush(DCAXllDecoder *s); av_cold void ff_dca_xll_close(DCAXllDecoder *s); diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 38ea8733e4..498e0c86f3 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -151,7 +151,7 @@ static int dcadec_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, AVPacket *avpkt) { DCAContext *s = avctx->priv_data; - uint8_t *input = avpkt->data; + const uint8_t *input = avpkt->data; int input_size = avpkt->size; int i, ret, prev_packet = s->packet; uint32_t mrk;