From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5FC594AB0B for ; Wed, 12 Jun 2024 13:51:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E30B668D962; Wed, 12 Jun 2024 16:51:12 +0300 (EEST) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2046.outbound.protection.outlook.com [40.92.49.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29A0168D917 for ; Wed, 12 Jun 2024 16:51:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CfAS5cyiSeBmaRMfpK8D4VUXYPQU+Aw3OF5UUp1zzBWQ8uu7jFU+Mjjscy9BQumHzMjFaiE615Pgpl3eI2RC69ngjRCdG/Wf5V43L8jg9dxvBSPRy1lbpx1As6CmkOCbXhDgHgIfpp7XkrNkjPAjUabOQZ7Lx57KYY4Is4J89HZ02JDp1jSnus3rTCX2ggBgRip7r/IZ+hQo/xDtA5QyWq0HOE0YRfLuf9gLRMDM7iEsGabUvXTOrOTGEgXR2hEGBu+dlJ0Gw4umLlmOpdTKLsHZMDvdTP3oHUV9xjL4pDRksb9yqX9pC1sh5hCKNZVTUs21EfF/tMVsIoZAaun0/w== 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=jzpYu21gmVYw27lHXF/VVAemDyzmnQqp2mPWoYNu/hY=; b=hdMk4qgoaOO8C9tiHRKEiQ/PiF0vOV+AMCReleSI39REEI5WTfhIYLaJy6dynfkU8JsKWU+7TIFUIUxX6/kE8CqinqDo9CEHiziZhaA5ry8lCPW8DH87AeMnyNKAdWFoRihbkeFJSaeI7j9kfWT5ZPA18JZcq0gTtiJJmoiRwWMLYQ5irPIHn+5Kq3tjQDuvXdgEcKOduYThTLZOaC39le/nv6pU6EGGRjbXC7tdt7MCxDzbpRROe9m2MN6qtbyxlQp+OK2yjV90FtMWX6gf1IRVTBiit5PiW9Gp5I8PHCiGIAwF3uKW42nMWsa4FNnM1cULeBs4ETdFLnB95ec5Mg== 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=jzpYu21gmVYw27lHXF/VVAemDyzmnQqp2mPWoYNu/hY=; b=vE5dMTuYe7XeCGxMYNiNZx3AsmLg/8FX32GABqQ4wrwMZv0iJ3OhKA3+urCPn7GPtKKxlKhCJhTzCZb88SSzj5sc2+dJy5EkvOxt0s3EbZ9o1twuuWK1EepexSB0zV6gxeePvtK/BDn6RM4Liow4djjEe6SbypilAwpEx+rwX4QEQ7y2Gf4aAqLgIaNt6V5/857Ii2AwAB6QzT0F6lShOyB/6YVA/nu2hS2pI5HN7ZinhSTxuZaEbGZVj5la6ZN//544yIKMhWohM1ZS+G5P4WmQcta9yxlNYikD7/G5T3yD9rSv+GcVbKYHC4ldqetXsPLZXv+AmF2hbPl9kh4PMg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS1P250MB0479.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4a4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Wed, 12 Jun 2024 13:51:07 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:51:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:09 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [tGOKcCGQElXqjgfgFi980ra9LMBmaccRVz+HOM/9wWs=] X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612134853.2102377-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS1P250MB0479:EE_ X-MS-Office365-Filtering-Correlation-Id: e953be63-805e-4a6f-7e47-08dc8ae6b55c X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: 5LOWlnzgIZ37HE2SUqeVpwA2saoFITa85nNGR0+O0SB28wxVeT++nL8H8/qTZvG3l7hvVM7/K0Lm28ObsJLfrZ4Ji9fh4wZI4gJHahKWBI8p5945BLw+FI7Z3IKQlrTsdmgQWGz4w4NYbpMC6UT2Qg3i5k19VZZYvBYnX2oy+1B9w39/1bUkwIeIrPqDheDuqPtlxmW6jYKW2xxy/TKVnoZvPQ4uf5S6iUMxWAjzJkyuE0w4VDvXXCjmjDl6tVpkFVS8B9Igt/WX6HxOsyg0UrD3JeioqlzKrqoekrqExEl8ynB5PdMtkQAg/6PCdkR05WnH2Uhavh2zDo7KPwj3mj/9huvDXXZfzTjjOWnQCxL4VrJWt0sotLCLLr0KIw7nwrzqSYB5ih1Gabo55iwgcy/s9RNHoN04DtS4YkLIjHgjewjqIhJtmbY9xSsXDiu9R46ZaP0npDy/ztpAGM7EOy6Xot51UHfE9CC08uEk8180Z2A3yP+2QaxBw8NrUyTJO3vk8w9lgOqlxJysmshe3DrPiUJsShYiwtrutzwBFXbJto9QCgCKi5avpcL0/XGhl/+t0xKAWaKGtgxxHg3jVZNyYS4CCL1toVmzE+HXvk1pci8w8twzys+z4E/qjH2D X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BTN2ZyhQMtnlrvGmRoaxEYaiCnjnvE39Ns2irBpD6ocdsXMJaMHVo3SrohCl?= =?us-ascii?Q?gdg5AectflFtwMbhha5/yhQZfcBdyTmqwB1dh7A8DHpTEkWAu2kEBd8l8doL?= =?us-ascii?Q?xYG6kLkcDjjhzZ9mVfyMT88jjvKpApeuswcbszBSlTREIgwXkbFQKjw12Tm+?= =?us-ascii?Q?5RmkhW5ckN8zWD+auBZQlU6AOrr2XJJwQ9OqYdtY55X4Mphh2SbgzncPd5PV?= =?us-ascii?Q?4pRHCWkznBTthise8gu6FKPuehd5ouumV5rI89EtQzgGkBlMQrgaW61bC2Wa?= =?us-ascii?Q?VO2fjz2lsjKmj4U63IsZw1ABmvABT/VH4+Yj8p8grF3cn6jx5FJzxZVzLfJY?= =?us-ascii?Q?NYVXApsXz3sycc/2b1KhPYn4nAGNSLRnZNqpCmbuEwSm7GB/LZbH4MqtViJt?= =?us-ascii?Q?8Q9+FbNOss/DS00s8yDA73X5D2BrbSYQJBQDdYubWSFhypNeJ1g3b+yOMa/M?= =?us-ascii?Q?XDRzOV1L5vsY+oIE9hv3F7viNjRgGaNS3abRSpgWu8NREYgXJSmTVkzhyI0f?= =?us-ascii?Q?iYnZn0b9MZ1/g1dN+DEmVFkIkzCDmcGcD4G4VR1WEgEApXS3da+pX2N9UQkY?= =?us-ascii?Q?qeONSFNItaGUFYIuuMgDym5OTCJNtuXgsY7EmezMUHo/Uo3jJ4TfliLapxRv?= =?us-ascii?Q?paI6q5CTDYMmzRwBrmbqSw1n/1HU4RRT3+MWo0vNduC0ezaz952rX890mmTd?= =?us-ascii?Q?2xrInRBI6GFiUc4zYEG8RbBM0bvadH8CwXJZHRaEdmnRdZLO68MPq3p4LGS6?= =?us-ascii?Q?dU+NgLEE2x875JOqdJHfiLWh8Yic5gxqqjSr89CSNwHKKqb1o0IDf0CwnFWa?= =?us-ascii?Q?7Lsz9Yl6xYwib8R3lPUw3QVX7RoB4qEdwRcpo772oRvvJxVGBbFw7g0F5jWI?= =?us-ascii?Q?0DsER48xfUF1BwDb7y0JUvf7Ak6wD/7ckDn7mLH18s+BrTPITrKcEs9sFpum?= =?us-ascii?Q?JOnyAFnDvkAglCRVUaTcvyRi0x2SorrBdRcP6MxQ48oBVR3rGI61KYajV7zL?= =?us-ascii?Q?tY4u6I8gartPMkl3+6DlC/uycnWV37TJk/y1y97PGt3nSv4Y4frCX6bYgkzg?= =?us-ascii?Q?JWi70EHtY+6vkotHdp+Ch+ZRmF+IoiI8BVzFmYtaNGdHbWMpWnFjtcVDs95P?= =?us-ascii?Q?fb1WkJ5yM79HBprKnCkuZH1nYtTToOVj/0/2yZQyuLldjImSjmyvpWn+VOq7?= =?us-ascii?Q?A+3muMsrUiWcggVuQuYN1ZbFOdP4oH2NDpEIFvc+V0Qp5d54pL7nKbs9nmhe?= =?us-ascii?Q?yg8BVa4ysOrosezXE6H4E8H2w3FFg0nLfA8HEpW+Tw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e953be63-805e-4a6f-7e47-08dc8ae6b55c X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:51:07.1707 (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: AS1P250MB0479 Subject: [FFmpeg-devel] [PATCH 13/57] avcodec/mpegutils: Move H.264-only macros to h264dec.h 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavcodec/h264dec.h | 8 ++++++++ libavcodec/mpegutils.h | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index fc50df90f2..ccd7583bf4 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -93,6 +93,14 @@ #define IS_REF0(a) ((a) & MB_TYPE_REF0) #define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT) +#define IS_SUB_8X8(a) ((a) & MB_TYPE_16x16) // note reused +#define IS_SUB_8X4(a) ((a) & MB_TYPE_16x8) // note reused +#define IS_SUB_4X8(a) ((a) & MB_TYPE_8x16) // note reused +#define IS_SUB_4X4(a) ((a) & MB_TYPE_8x8) // note reused +#define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0 << ((part) + 2 * (list)))) + +// does this mb use listX, note does not work if subMBs +#define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0 | MB_TYPE_P1L0) << (2 * (list)))) /** * Memory management control operation. diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index c58a14d497..43075191c6 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -82,16 +82,8 @@ #define IS_16X8(a) ((a) & MB_TYPE_16x8) #define IS_8X16(a) ((a) & MB_TYPE_8x16) #define IS_8X8(a) ((a) & MB_TYPE_8x8) -#define IS_SUB_8X8(a) ((a) & MB_TYPE_16x16) // note reused -#define IS_SUB_8X4(a) ((a) & MB_TYPE_16x8) // note reused -#define IS_SUB_4X8(a) ((a) & MB_TYPE_8x16) // note reused -#define IS_SUB_4X4(a) ((a) & MB_TYPE_8x8) // note reused #define IS_ACPRED(a) ((a) & MB_TYPE_ACPRED) #define IS_QUANT(a) ((a) & MB_TYPE_QUANT) -#define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0 << ((part) + 2 * (list)))) - -// does this mb use listX, note does not work if subMBs -#define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0 | MB_TYPE_P1L0) << (2 * (list)))) #define HAS_CBP(a) ((a) & MB_TYPE_CBP) #define HAS_FORWARD_MV(a) ((a) & MB_TYPE_FORWARD_MV) -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".