From patchwork Tue Aug 9 18:34:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37198 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp426054pzi; Tue, 9 Aug 2022 11:35:21 -0700 (PDT) X-Google-Smtp-Source: AA6agR7DjP0p9o16qiBZZcX16PDzgWPMYkpDahTXuI/ZBOdLjv+/qqVhQ+6A36BYB64uch5QmdQp X-Received: by 2002:a05:6402:23a1:b0:43d:9477:4d57 with SMTP id j33-20020a05640223a100b0043d94774d57mr22666914eda.168.1660070121771; Tue, 09 Aug 2022 11:35:21 -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 di3-20020a170906730300b007309e77858esi2734197ejc.575.2022.08.09.11.35.21; Tue, 09 Aug 2022 11:35:21 -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=sfYit6ca; 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 9B57A68B810; Tue, 9 Aug 2022 21:35:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2104.outbound.protection.outlook.com [40.92.58.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB9CC68B7FC for ; Tue, 9 Aug 2022 21:35:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WWaIsCU6KMUQ+FVNmhjNG88d8eU/NWB/4LevGcYsaY81oLMst5on0gbgru7VOESMDjb7/+OtIfnqn3oqUjLSggIuaSgchOhATja2E3wH57GFqAhDkw7+pQ63RXnPXLGKOZ6yzd0ZVHDcih8BhhA+Oa2DNgnTkOXIMEQmxxT+v6S5A1BjkkznzSAhlEum4jGNiHymBfDC44i12NQywqJn5XABXCpiv4ht/mcyiwWEs2V+PJKypfxuY6kjrrLbCxJmDII2dHN7PknoRAbt4KQF9RFTjlRsmjAwKJsf/1h475StkfT2UKkA2TlbVyuqquU91crJgn3GLqIkJvBC3UoTsA== 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=u826QoGpExWfEn09wWp2bhG31qW+KKBEvznGM8Xqb34=; b=k5uO7eCYFMuxpntD0cths9N37OeFmZajzZYihYFoL1nDXsxTaAwU4JYwqE4G24BKMWXegizhDja+hCd3mECHtqZAMLz7U55xQhFz/nGZ3U/2XtqOSCMX114A9i8h5vph9p2nzfS+4aH46SGtFZgv41DEMVcgs5+ht59gVKIq5tKOc7ZXf9XLQLJP6ZArEu/nkBQeDIoPARm6/u43jJ/LcDAbzta0wlHdYIWVspeyZ8ybYGEz8hidQT4Ob0lwFIezAV/8C2h7OwzaAeRGTDLqOPcZ1G7ehhsSEunACXSd0EA0wsm/DRbhNoieIfCgERZlJhmtZeSl8TvkFD2HOLeOTA== 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=u826QoGpExWfEn09wWp2bhG31qW+KKBEvznGM8Xqb34=; b=sfYit6caotFOat9RAa2g0wdjJZ4Kcli4G9Pbbt0Sjpl1ntm0GuDmBg7R9AvrzES62ZoOdng6NQoyWrX7PaNmt2yNdhf91Y0i+ypTWwHbUx8biHSsonVfKID8fwDgJwrvxoUvQYq+P5qPZc0Qe9afXONcWYXqy/P/zGW703ElSqKrBGLgEj/F16avSeIMlBKen1u4RJVOn1NSnK2r7TspMukF8L/dhNJxGAByLV1/AL4jw+jGUsHsddCuFz5RAwYfAg6Zs/yL4yG6P8VKRqdqe8OeiJmBLihMkLG66AWAIlIEnKux0Zz5UzaMAXkcpTrvWgv7CYt8OYVddKa/76Ha0w== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8093.eurprd01.prod.exchangelabs.com (2603:10a6:10:276::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 18:35:03 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 18:35:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 20:34:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [7MO0Ymf80ZVET/QLkx21koggT34RGRyX] X-ClientProxiedBy: ZRAP278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809183453.220687-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4892110-0a3f-4946-80f4-08da7a35dfa7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTC4ziyQch4o+p4arh48fV8IAHsZ+dKmdHwS+8yoZ91+YytfJMyQzzEM9imV2rRwPUt4s3Fx07mp+o2NjB3/LKmFCG0wfke3Ys2WdurlZTMHSRLYTClasD10E/iHf7TG2U0Bc22xpqUnJswaKizG+Fj6j8UXE2L1U0+26qEvop4+uV3dR724ZD6Hr8QylZPJ3djbP9wLfeRyqPlerGauYuIgp08t7kwMfovHrScOhhcwC5Y6STZ4DhshYxzUoRGscFIWHC5HCOMnBW0nxeZTaU/l9f4nIXzCdY/Uc8J3wByprwHlA7gSpMDYz0QNAXUsoA1U1iclcm/ZcrrHMrcyvhmGCz6ew86rsZaQi1xl8i18lVwgK4/8VxcY2wmoG/lSZb5hQU3aKqJnAYOPmu0MJ0oTMdnKRQ8YDwsavQyh0b9liHXGKJ+y5Z7pfdE/7XtKoZooodIRkKFZlWQpvntFNeGi0zSD+U3LDR2BpHGYMUCsVuuCiqBAPO0O+28EmTm6ZpLKu7QRsSveG/kRDzyffaL0B/cumP8rrTkb5eDOA/5FzYi4UrPTW11wPgCFCRIsiXBA4+MA6tpurqEa1bfiBMF1iCFaVslbFd4GL3GnH52aDBQ580LBFB41aFOcJ2vy6V8iiyNxO1OVPDTddzw3aX7p+fKXkOV580FQlAhAy1UIZiShaegg3erSvJQj3QOzlUEJMSVZ9uuhmt/cp6MBFqP46yfuUtGrJvghozgLWssTTHaVrSXJEqvkON4n21JG8s= X-MS-TrafficTypeDiagnostic: DU2PR01MB8093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LjLTXHsFsBHAb/0fLKqByWfPyRLrDU6wrtKzsIg50PbrQmk6DUTvg2BEUnzkFp6m+71h7Jhpc6qtSdoNOSqzL2qfXJTqo5xwxfcWCmPwSjzBc8/Qp/pnVjuI8U+Q4RB4vrHeE0+YvIf+Sg5u9fpaZNeV6W74gVldzPSkAtAkoxeqjApDcS32dDhz2TJ1mZttLEPds/mX5CMG9+VndSJLiibVaatRo3UqPlqyC09UzUj7PZa75cquugbaQgc/98obZDeeADd/8UjsPRBWNo7LaGKOZkyV/6nGssvEumNOQrEajud07VxBJy2v/lwsNZd/6igWOgazEH4vsOnwq/cz3qev0NA14JSxqR4IcnLVX6S5sM+jrYBfQsOvzlFyaA5jmSEM7xYc7tt8LQLfiwC7qYOVtTv9qIq0PqLEvdSup4hyscMNt6Y0EpZNUC+UqwO4d6Mq9fNVj0e5tql1Ifg0jptV5t29jCmjoZfeYJPILpk8LQ+QTtaGYks88FhlmS5+cQUJfoaTGZgMc+bAEl40pTiLnaiV9AlaQg/jGPM+XZ7JzPmtV/o46euacm+M6UUC0XiFVGNksMUyIUJleVagn6cqwUrX7JIduqKWykXberAt4RWbezNDF/QEM72K4MwTyLFf97wqCIem6MBRXBJBew== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bCFOWG6C/DWxu98GFwV86t9GCwJK9wlQWClzLIZ7Dfvy9LccrJQhuVgru8pPWMZiHA4V5uagR/wr2FTZOQ1TT4MSEdrz+VkX+qmUj1eOpLGlsY6Pc34F+/6BsDkRde9BC0tlM7TuiiuAdHVkMbaayLnpngCvmJO5I5p7OqknHLuX4cgNxg2DfcQhVYLMR74IIqjaRHihHk7fodkdXHnkf3qzy90y304jVGBdmTEQSQnonSlQWfeLPQwpv5ombKnqAdbe0MQGof/WXzQEoT5+AKOHsclJ8oN/hXlVn3xKJ6CSHemK7IYB3DKGqzwfWEwza+Ii/hl/7/9I1TAsW83IoidtRI5c4YxLC/arWX85RcNOrMAX69atwp4dtAYsQW0oP/D5AJKECTGyhmVjclvVcG5CMzRfgnIDRUbkl8WTTgBkjTuiR9wQ5Nku3+psc1XbbhR27eQqMDLioZr5rp1uCQXqoqXHSKlRRlRl/KPoVsB2AwT+vf6lmiG1dIqscWLmtdrHm0VoiJn7i9POa+2jbsVdyLiSsygYaMZYXaxkTj0HDkm9olziSwuXf2gEkyMspJSIi3Y4GZkOpCKuHfQowIsGW/iohd2rlXa6VoxoJ7HouU/kg1yPhCPiK88MDFxD7axM0AB1/oGYrO0TMRyeUfBjd1rxMtNSPkde+nor5BgpeqoUebI2L4hBEDPcGTxB+SKP7HDpE26T840WnFBwPObwMQrW5Sq7J/qRtlOBqW37jIomnw0GJO2RCt2f37RZvhuhxKYoOyqvINpwip5I4rzaaPjslQAY3yZveDSbmKj2YxX2AEdPsDWsX4BaqRsglruGZj58sE1kEcDcMiLRk0ugD46uZ+wtwq5aYoVWvyGjw0Dp5peI0AoJ0RzUrX8mYpIxdjk8RZAAII9Trvx60URW8qzDnpCVCPkHKOf52s9b1T8hHG8MqGRTwJ2GaIBbrrXa/1ZDqbEDkEDtd7bGP9EGt1rD+yFHPFtyCEzyrM5B/QgLLXzloB40paevaOUfBpyPofEmtnuDrHypk1RTAkC+J70SaoyACxHNbkTN7N26cZRM+cPUjPZfTXMJC40X91Iw+pdl8IDhNWfYHU6coYDHIp/dpm6gTLeJuH+ekt3crRY6izB7ineBB7PN58DPllJBeE15Uuxzac6DxU4ABRT3/xAxawDLLqgs3xqCYEIVNoM+SR12iYiSuYaBbj7k0DGP0xvOTXioX/ZstKZmz+R76GNaVtO57tEtfRVYwQeCrlaii4fFZDq4d7e1iJv7Gy4At/KNq4FkhSGpuCNLYWa6wOvdVZG2k6VsSe6QTko= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4892110-0a3f-4946-80f4-08da7a35dfa7 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 18:35:03.2998 (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: DU2PR01MB8093 Subject: [FFmpeg-devel] [PATCH 3/9] avcodec/mpegutils: Constify ff_print_debug_info2, ff_draw_horiz_band 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: bIbXwMlMPFVr Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegutils.c | 11 ++++++----- libavcodec/mpegutils.h | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libavcodec/mpegutils.c b/libavcodec/mpegutils.c index 395bd38ff5..ff9418232b 100644 --- a/libavcodec/mpegutils.c +++ b/libavcodec/mpegutils.c @@ -49,7 +49,7 @@ static int add_mb(AVMotionVector *mb, uint32_t mb_type, } void ff_draw_horiz_band(AVCodecContext *avctx, - AVFrame *cur, AVFrame *last, + const AVFrame *cur, const AVFrame *last, int y, int h, int picture_structure, int first_field, int low_delay) { @@ -68,7 +68,7 @@ void ff_draw_horiz_band(AVCodecContext *avctx, return; if (avctx->draw_horiz_band) { - AVFrame *src; + const AVFrame *src; int offset[AV_NUM_DATA_POINTERS]; int i; @@ -153,9 +153,10 @@ static char get_interlacement_char(int mb_type) return ' '; } -void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_table, - uint32_t *mbtype_table, int8_t *qscale_table, int16_t (*motion_val[2])[2], - int mb_width, int mb_height, int mb_stride, int quarter_sample) +void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, + const uint8_t *mbskip_table, const uint32_t *mbtype_table, + const int8_t *qscale_table, int16_t (*const motion_val[2])[2], + int mb_width, int mb_height, int mb_stride, int quarter_sample) { if ((avctx->export_side_data & AV_CODEC_EXPORT_DATA_MVS) && mbtype_table && motion_val[0]) { const int shift = 1 + quarter_sample; diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index c92f9192db..386110bb8c 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -127,15 +127,16 @@ enum OutputFormat { * * @param h is the normal height, this will be reduced automatically if needed */ -void ff_draw_horiz_band(AVCodecContext *avctx, AVFrame *cur, AVFrame *last, +void ff_draw_horiz_band(AVCodecContext *avctx, const AVFrame *cur, const AVFrame *last, int y, int h, int picture_structure, int first_field, int low_delay); /** * Print debugging info for the given picture. */ -void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_table, - uint32_t *mbtype_table, int8_t *qscale_table, int16_t (*motion_val[2])[2], - int mb_width, int mb_height, int mb_stride, int quarter_sample); +void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, + const uint8_t *mbskip_table, const uint32_t *mbtype_table, + const int8_t *qscale_table, int16_t (*const motion_val[2])[2], + int mb_width, int mb_height, int mb_stride, int quarter_sample); #endif /* AVCODEC_MPEGUTILS_H */