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 06EDA4AB0B for ; Wed, 12 Jun 2024 13:50:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9336768D91C; Wed, 12 Jun 2024 16:50:31 +0300 (EEST) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2015.outbound.protection.outlook.com [40.92.50.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 933A068D91A for ; Wed, 12 Jun 2024 16:50:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JRkLrVKbbTd3j+vbzC+AMXoWsxMz4crS/ooeelhDhouczlZ6hujOaTvAyurJmPSvv2j0PaOw2PW+xqJh+9abd/UJ7wf24qRMjRrnaqkfC/Z31939l5jztfGahZA/3hsB83PcSnNhkRm0zR8oJMGefKE90/PvXMBxdNHAzjUQl09ovtRFlYiRcYhYJkyp8cBDbsvurgjMUCYzBCneGIdQaTirEdoUpAgu7bUZ+6s2WVopwvO7L/WELc2Z/OKAWRP7etJpWiie+CM2+gApwgZtE8mQPKc+b2LBks5tNv4kkAvOuRkM8UUxqICIACvL2CVca5qDf6CQtD+WQps+NqzHag== 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=o0sEWZFRR5dqBv3I6LSra8ZjwdXYE3Rcb+4g8rmRKtg=; b=VeT+EGBw2XU4K/JSAVDO+6+ndSGBhQmj61SwNVZwa42bPzooZr8QLzdPzw2aVz+ogQ9lNwIg+tVoXQb3xP6ZSf7sO7/JIttACnircaoiWwS44QcHsfh5a9mi6fMDKrBn3gErpYaYI9TiYpyAg+gJhbXHeAX7XeUMAOvHppTq5WdE3Xf7mCaYjy2iM2D7/STpHCOhvpqpLMFy6++NVTt9CJzl2KBKcuBKq3WJTxvOJj6SYeVAB2kupOzQzuKMZZmnSqW4+Y/ktN2QCTZ+MzebDBAk0mO6OWggQX+jsjOTPgRZ4q76qSc98ssAVgZbZAv7JTHyzcpYzq49pUiLSqMmfQ== 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=o0sEWZFRR5dqBv3I6LSra8ZjwdXYE3Rcb+4g8rmRKtg=; b=kpAuYqGSLxQGPjXyTrEsD1LinOSviStZdNhjjJW8DiiObMuvIf8H0RFSCoJPZFuRLykvHQxMOA3r7Pd8TQVwkZzYNNkxua6chsoYEML0jSKATqTpFwkIBUi/zLm6VTtMZC5DRZRsb3FYjKXoPjO8m/Z5aa5P5UYxS0JKyX0ECAZZ/ie6ShiHIbRy7rHarXNbXGDuRUkmoJi8infWyy6nqHClmiOOqAwWqPijaXB+FtI/ei0b0bG/a/IRJrAxRzW1kkvrNj+yOBjU7d6kZZUG1TX3EeHxxpNmrBVVMfVDL02SSKhT0+MTZBuh3/xAA3tAJ9YObOb5yK8ox2pIaMEX0w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0054.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:359::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Wed, 12 Jun 2024 13:50:28 +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:50:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:04 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [N1x7HcZ3LY1C2e+z6KxvKGXO48SPwHsHXWMQbo+FnC8=] 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-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0054:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d087f4c-55c6-4fc7-b3dc-08dc8ae69e06 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: U3OnyWJD2RfXunonh91UEwz4vt/OYrJN4gChGnYJcVMvlfsobxlW57Eqcu09rLS14mMWoW0j98aiteb5+UL97Wpfo5+c10JT5TZ3XdS6hqNrBT+EGy+enpHD2ELPrzTptRKQ1fecF//keyfQI2QxIhh2rRCR1DKX8l93Tz/gnU/y2bd0RCR4f2UTUY2Q5q1/8gpS/RcELZ69YY6cs877ik2SghBwMTK/QcwBsJuxjKa4LnJmnCUOyGPxd+QKi2J4ES5Zll1iFjGlh9P47qwXF04lPooEdGi98vIV0PP4+uF82X+1yLnxIN12hebffDACnZ3XZsDtMr4K0cwlwK8I8b9FaW479zLEyqOd/v0hkgBgqpN5xHYMLmNVok/6FqXxwVtZiKu350cVAzplOUioLLWDrV0bwqozyM6KFjchr5COIdZWpXXi+/82rGjYkxlJvkMd6pTA+Zbs87oEsNofHkj7DOZHv53hnNrDpqBlnqQm/UE2frVG5AQldyDjgfBgMiOVjELHAGGdhoEsiZdouA6XnON02cAythm512VLjI4naKE8hjoeYGWd/eU3XLRz7eIRoQfofn/PdGehY9exJ+8cKN+0he+a7+DuGOlzrynnXkjgAiEeGObK6csUxR3x X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/t5qfDTQ0YQ36w8jDzMprBPgNe4EU4KsAu137cuvmIkAwbvgsfWKwGPDqVpZ?= =?us-ascii?Q?zKRQauGuLWDm2JrAZcnlNbedgCXkHLvvkF8l+9Xtu6xGTznJhLa6XsnEiIEX?= =?us-ascii?Q?hF0VcFV0OKKAK92CdS1Be+ILRTsy4jyZh88CAHKhuR7K7+DRXAC0grrRf8CF?= =?us-ascii?Q?ir6JrLiGSNIH+O77UAcOcHIbe2Iaci+ToRK7tFxJsS7MBjHdwl2eULOeJDOK?= =?us-ascii?Q?N4VqgzWMgfxz2Ub+MwU9LasIXTvvw0jbxFvPWf0621DDjyKTDdKXJ2FRjTFz?= =?us-ascii?Q?pDnst5N3QOvouD9LhDFUe6v6gLXhmxgVqDm9ZvBQ8z9k4ExJwN0AoQldQrpv?= =?us-ascii?Q?hC1SDHWZtPMmgeEY48twQpNVM4NSBqNkn7o7TFmU6PSNNkGLWXhSXP37Nryb?= =?us-ascii?Q?KcvuQErpuWIKJg/N8cEaRYjvRx61ekSVX+Hkcz5QkDdOO04Hy07TTfao0zRT?= =?us-ascii?Q?OHzLbMAI1FknxMrntEng8F8x7GvgRrAnrrStknly7cb1mX2xeaHiZ/RBwHCO?= =?us-ascii?Q?9aXZJ15zkLaLEQ0dt2AnL561QtcD0oosOgzISkQR+FNIYiEIARtuQvEF4Z64?= =?us-ascii?Q?5HtJZGMXWF9zfNOVNeuCvA2t58jJnKTES82pMD18muc9gNHk/mXUFeqiAa58?= =?us-ascii?Q?bi/109R60b34yaV69YVJwv76B5miSMK+B0cR9IMj3cqbRhYUt0aiXz1oYJ3/?= =?us-ascii?Q?QhEMUDSywGDGX2vWNFs0edDa3Z5YV7CzE+sAscJhtklWICb7pMQ1Cdz/2kMi?= =?us-ascii?Q?W8OjNLe638SagktDzpFhpVZ6ZhmspQNpGvZm+an7tGft+arGOCsUncqXK2Zx?= =?us-ascii?Q?lFFX+hnWs3vwG3eh9MA+FgHq5JPNpPU11KMvLa73jgGFxSS4XwaOXGySg1KZ?= =?us-ascii?Q?b7t6Hr/Mg8Rm3pf4Q5eabMmIKqCH8EItjJXd0vQYI8hopaz9R0mk3v7rug8m?= =?us-ascii?Q?K6ECpunu2RDa1vy1fbp+i2pPi3Np8czUyqZjvaT9w+sp/V88e5yu7WVgqB3N?= =?us-ascii?Q?BRCCR/a29JWmh54R8UiHV79augj5No5fwF8CZIEr1eGI7XD0AfJHMF2SBPYI?= =?us-ascii?Q?lTV/AIoLh2pAmg27Ef8CTCE1zGmRmBl4ZIh4th2B114UJbbJMDQL9Ru1B9pB?= =?us-ascii?Q?njsiA0G9pjt9I3rjXjPSdO1ZJt0LJW6rzdR9hJvOM8ugsCzIPr/DxRXn+Uj/?= =?us-ascii?Q?Kxs17tn3nQiyw+sgT5hwSjsbFUqP+EM/YxLvItjIJRteY/sUo/uFR+oIqP8j?= =?us-ascii?Q?k2aZXGbQvM4s36cBshcgeClpK2F0lMljZ+/5L0wZWg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d087f4c-55c6-4fc7-b3dc-08dc8ae69e06 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:50:28.0638 (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: AS8P250MB0054 Subject: [FFmpeg-devel] [PATCH 08/57] avcodec/mpegutils: Remap MB_TYPE_{GMC, SKIP, CBP, QUANT} 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: Do this to make MB_TYPE_{CBP,QUANT} fit into an int16_t, so that can be used in a VLC symbol table. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegutils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index 0cca4f0a2f..8597ca18b8 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -45,8 +45,8 @@ #define MB_TYPE_8x8 (1 << 6) #define MB_TYPE_INTERLACED (1 << 7) #define MB_TYPE_DIRECT2 (1 << 8) // FIXME -#define MB_TYPE_GMC (1 << 10) -#define MB_TYPE_SKIP (1 << 11) +#define MB_TYPE_CBP (1 << 10) +#define MB_TYPE_QUANT (1 << 11) #define MB_TYPE_P0L0 (1 << 12) #define MB_TYPE_P1L0 (1 << 13) #define MB_TYPE_P0L1 (1 << 14) @@ -54,8 +54,8 @@ #define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0) #define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1) #define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1) -#define MB_TYPE_QUANT (1 << 16) -#define MB_TYPE_CBP (1 << 17) +#define MB_TYPE_GMC (1 << 16) +#define MB_TYPE_SKIP (1 << 17) #define MB_TYPE_ACPRED (1 << 18) #define MB_TYPE_INTRA MB_TYPE_INTRA4x4 // default mb_type if there is just one type -- 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".