From patchwork Sun Oct 16 20:46:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38749 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1306359pzb; Sun, 16 Oct 2022 13:47:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6XvXAa26hbZHULjqdZRMn6lQLgc+I4NayeqUNuDjNocT5k24Ld+W/bqs5GC/Mpzf1zULY2 X-Received: by 2002:a17:907:3f27:b0:78d:ad42:f733 with SMTP id hq39-20020a1709073f2700b0078dad42f733mr6419761ejc.320.1665953248004; Sun, 16 Oct 2022 13:47:28 -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 m22-20020a056402051600b0045bf7253827si6710566edv.67.2022.10.16.13.47.27; Sun, 16 Oct 2022 13:47:27 -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=YVLXNfwr; 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 9264768BC89; Sun, 16 Oct 2022 23:47:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2047.outbound.protection.outlook.com [40.92.89.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 535E568BC73 for ; Sun, 16 Oct 2022 23:47:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UDOH7z85MsL5dEt+M48vUtI6cv/LljnkfUiKKci8VUV3Nl3hikNSFAcsNTLYE8l/6MQJAmRDqBx2iIh+dnyo2vSlCo3HK0cDJpoFIyldBQyNU3OcM/ws2koED+c0igHlZtESRRHsu4cxfjydFpfy+NZZ7ktCBHshRqmMQcfa44d2YOxu5bqAqx607P69lNaOAZ8U3z1/zQh5a6P2KnyTtS20N2P9TAm1lmM171vOuwGMyMbqk+438JtrUdJORD1YlE14bTBR803HhXhU+RWkMfRi/NFboKFdg03uchtN6HrAa+yvvaf3Kc5hwIK0L8U/DaqA+8Q4uu+0A4ePcg+twQ== 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=1rA4uErPPX43l7p5C3gNhAgglZDwZ3lD3IQE6cuhCC4=; b=Mh4cq+ge7QD9wI30R98ZagodozTNbU0mjV5EMj50thqU4sbepS+ptGY5I6vSQ8/TKwI/6oXGIDW0APO72f+pHJ5o0Y0hkO85yFQ5qSAwHnwtSAbSYO/c0zUC3l0gkp1tmRWIveJ8W977fsMg0oziXgTSUALxv46S3KwNrvzb+aZOgIUvDsX1abWXFxyaACABn4UCjqpiV/fPE/jmHdID6iICwvaTvacKE22GUDkt+3E5yKIvBZW8Ah8aW61EeiwbHjdW8zEyxEt3X/06uVVOGPXCoAEba8CAYm7rdMrb2TaAEksMrYf29EoytF/TMQknTMKkOTMXxpNOwe0iSQSMEA== 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=1rA4uErPPX43l7p5C3gNhAgglZDwZ3lD3IQE6cuhCC4=; b=YVLXNfwrJjmhsTdQqB5NhJRAlc2QNnSHyJKXInXC7nf1OQQUDFtfaIcsvTG2ZpmV82ZofgWs69oRMnnddeByd/PUZB0iJW+R91a/RzWE92mPFx4FYaWR8DEPuiPEwIc4jb0MWviLSjS+J/9V3U5QCar5kqGuYJel1L+p9PTp4SddJZcPKIaNJ55ySY1lDxnuRpCLy/WZ7tfrSz06ALE8ozV+DgsbC1WKIRLiBxAFotikzJJV1jYe0F2xzBvR10rao1y5H3751JqAurC2ojtSHc9492uOivsNMwQD17yH0cYIyhQTeX4FJHc4AD1WmqhcCA4970tNcZji6IwpzGF9pA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0090.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Sun, 16 Oct 2022 20:46:56 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::20c0:9c9e:87f:79f]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::20c0:9c9e:87f:79f%2]) with mapi id 15.20.5723.033; Sun, 16 Oct 2022 20:46:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Oct 2022 22:46:51 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rSSw3pLNzIT6ZvSeVeF2Y9GGUQ0WU6rAR1gZrhYOmS0=] X-ClientProxiedBy: AM6PR08CA0035.eurprd08.prod.outlook.com (2603:10a6:20b:c0::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221016204655.605202-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0090:EE_ X-MS-Office365-Filtering-Correlation-Id: ba501718-1e86-4617-cc61-08daafb79026 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxJXwPqhMYR2wBU/Rw/opxi7KkcgZCik9+6ktqrcv0FfPF+3AB68XETcREqsx6/Phb724c12KacX59RbW4gGWdmaLj8AquhfPqovXtd2st29WrOxGu1ayB+Jp52AW8r4p2iSWQUhXy4PYaE88+ABsz0+tOhFmDPUyH1vfYKhdVrSqY9w0tm271noIV870sC8XoqQ0ghjxICqpk0z2fVc1eEUp0ZzC57Wck9BTkbgZrXE5B04pHnUi92M3cq0MUWzmcx/yw4Y0bCCb/ACfkLSGtIZ214szLDL9/QiaiEShKUwrU9wXe9kKgVrqDaCwRJ4TIHsrn+Nr9/NIx/pdVGHJHvVQWt2YvxbBAf0VL/u4PBM16VxvcBmhK+Ck0VRDTcCMnQgMXldEOTc+XwhXhMO0iY2dn2Sc9xjXYIFZBXL9u2KZkHqVe8PKMb9nGIWhQmA08ndsyZ5DOFwWWiMbHyWAPH49Ha/rP6pbzw9DaLjpYl/jkZAl2KEr6RJsbYxhilyHZyiixT7OjGm6WzfN0n0RAU6DwWNj1rT4lMikA95OluJl5+vLIWMITJmqVvzJyqWZe7T0CVQLWqJ7aC6Ktkn7JYJSm1eimZhyEAYAimCXoUsLjLKL0HhZNKrvvH17LyLpTYvtfJyyNY7cb9aUWX0yM5PRyaPonvnbdoAkU30mjrAfwJza3I2UnpMtihL36JviCkTVTIXU6PLBCejcUVH3B1LBbwqUcRjxo= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ksNqCX/y8OQzJwR2lGWZJ0qjr77eT80ytCQffJtWbt4Y8XLQZyRwopvwjrtacPX+b19Rnw9veqrXzwPkJBaJ/GAXR177baSyWSLcJRCCYm9n5Yr4RX9SK7YVOjAepkeCujEEe7vyhCUTvDOFmx61/K/KjdHCVOiQSKl2nRUv1DlwKSTQpCALoxT6MgfRArEnJ+QdN1EDyB65B0ZGF2P3hnVjvEga8DiFEej+OvqfWBn77L23KAADOSkF5dlYEcrCJYOTVgncvOASJZ3wgIMkUIaPiNekLOHZOQgaWE3ruuL7A292jN93xzJiALJGCZDvN55Q1An2bcHNqpBmxaHNCI6GX6XyTGMXaWyDcH9EExnClxk1TDOhDIO7523daHT11FPQSNjoLTgWMvRAOA4M1j6jDPqPiFNTRCF4z4kvOfgoznrnsgKFHs9X7+YvlvYGBQRa2ymzvB80sbjQqo68AH554Fp+UPxdvqs0GEv/AFgZEpsxY2Cnu1hpDgcZfRsxloL5mbAh+yuLGde/tR2o4HV/qE4mlqc945mPy0FvtQHcws7bw2BeORXYSNIu/x+ZCqJWk3ONxGFmaLFvKIvAr7tEGEwsYPocIgIbVhI9F/s5OP5JeR+KtWOmJLhEYRTPFw+Un0F90ptKt3mQautd4/UEvC/GzfhoWGlQ87dWsc9ZhFSFIHlTDBIHbfoXrTga X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ijPXep/s8WV+74DYND07fihIS1rMLniQ0JP2ZMIxg5U6qlO7NnywsXZYMgvU1BawyZsiHMf/NKo5iVvoI/NxCuor5uivx7Bl+KyYfIZOPicBgs4eimnLB72YKTUQRSjlvSoktGbklhO6rrEyy+eMdIjnmEkLeoILrvzbxx/I7ygj1/MZY658b26GyAF0U31V2d+uEgJ5+fLWDdhjz6REG5QZvKA+QE12pOBJBRH4XquBVjGFFY7FpfQYsgRxCjZpWDkTPlAXY3y2ICl1z650ikuWPJiR2HwkzetHle+JTgoaHTkCERFsnU3rauEm4Oyuls9kdCBpakBR0Kl8FGixdylPr8Uof5wZC+lwAJLYSBKRe/2qDaMsmujnrZy1NqQLCKhLqGc7Ub89YGSnwj8kIApOfUU4itmzmVz1lwRpp8dW8S1eSWL1K5qIs7IB49UZVL2rYSKBZ3AQ3EJfdtlfz+QJgrQMQv+Y1h0Gw8bbAGrOHPQXEpy+qcp8D1WJMCvFoD7AIRZq6CDtNSs6mS67ht1oumpLQ0WwIIGVaxomoyRtZhIvdNRjgn7+j20hc6Fd1OUqnDmwAHY7JED4sMWxhttc85F+VAPt9RVa5PtG38sjOEv2n6EK1cAn8K1FXyrlqxFs4xlwdFhrLnXtIz7w9WIBnHzwBBSCQ0jSWvP6/Flu7ypO1uYHPfHFvP47ItLpxrZRLeSuk1O4hDF2tduWNOZmlDVZVihY9eGTK17je1nZMcFc0UtVGYxpxXYJDzDLDU8J7CDD75UN/N9Xj9ZNJUavjswXUuN+qLgtJEfvnh25yO+hWGyC/7qAbyEHIUrl6+o8U4Sdv0kjyQl1XDa1cWcMR/W4yqLKrUPMh9av6jqfyellsgESUigzrT+IO7HD1fSCsQ3ShhFT9TpVtAa59Z7e56ORWhIweg1isBZpubLDNefVM3xDB193S1J7x64318UPYURnj42LPwIA44QFB0kWTqGj/ijoHqPm8xk5+OPzlFcPbXO7tDZYp1pAlSIeCw/XTxNvsd6z49EHEZDO5+twA3gkd+sXlN3YzgdPqFWOr97L8huPvDBP+0qeUxz2qMWO7DqT1Zsk7NOdj9okPYbM3Kfhi0zVZ+cIR9rkW14hmFAyz/9EDrdSVDd8qBTYvCWpjXFrCUtI3o4iJ5bW+jT5Is9BkegOIUqwsO2M1+2TgQBJNFNQSRYT4ar+vOC4ubRAbsfQWi4qNthdJo3VvG4w6k6er2M5IS0ZacJrVYgYq2TI/kTVo7oohIeK4M9OjHoIgHXlnsRcsgaYJyuC/vUB77I6g1tHoM4ld7Nbu63l59v8LkZVAKxG5Ufn5RX7 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba501718-1e86-4617-cc61-08daafb79026 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2022 20:46:56.1652 (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: AM8P250MB0090 Subject: [FFmpeg-devel] [PATCH 5/9] avcodec/h261: Use ptrdiff_t for stride 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: 9Hvkq0JgtKDl Signed-off-by: Andreas Rheinhardt --- libavcodec/h261.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/h261.c b/libavcodec/h261.c index 7dfaee7dc4..8e0e13459a 100644 --- a/libavcodec/h261.c +++ b/libavcodec/h261.c @@ -30,9 +30,9 @@ #define IS_FIL(a) ((a) & MB_TYPE_H261_FIL) -static void h261_loop_filter(uint8_t *src, int stride) +static void h261_loop_filter(uint8_t *src, ptrdiff_t stride) { - int x, y, xy, yz; + int x, y; int temp[64]; for (x = 0; x < 8; x++) { @@ -41,8 +41,8 @@ static void h261_loop_filter(uint8_t *src, int stride) } for (y = 1; y < 7; y++) { for (x = 0; x < 8; x++) { - xy = y * stride + x; - yz = y * 8 + x; + ptrdiff_t xy = y * stride + x; + ptrdiff_t yz = y * 8 + x; temp[yz] = src[xy - stride] + 2 * src[xy] + src[xy + stride]; } } @@ -51,8 +51,8 @@ static void h261_loop_filter(uint8_t *src, int stride) src[y * stride] = (temp[y * 8] + 2) >> 2; src[y * stride + 7] = (temp[y * 8 + 7] + 2) >> 2; for (x = 1; x < 7; x++) { - xy = y * stride + x; - yz = y * 8 + x; + ptrdiff_t xy = y * stride + x; + ptrdiff_t yz = y * 8 + x; src[xy] = (temp[yz - 1] + 2 * temp[yz] + temp[yz + 1] + 8) >> 4; } } @@ -61,8 +61,8 @@ static void h261_loop_filter(uint8_t *src, int stride) void ff_h261_loop_filter(MpegEncContext *s) { H261Context *const h = s->private_ctx; - const int linesize = s->linesize; - const int uvlinesize = s->uvlinesize; + const ptrdiff_t linesize = s->linesize; + const ptrdiff_t uvlinesize = s->uvlinesize; uint8_t *dest_y = s->dest[0]; uint8_t *dest_cb = s->dest[1]; uint8_t *dest_cr = s->dest[2];