From patchwork Sat Aug 13 15:03:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37254 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp391274pzi; Sat, 13 Aug 2022 08:04:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR59TJn1v6IgGmwPZPITOE08iXlpRXoNjKqhb0Lk23xPIYL/npzEsizwwO9zMY3s0VKv4sT1 X-Received: by 2002:a05:6402:612:b0:43d:5049:4d0f with SMTP id n18-20020a056402061200b0043d50494d0fmr7602483edv.127.1660403050708; Sat, 13 Aug 2022 08:04:10 -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 go8-20020a1709070d8800b007317ed6f18bsi4792794ejc.986.2022.08.13.08.04.04; Sat, 13 Aug 2022 08:04:10 -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=RQdJS3f6; 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 9581E68B945; Sat, 13 Aug 2022 18:03:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068024.outbound.protection.outlook.com [40.92.68.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 440BC68B825 for ; Sat, 13 Aug 2022 18:03:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PRKylZYNM/xGfX8Bu2B8aC6iavMg+Lj2IUCuxv3GfFQq9oEBEyr+4ahyDjXw0AxARDxkSVOQQ8J4mVD2T/HzBaOdnABUOONt6juE1A1FodQIHfLCNpjs4CsUfetUF7rYukq52j8fkEGw8fkVZ8BNl3VGy3mLg3HLdJJKKJxG/Rw+1GWgILGrFxInWzlwyPKnvXTVcMYEZO9aPvqoNfmc+ZO6hBKFWDyWAg4TsLpLgEnYpvLL0bGOdl4jsOg2T5/NIUb4eq5XTtfUVr0a8EzFYLi2of/BiSx6VbWVafgr2cORGLwK7Dt8UZUTKMatARcMbHc6KaK9KLxPLeguiubKUw== 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=ibNoHfYs72WNIz80aPPrvFCfnp2Z5N9d27NqhJegJQs=; b=bQutGOpyvdoa3pt8NjVtMhwVLTN+OJZrE8KxMs7VarvkaXJQI5/2n+6KJN3qE1j+CDC7GZjEPRFcalP8NkvUDtSnH/PfIIPKuHv6/It/uXJSJ24UV/rILLQQJK/QW4HadASTkpnOhOchfpib3Xu/E6F4D5LxvvCxQb7RSIULaZHwRFAhnDT6vA6quOFBfeMT8v61iT+X/qa0yGiUrTFxhSu3OPYq0iD8KaFtYoURLOfd8Y++XGzYrALrgAGJpo0Z7LM0rd4WsueI63AUo7/N5wXLZe3FIqgcL4DI+EC+9oQCwdEtC+xsV8sf/Wfahzhtd4XnThuAYlpkl4nOy2RATg== 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=ibNoHfYs72WNIz80aPPrvFCfnp2Z5N9d27NqhJegJQs=; b=RQdJS3f6XM8Mf3riun3iNgwiPNvI35I55BfWz7QFnh+6ZdqQr3SuaXZ2tMZdyHRDyM5wwe/dQEDn8X/cAgyBRw8Fl5UOjb3Elj8812N/j7dimnek2ehVjbCHPSU9znHzadSDrhikIVj73RHOqGNCRqaX0/0Pm1PcgeBbVX9Mak6zxPnJBb8kfaMJ1isivrbuYiNwgcloSUoHvRQ5aELWa/Otysoj28enw5HebZRIebFj4j18fpDQi7C1Rr4C1GR/rGUJFHAe36SFrwkyvAu28JiEfz+YvZPsgnm2lb64DCdjxojNWVgw3OQLAf2x40j9HQSTXK5Qv5ORFtgqDwexJg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AS1PR01MB9370.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11; Sat, 13 Aug 2022 15:03:20 +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.025; Sat, 13 Aug 2022 15:03:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Aug 2022 17:03:05 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [uJZySs/rKVlnueh8G5CLpwtR9xIA1Foz] X-ClientProxiedBy: AS9PR0301CA0034.eurprd03.prod.outlook.com (2603:10a6:20b:469::23) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220813150306.1116206-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e81bcd9b-469f-4476-a26c-08da7d3cf5e7 X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8mMamuGb261gBblBkR8QZSDJq0jCDsoti8yp7kOC1QTGMtBbK0FSkJinDbEV7aqFSU71q4IfpXLXWKhkwwPHmBptODGnGfS2MXcrrixkJvWXrfOHtHQGTYfxa2mAFVtPfCza0aOECkDxddL/VL5aPL7he2AjVoh+NB6ICqsdRdM8YHzoT/DmhodgOK8vVXFsrM5SJppPH3nZqWKsYF6bZu6AJ6Jhb9eW3OTLpLlShBMKp9Af5w+ivdQyz/2fmyE0lJuh++FRp8/wfZCXVNvRCgsi2a8HSz3IbgXH8l2SFSRNhMOJYDlDoCTAIWDtPiuIAYIuChcTpgWPlqYvalzFh1wnYhD6fLPeZW6c3q3qSysbpBIsxdaAxKHOEnHeiAaqtiPaZ95UR+mV9JEDhsykNkM8XcTk6GwF6nUqTaH87/S9zddvhpsNXR5EpzveZ4lI8VSDF9Lw7mmcQZghUUR/9tzpUMX7JJdxp4LfcyXWWIbg7JLxl3vUZf/g1/9/+FksbeGmxCZqoLXRR+oEPUoeQiEsva1pBHkwa6HZt3UiIukGK6LJTfal6hYbj7OedHa5gRR1xYTsdGihg44UC8VSxSsCHzJ0DDVxYbZC+tj6m0FtUxVfgkzGdZPWC42JrGWSMPlnhr8HRlQzxvNlap53z+21oFWrdDa3pLqYOtfihT9hA== X-MS-TrafficTypeDiagnostic: AS1PR01MB9370:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZpPEdZcda8++gRAzDLE8dgVxgsaw15wO+5ohysawRW9F0P5MNXr4x6ljKY+6pOoS2/W9dPChBplsRbZcJzi8jk1iUWcMmj8Zm66Ah/xg+wPEVcDsKTEO/ZDyjUQfmTQC/rvz6re4b+pAFg5cWEHqXFr0Kmwr54jIVsUvptJAWZ2tQ4qB/D/DmV6otuRIN3JgVBxvHW/BliYNJBQHcjnTWLOBJv2q31/SztDCWad2ox4aiszJBHtEOWtA8uX/lgFiiMtGVERIHrNWQZaN6kjHhQZYjEf48EWKc3rrgd+PTFvxp3fkcUr08rMuFEcd084tiHvvHCpN3RyoSja752csJvf/kFGGGesfH6vVW1EwX2MtWWS+wQ6artG5ClQK7caaJ3TzJw+Gqhm4cklKwdLYfXt9L8iaWiHCP0nRG9gr9Kxg/gjxmeiu9L8Pr60vRJZHRJTJmAksGLebPirEeWrgDJdRMi/W/XaaMQeaxP1m61cq1Q2uramLsHdYJFj2fAkhwrqoDmOBXjBYnmqXudOogS3xIJdHhs2QrLb/CsTq3gb7/bK+QCkTZNBI5ZtYQRnCrdnYFdemRm/H98bNXBv2G9radHZQi5tT4DuMWcHCYOQJHlvETx/l5FMyeI3pp5K58ScIdw8r3pjXoVFHI605UQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1F7qFcXmnpScVkOJR6o6i7aLSWc8OVCYlsugyRxUnWW0Rk9Xvcrnxr6uY/MgsAGZAtCCZdfEitM/VE7NPzycuoOAcY0gVf9UeZ9qU7hHSrFeppa7Ezyma5VoI44pfbXt4sTS2H4PRRr/xP06PjTnngi9ckKU2ABIPQrVfdduBvwBNo7Ad5jJLXOs+WlY5ASFCGJZmvVEcxKw+5qtrWqfOO9VVS8nQ6D1BPN0Q1pLP24z1kTdPlokxr4Rj+NMBclA3JKVshidQlXbu6TMeq+pzmYej55BFvmxARURMAbnlqalTFDlABsxZ76nw/tbBUOOeaORGFv2r9ORg7YiYDr3qZH9GaMZ+vQtc/njWMN3LfkrQzV7/gEf3seipbvGWZJEgcb+prOB68NWSlJKoMRsgeKhj3I10UlwRCo9F6Wdm1E1XEKBv989yTBktfwy4FcxxYtVJZz+aAXC4euduXSMkuHBT/BLsZkLFQ6f+VLJwJNfJNRcckxT59S60zq6w4anSQ/6HUXYUVAWevNG/1jewF192/xEX88fUBv2ql4rulQ3zLnZUXtGY9LRQEsOWqNIl1cRZr8LE/aEEzZ1ea89zGyVZ7tYrGa6Bs/ymc9EHjjEVwnJjR1paxB8plAXMFCQWYWeOKKtwDA4qM0+UTxQf8OCDA3wUa6STpaVTH/VXqzY2O7gJPecCCkBq6OYceUOgNsQG3smAcUZ/++vNuITkcisExoEdsc/o92ee9BXDzxFLo1G4R+Ty9WTPXGwu3PGPxbqj5sBaSNN1k+adtS0yJPmdF8MvP/CSKm8FAXWPAw9OzvQqPhN2sYMJ3ODAkZDbVOArUXW/gWUAYIGDVDhqDZUg8gyqddN5f4GVFIIWWeg7R+q+qya7G2vlrbRgvzIBMOMAWgwSuTrPY4gr2E2zNnBgmyRg+Qm6VgJvFhD56fA3r/9vTtuadEA/RBQCYxPpHSkqrdytIlvsr4nd3BqujThiIRPQdraBy+lj5Efp635aEb6Owrh/DgV81/vbW5icxnvkol0d/ItgpCkKS+hx0yhU8DhkBKYOOBRkMPbcRSVCW/ZksJvt6zZglUzdXFOW1F1bJo7kH6Esfrz/dKssPom9f7ELTLrt/a/ZT7yEcsNyyTm/CSqJOvOEoLrciFLcFSlxvZtonkwokzctPJcQFw3GqIbIEyqdwD8YpuV4RM5016bJAKjrLZYz+rTew9g0kWPIfxWxhC8TAZ90zoPajdEMvLBYLK4MnXvd1UgvwYSthZ1XZk9BvHXCML7CJv+PVphrD6uwev4XMHn9Bq1NLkoE6WMuiUzQyw1TzN5FuM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e81bcd9b-469f-4476-a26c-08da7d3cf5e7 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2022 15:03:20.6579 (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: AS1PR01MB9370 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/mpegvideodec: Constify some functions 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: d+T792O9x+tC Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 4 ++-- libavcodec/mpegvideodec.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 93ba4e31b3..7566fe69f9 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -497,14 +497,14 @@ void ff_mpv_frame_end(MpegEncContext *s) ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 0); } -void ff_print_debug_info(MpegEncContext *s, Picture *p, AVFrame *pict) +void ff_print_debug_info(const MpegEncContext *s, const Picture *p, AVFrame *pict) { ff_print_debug_info2(s->avctx, pict, s->mbskip_table, p->mb_type, p->qscale_table, p->motion_val, s->mb_width, s->mb_height, s->mb_stride, s->quarter_sample); } -int ff_mpv_export_qp_table(MpegEncContext *s, AVFrame *f, Picture *p, int qp_type) +int ff_mpv_export_qp_table(const MpegEncContext *s, AVFrame *f, const Picture *p, int qp_type) { AVVideoEncParams *par; int mult = (qp_type == FF_MPV_QSCALE_TYPE_MPEG1) ? 2 : 1; diff --git a/libavcodec/mpegvideodec.h b/libavcodec/mpegvideodec.h index fabc1b2202..250034b486 100644 --- a/libavcodec/mpegvideodec.h +++ b/libavcodec/mpegvideodec.h @@ -53,12 +53,12 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx); void ff_mpv_report_decode_progress(MpegEncContext *s); void ff_mpv_frame_end(MpegEncContext *s); -int ff_mpv_export_qp_table(MpegEncContext *s, AVFrame *f, Picture *p, int qp_type); +int ff_mpv_export_qp_table(const MpegEncContext *s, AVFrame *f, const Picture *p, int qp_type); int ff_mpeg_update_thread_context(AVCodecContext *dst, const AVCodecContext *src); void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h); void ff_mpeg_flush(AVCodecContext *avctx); -void ff_print_debug_info(MpegEncContext *s, Picture *p, AVFrame *pict); +void ff_print_debug_info(const MpegEncContext *s, const Picture *p, AVFrame *pict); static inline int mpeg_get_qscale(MpegEncContext *s) {